Bump version

repo_branch: fix inapproriate logic
Prepare release
2026-02-28 17:20:59 +01:00 · 2017-02-28 05:45:50 -05:00 · 2017-02-28 05:33:30 -05:00 · 2017-02-27 18:38:16 -05:00 · 2017-02-26 20:44:53 -05:00 · 2017-02-26 15:29:16 -05:00
267 changed files with 81601 additions and 11691 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,7 +5,7 @@ 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.9.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.9.min.js linguist-vendored
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -18,7 +18,7 @@ The issue will be closed without any reasons if it does not satisfy any of follo
  - [ ] Yes (provide example URL)
  - [ ] No
  - [ ] Not relevant
- Log gist:
+- Log gist (usually found in `log/gogs.log`):

 ## Description

--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,6 @@ public/img/avatar/
 profile/
 *.pem
 output*
-gogs.sublime-project
-gogs.sublime-workspace
+*.sublime-project
+*.sublime-workspace
 /release
--- a/.gopmfile
+++ b/.gopmfile
@@ -14,13 +14,13 @@ github.com/go-macaron/inject = commit:d8a0b86
 github.com/go-macaron/session = commit:66031fc
 github.com/go-macaron/toolbox = commit:82b5115
 github.com/go-sql-driver/mysql = commit:2e00b5c
-github.com/go-xorm/builder = commit:867edcc
-github.com/go-xorm/core = commit:2fbe2c7
-github.com/go-xorm/xorm = commit:445a934
+github.com/go-xorm/builder = commit:9c35786
+github.com/go-xorm/core = commit:7daacb2
+github.com/go-xorm/xorm = commit:19f6dfc
 github.com/gogits/chardet = commit:2404f77
 github.com/gogits/cron = commit:2fc07a4
-github.com/gogits/git-module = commit:172cbc2
-github.com/gogits/go-gogs-client = commit:98046bb
+github.com/gogits/git-module = commit:1b9552b
+github.com/gogits/go-gogs-client = commit:264a3d5
 github.com/gogits/go-libravatar = commit:cd1abbd
 github.com/issue9/identicon = commit:d36b545
 github.com/jaytaylor/html2text = commit:d16d412
@@ -42,7 +42,7 @@ github.com/sergi/go-diff = commit:24e2351
 github.com/shurcooL/sanitized_anchor_name = commit:1dba4b3
 github.com/Unknwon/cae = commit:c6aac99
 github.com/Unknwon/com = commit:28b053d
-github.com/Unknwon/i18n = commit:39d6f27
+github.com/Unknwon/i18n = commit:e0eb0ce
 github.com/Unknwon/paginater = commit:701c23f
 github.com/fatih/color = commit:42c364b
 golang.org/x/crypto = commit:dc137be
@@ -52,12 +52,12 @@ golang.org/x/text = commit:ece019d
 gopkg.in/alexcesaro/quotedprintable.v3 = commit:2caba25
 gopkg.in/asn1-ber.v1 = commit:4e86f43
 gopkg.in/bufio.v1 = commit:567b2bf
-gopkg.in/clog.v1 = commit:d359c28
+gopkg.in/clog.v1 = commit:bf4bf4a
 gopkg.in/editorconfig/editorconfig-core-go.v1 = commit:a872f05
 gopkg.in/gomail.v2 = commit:81ebce5
 gopkg.in/ini.v1 = commit:e3c2d47
 gopkg.in/ldap.v2 = commit:8168ee0
-gopkg.in/macaron.v1 = commit:78521e4
+gopkg.in/macaron.v1 = commit:8be5635
 gopkg.in/redis.v2 = commit:e617904

 [res]
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -19,6 +19,8 @@ targets:
  centos-6: &el
    build_dependencies:
      - pam-devel
+      # required for go buildpack
+      - perl-Digest-SHA
    dependencies:
      - pam
      - git
@@ -26,7 +28,7 @@ targets:
    <<: *el
 before:
  - mv packager/Procfile .
-  - mv packager/.godir .
 after:
-  - mv bin/main gogs
+  - mv bin/gogs gogs
 after_install: ./packager/hooks/postinst
+buildpack: https://github.com/heroku/heroku-buildpack-go.git#v62
--- a/14
+++ b/14
@@ -1,5 +1,4 @@
-FROM alpine:3.3
-MAINTAINER jp@roemer.im
+FROM alpine:3.5

 # Install system utils & Gogs runtime dependencies
 ADD https://github.com/tianon/gosu/releases/download/1.9/gosu-amd64 /usr/sbin/gosu
@@ -8,9 +7,12 @@ RUN chmod +x /usr/sbin/gosu \

 ENV GOGS_CUSTOM /data/gogs

-COPY . /app/gogs/
-WORKDIR /app/gogs/
-RUN ./docker/build.sh
+COPY . /app/gogs/build
+WORKDIR /app/gogs/build
+
+RUN    ./docker/build-go.sh \
+    && ./docker/build.sh \
+    && ./docker/finalize.sh

 # Configure LibC Name Service
 COPY docker/nsswitch.conf /etc/nsswitch.conf
@@ -18,5 +20,5 @@ COPY docker/nsswitch.conf /etc/nsswitch.conf
 # Configure Docker Container
 VOLUME ["/data"]
 EXPOSE 22 3000
-ENTRYPOINT ["docker/start.sh"]
+ENTRYPOINT ["/app/gogs/docker/start.sh"]
 CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]
--- a/Dockerfile.rpi
+++ b/Dockerfile.rpi
@@ -1,19 +1,18 @@
-FROM hypriot/rpi-alpine-scratch:v3.2
-MAINTAINER jp@roemer.im, raxetul@gmail.com
+FROM armhf/alpine:3.5

 # Install system utils & Gogs runtime dependencies
 ADD https://github.com/tianon/gosu/releases/download/1.9/gosu-armhf /usr/sbin/gosu
 RUN chmod +x /usr/sbin/gosu \
- && echo "http://dl-4.alpinelinux.org/alpine/v3.3/main/"      | tee /etc/apk/repositories    \
- && echo "http://dl-4.alpinelinux.org/alpine/v3.3/community/" | tee -a /etc/apk/repositories \
- && apk -U --no-progress upgrade && rm -f /var/cache/apk/APKINDEX.* \
 && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat tzdata

 ENV GOGS_CUSTOM /data/gogs

-COPY . /app/gogs/
-WORKDIR /app/gogs/
-RUN ./docker/build.sh
+COPY . /app/gogs/build
+WORKDIR /app/gogs/build
+
+RUN    ./docker/build-go.sh \
+    && ./docker/build.sh \
+    && ./docker/finalize.sh

 # Configure LibC Name Service
 COPY docker/nsswitch.conf /etc/nsswitch.conf
@@ -21,5 +20,5 @@ COPY docker/nsswitch.conf /etc/nsswitch.conf
 # Configure Docker Container
 VOLUME ["/data"]
 EXPOSE 22 3000
-ENTRYPOINT ["docker/start.sh"]
+ENTRYPOINT ["/app/gogs/docker/start.sh"]
 CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]
--- a/6
+++ b/6
@@ -70,11 +70,11 @@ test:
 	go test -cover -race ./...

 fixme:
-	grep -rnw "FIXME" routers models modules
+	grep -rnw "FIXME" cmd routers models modules

 todo:
-	grep -rnw "TODO" routers models modules
+	grep -rnw "TODO" cmd routers models modules

 # Legacy code should be remove by the time of release
 legacy:
-	grep -rnw "LEGACY" routers models modules
+	grep -rnw "LEGACY" cmd routers models modules
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs) [![Build status](https://ci.appveyor.com/api/projects/status/b9uu5ejl933e2wlt/branch/master?svg=true)](https://ci.appveyor.com/project/Unknwon/gogs/branch/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/gogs/localized.svg)](https://crowdin.com/project/gogs) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gogits/gogs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+Gogs [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs) [![Build status](https://ci.appveyor.com/api/projects/status/b9uu5ejl933e2wlt/branch/master?svg=true)](https://ci.appveyor.com/project/Unknwon/gogs/branch/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/gogs/localized.svg)](https://crowdin.com/project/gogs) [![Sourcegraph](https://sourcegraph.com/github.com/gogits/gogs/-/badge.svg)](https://sourcegraph.com/github.com/gogits/gogs?badge) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gogits/gogs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 =====================

 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)

-##### Current tip version: [`.VERSION`](templates/.VERSION) (see [Releases](https://github.com/gogits/gogs/releases) for binary versions ~~or submit a task on [alpha stage automated binary building system](https://build.gogs.io/)~~)
+##### Current tip version: [`.VERSION`](templates/.VERSION) (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)

 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|
@@ -41,21 +41,23 @@ The goal of this project is to make the easiest, fastest, and most painless way
 - Reverse proxy with sub-path
 - Account/Organization/Repository management
 - Add/Remove repository collaborators
- Repository/Organization webhooks (including Slack)
+- Repository/Organization webhooks (including Slack and Discord)
 - Repository Git hooks/deploy keys
- Repository issues, pull requests and wiki
+- Repository issues, pull requests, wiki and protected branches
 - Migrate and mirror repository and its wiki
 - Web editor for repository files and wiki
+- Jupyter Notebook
 - Gravatar and Federated avatar with custom source
 - Mail service
 - Administration panel
- Supports MySQL, PostgreSQL, SQLite3 and [TiDB](https://github.com/pingcap/tidb) (experimental)
- Multi-language support ([22 languages](https://crowdin.com/project/gogs))
+- Supports MySQL, PostgreSQL, SQLite3, MSSQL and [TiDB](https://github.com/pingcap/tidb) (experimental)
+- Multi-language support ([23 languages](https://crowdin.com/project/gogs))

-## System Requirements
+## Hardware Requirements

- A cheap Raspberry Pi is powerful enough for basic functionality.
- 2 CPU cores and 1GB RAM would be the baseline for teamwork.
+- A Raspberry Pi or $5 Digital Ocean Droplet is more than enough to get you started. Some even use 64MB RAM Docker [CaaS](https://blog.docker.com/2016/02/containers-as-a-service-caas/).
+- 2 CPU cores and 512MB RAM would be the baseline for teamwork.
+- Increase CPU cores when your team size gets significantly larger, memory footprint remains low.

 ## Browser Support

@@ -79,12 +81,12 @@ There are 5 ways to install Gogs:
 - [How To Set Up Gogs on Ubuntu 14.04](https://www.digitalocean.com/community/tutorials/how-to-set-up-gogs-on-ubuntu-14-04)
 - [Run your own GitHub-like service with the help of Docker](http://blog.hypriot.com/post/run-your-own-github-like-service-with-docker/)
 - [Dockerized Gogs git server and alpine postgres in 20 minutes or less](http://garthwaite.org/docker-gogs.html)
- [Host Your Own Private GitHub with Gogs.io](https://eladnava.com/host-your-own-private-github-with-gogs-io/)
+- [Host Your Own Private GitHub with Gogs](https://eladnava.com/host-your-own-private-github-with-gogs-io/)
 - [使用 Gogs 搭建自己的 Git 服务器](https://mynook.info/blog/post/host-your-own-git-server-using-gogs) (Chinese)
 - [阿里云上 Ubuntu 14.04 64 位安装 Gogs](http://my.oschina.net/luyao/blog/375654) (Chinese)
 - [Installing Gogs on FreeBSD](https://www.codejam.info/2015/03/installing-gogs-on-freebsd.html)
 - [Gogs on Raspberry Pi](http://blog.meinside.pe.kr/Gogs-on-Raspberry-Pi/)
- [Cloudflare Full SSL with GOGS (Go Git Service) using NGINX](http://www.listekconsulting.com/articles/cloudflare-full-ssl-with-gogs-go-git-service-using-nginx/)
+- [Cloudflare Full SSL with Gogs using NGINX](http://www.listekconsulting.com/articles/cloudflare-full-ssl-with-gogs-go-git-service-using-nginx/)

 ### Screencasts

@@ -96,7 +98,6 @@ There are 5 ways to install Gogs:
 - [OpenShift](https://github.com/tkisme/gogs-openshift)
 - [Cloudron](https://cloudron.io/appstore.html#io.gogs.cloudronapp)
 - [Scaleway](https://www.scaleway.com/imagehub/gogs/)
- [Portal](https://portaldemo.xyz/cloud/)
 - [Sandstorm](https://github.com/cem/gogs-sandstorm)
 - [sloppy.io](https://github.com/sloppyio/quickstarters/tree/master/gogs)
 - [YunoHost](https://github.com/YunoHost-Apps/gogs_ynh)
@@ -105,6 +106,7 @@ There are 5 ways to install Gogs:
 ## Software and Service Support

 - [Drone](https://github.com/drone/drone) (CI)
+- [Jenkins](https://wiki.jenkins-ci.org/display/JENKINS/Gogs+Webhook+Plugin) (CI)
 - [Fabric8](http://fabric8.io/) (DevOps)
 - [Taiga](https://taiga.io/) (Project Management)
 - [Puppet](https://forge.puppetlabs.com/Siteminds/gogs) (IT)
@@ -119,17 +121,14 @@ There are 5 ways to install Gogs:

 ## Acknowledgments

- Router and middleware mechanism of [Macaron](https://github.com/go-macaron/macaron).
- System Monitor Status is inspired by [GoBlog](https://github.com/fuxiaohei/goblog).
- Thanks [Rocker](http://weibo.com/rocker1989) for designing Logo.
+- Thanks [Egon Elbre](https://twitter.com/egonelbre) for designing logo.
 - Thanks [Crowdin](https://crowdin.com/project/gogs) for providing open source translation plan.
 - Thanks [DigitalOcean](https://www.digitalocean.com) for hosting home and demo sites.
 - Thanks [KeyCDN](https://www.keycdn.com/) and [QiNiu](http://www.qiniu.com/) for providing CDN service.

 ## Contributors

- Ex-team members [@lunny](https://github.com/lunny), [@fuxiaohei](https://github.com/fuxiaohei) and [@slene](https://github.com/slene).
- See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors.
+- See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for top 100 contributors.
 - See [TRANSLATORS](conf/locale/TRANSLATORS) for public list of translators.

 ## License
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -1,7 +1,7 @@
-Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs)
+Gogs [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs) [![Build status](https://ci.appveyor.com/api/projects/status/b9uu5ejl933e2wlt/branch/master?svg=true)](https://ci.appveyor.com/project/Unknwon/gogs/branch/master)
 =====================

-Gogs (Go Git Service) 是一款极易搭建的自助 Git 服务。
+Gogs 是一款极易搭建的自助 Git 服务。

 ## 开发目的

@@ -22,21 +22,23 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - 支持反向代理子路径
 - 支持用户、组织和仓库管理系统
 - 支持添加和删除仓库协作者
- 支持仓库和组织级别 Web 钩子（包括 Slack 集成）
+- 支持仓库和组织级别 Web 钩子（包括 Slack 和 Discord 集成）
 - 支持仓库 Git 钩子和部署密钥
- 支持仓库工单（Issue）、合并请求（Pull Request）以及 Wiki
+- 支持仓库工单（Issue）、合并请求（Pull Request）、Wiki 和保护分支
 - 支持迁移和镜像仓库以及它的 Wiki
 - 支持在线编辑仓库文件和 Wiki
 - 支持自定义源的 Gravatar 和 Federated Avatar
+- 支持 Jupyter Notebook
 - 支持邮件服务
 - 支持后台管理面板
- 支持 MySQL、PostgreSQL、SQLite3 和 [TiDB](https://github.com/pingcap/tidb)（实验性支持） 数据库
- 支持多语言本地化（[22 种语言]([more](https://crowdin.com/project/gogs))）
+- 支持 MySQL、PostgreSQL、SQLite3、MSSQL 和 [TiDB](https://github.com/pingcap/tidb)（实验性支持） 数据库
+- 支持多语言本地化（[23 种语言]([more](https://crowdin.com/project/gogs))）

-## 系统要求
+## 硬件要求

 - 最低的系统硬件要求为一个廉价的树莓派
- 如果用于团队项目，建议使用 2 核 CPU 及 1GB 内存
+- 如果用于团队项目管理，建议使用 2 核 CPU 及 512MB 内存
+- 当团队成员大量增加时，可以考虑添加 CPU 核数，内存占用保持不变

 ## 浏览器支持

@@ -65,7 +67,6 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - [OpenShift](https://github.com/tkisme/gogs-openshift)
 - [Cloudron](https://cloudron.io/appstore.html#io.gogs.cloudronapp)
 - [Scaleway](https://www.scaleway.com/imagehub/gogs/)
- [Portal](https://portaldemo.xyz/cloud/)
 - [Sandstorm](https://github.com/cem/gogs-sandstorm)
 - [sloppy.io](https://github.com/sloppyio/quickstarters/tree/master/gogs)
 - [YunoHost](https://github.com/mbugeia/gogs_ynh)
@@ -74,6 +75,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 ## 软件及服务支持

 - [Drone](https://github.com/drone/drone)（CI）
+- [Jenkins](https://wiki.jenkins-ci.org/display/JENKINS/Gogs+Webhook+Plugin)（CI）
 - [Fabric8](http://fabric8.io/)（DevOps）
 - [Taiga](https://taiga.io/)（项目管理）
 - [Puppet](https://forge.puppetlabs.com/Siteminds/gogs)（IT）
@@ -88,17 +90,14 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自

 ## 特别鸣谢

- 基于 [Macaron](https://github.com/go-macaron/macaron) 的路由与中间件机制。
- 基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改的系统监视状态。
- 感谢 [Rocker](http://weibo.com/rocker1989) 设计的 Logo。
+- 感谢 [Egon Elbre](https://twitter.com/egonelbre) 设计的 Logo。
 - 感谢 [Crowdin](https://crowdin.com/project/gogs) 提供免费的开源项目本地化支持。
 - 感谢 [DigitalOcean](https://www.digitalocean.com) 提供主站和体验站点的服务器赞助。
 - 感谢 [KeyCDN](https://www.keycdn.com/) 和 [七牛云存储](http://www.qiniu.com/) 提供 CDN 服务赞助。

 ## 贡献成员

- 前团队成员 [@lunny](https://github.com/lunny)、[@fuxiaohei](https://github.com/fuxiaohei) 和 [@slene](https://github.com/slene)。
- 您可以通过查看 [贡献者页面](https://github.com/gogits/gogs/graphs/contributors) 获取完整的贡献者列表。
+- 您可以通过查看 [贡献者页面](https://github.com/gogits/gogs/graphs/contributors) 获取 TOP 100 的贡献者列表。
 - 您可以通过查看 [TRANSLATORS](conf/locale/TRANSLATORS) 文件获取公开的翻译人员列表。

 ## 授权许可
--- a/cmd/hook.go
+++ b/cmd/hook.go
@@ -0,0 +1,241 @@
+// 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 cmd
+
+import (
+	"bufio"
+	"bytes"
+	"crypto/tls"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/Unknwon/com"
+	"github.com/urfave/cli"
+	log "gopkg.in/clog.v1"
+
+	"github.com/gogits/git-module"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/httplib"
+	"github.com/gogits/gogs/modules/setting"
+	http "github.com/gogits/gogs/routers/repo"
+)
+
+var (
+	CmdHook = cli.Command{
+		Name:        "hook",
+		Usage:       "Delegate commands to corresponding Git hooks",
+		Description: "All sub-commands should only be called by Git",
+		Flags: []cli.Flag{
+			stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"),
+		},
+		Subcommands: []cli.Command{
+			subcmdHookPreReceive,
+			subcmdHookUpadte,
+			subcmdHookPostReceive,
+		},
+	}
+
+	subcmdHookPreReceive = cli.Command{
+		Name:        "pre-receive",
+		Usage:       "Delegate pre-receive Git hook",
+		Description: "This command should only be called by Git",
+		Action:      runHookPreReceive,
+	}
+	subcmdHookUpadte = cli.Command{
+		Name:        "update",
+		Usage:       "Delegate update Git hook",
+		Description: "This command should only be called by Git",
+		Action:      runHookUpdate,
+	}
+	subcmdHookPostReceive = cli.Command{
+		Name:        "post-receive",
+		Usage:       "Delegate post-receive Git hook",
+		Description: "This command should only be called by Git",
+		Action:      runHookPostReceive,
+	}
+)
+
+func runHookPreReceive(c *cli.Context) error {
+	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
+		return nil
+	}
+	setup(c, "hooks/pre-receive.log", true)
+
+	isWiki := strings.Contains(os.Getenv(http.ENV_REPO_CUSTOM_HOOKS_PATH), ".wiki.git/")
+
+	buf := bytes.NewBuffer(nil)
+	scanner := bufio.NewScanner(os.Stdin)
+	for scanner.Scan() {
+		buf.Write(scanner.Bytes())
+		buf.WriteByte('\n')
+
+		if isWiki {
+			continue
+		}
+
+		fields := bytes.Fields(scanner.Bytes())
+		if len(fields) != 3 {
+			continue
+		}
+		oldCommitID := string(fields[0])
+		newCommitID := string(fields[1])
+		branchName := strings.TrimPrefix(string(fields[2]), git.BRANCH_PREFIX)
+
+		// Branch protection
+		repoID := com.StrTo(os.Getenv(http.ENV_REPO_ID)).MustInt64()
+		protectBranch, err := models.GetProtectBranchOfRepoByName(repoID, branchName)
+		if err != nil {
+			if models.IsErrBranchNotExist(err) {
+				continue
+			}
+			fail("Internal error", "GetProtectBranchOfRepoByName [repo_id: %d, branch: %s]: %v", repoID, branchName, err)
+		}
+		if !protectBranch.Protected {
+			continue
+		}
+
+		// Check if whitelist is 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), "")
+		}
+
+		// Check if branch allows direct push
+		if protectBranch.RequirePullRequest {
+			fail(fmt.Sprintf("Branch '%s' is protected and commits must be merged through pull request", branchName), "")
+		}
+
+		// check and deletion
+		if newCommitID == git.EMPTY_SHA {
+			fail(fmt.Sprintf("Branch '%s' is protected from deletion", branchName), "")
+		}
+
+		// Check force push
+		output, err := git.NewCommand("rev-list", oldCommitID, "^"+newCommitID).Run()
+		if err != nil {
+			fail("Internal error", "Fail to detect force push: %v", err)
+		} else if len(output) > 0 {
+			fail(fmt.Sprintf("Branch '%s' is protected from force push", branchName), "")
+		}
+	}
+
+	customHooksPath := filepath.Join(os.Getenv(http.ENV_REPO_CUSTOM_HOOKS_PATH), "pre-receive")
+	if !com.IsFile(customHooksPath) {
+		return nil
+	}
+
+	hookCmd := exec.Command(customHooksPath)
+	hookCmd.Stdout = os.Stdout
+	hookCmd.Stdin = buf
+	hookCmd.Stderr = os.Stderr
+	if err := hookCmd.Run(); err != nil {
+		fail("Internal error", "Fail to execute custom pre-receive hook: %v", err)
+	}
+	return nil
+}
+
+func runHookUpdate(c *cli.Context) error {
+	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
+		return nil
+	}
+	setup(c, "hooks/update.log", false)
+
+	args := c.Args()
+	if len(args) != 3 {
+		fail("Arguments received are not equal to three", "Arguments received are not equal to three")
+	} else if len(args[0]) == 0 {
+		fail("First argument 'refName' is empty", "First argument 'refName' is empty")
+	}
+
+	customHooksPath := filepath.Join(os.Getenv(http.ENV_REPO_CUSTOM_HOOKS_PATH), "update")
+	if !com.IsFile(customHooksPath) {
+		return nil
+	}
+
+	hookCmd := exec.Command(customHooksPath, args...)
+	hookCmd.Stdout = os.Stdout
+	hookCmd.Stdin = os.Stdin
+	hookCmd.Stderr = os.Stderr
+	if err := hookCmd.Run(); err != nil {
+		fail("Internal error", "Fail to execute custom pre-receive hook: %v", err)
+	}
+	return nil
+}
+
+func runHookPostReceive(c *cli.Context) error {
+	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
+		return nil
+	}
+	setup(c, "hooks/post-receive.log", true)
+
+	isWiki := strings.Contains(os.Getenv(http.ENV_REPO_CUSTOM_HOOKS_PATH), ".wiki.git/")
+
+	buf := bytes.NewBuffer(nil)
+	scanner := bufio.NewScanner(os.Stdin)
+	for scanner.Scan() {
+		buf.Write(scanner.Bytes())
+		buf.WriteByte('\n')
+
+		// TODO: support news feeds for wiki
+		if isWiki {
+			continue
+		}
+
+		fields := bytes.Fields(scanner.Bytes())
+		if len(fields) != 3 {
+			continue
+		}
+
+		options := models.PushUpdateOptions{
+			OldCommitID:  string(fields[0]),
+			NewCommitID:  string(fields[1]),
+			RefFullName:  string(fields[2]),
+			PusherID:     com.StrTo(os.Getenv(http.ENV_AUTH_USER_ID)).MustInt64(),
+			PusherName:   os.Getenv(http.ENV_AUTH_USER_NAME),
+			RepoUserName: os.Getenv(http.ENV_REPO_OWNER_NAME),
+			RepoName:     os.Getenv(http.ENV_REPO_NAME),
+		}
+		if err := models.PushUpdate(options); err != nil {
+			log.Error(2, "PushUpdate: %v", err)
+		}
+
+		// Ask for running deliver hook and test pull request tasks.
+		reqURL := setting.LocalURL + options.RepoUserName + "/" + options.RepoName + "/tasks/trigger?branch=" +
+			strings.TrimPrefix(options.RefFullName, git.BRANCH_PREFIX) +
+			"&secret=" + os.Getenv(http.ENV_REPO_OWNER_SALT_MD5) +
+			"&pusher=" + os.Getenv(http.ENV_AUTH_USER_ID)
+		log.Trace("Trigger task: %s", reqURL)
+
+		resp, err := httplib.Head(reqURL).SetTLSClientConfig(&tls.Config{
+			InsecureSkipVerify: true,
+		}).Response()
+		if err == nil {
+			resp.Body.Close()
+			if resp.StatusCode/100 != 2 {
+				log.Error(2, "Fail to trigger task: not 2xx response code")
+			}
+		} else {
+			log.Error(2, "Fail to trigger task: %v", err)
+		}
+	}
+
+	customHooksPath := filepath.Join(os.Getenv(http.ENV_REPO_CUSTOM_HOOKS_PATH), "post-receive")
+	if !com.IsFile(customHooksPath) {
+		return nil
+	}
+
+	hookCmd := exec.Command(customHooksPath)
+	hookCmd.Stdout = os.Stdout
+	hookCmd.Stdin = buf
+	hookCmd.Stderr = os.Stderr
+	if err := hookCmd.Run(); err != nil {
+		fail("Internal error", "Fail to execute custom post-receive hook: %v", err)
+	}
+	return nil
+}
--- a/cmd/import.go
+++ b/cmd/import.go
@@ -5,6 +5,8 @@
 package cmd

 import (
+	"bufio"
+	"bytes"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -59,6 +61,10 @@ func runImportLocale(c *cli.Context) error {

 	now := time.Now()

+	line := make([]byte, 0, 100)
+	badChars := []byte(`="`)
+	escapedQuotes := []byte(`\"`)
+	regularQuotes := []byte(`"`)
 	// Cut out en-US.
 	for _, lang := range setting.Langs[1:] {
 		name := fmt.Sprintf("locale_%s.ini", lang)
@@ -68,10 +74,35 @@ func runImportLocale(c *cli.Context) error {
 			continue
 		}

-		if err := com.Copy(source, target); err != nil {
-			return fmt.Errorf("Copy file: %v", err)
+		// Crowdin surrounds double quotes for strings contain quotes inside,
+		// this breaks INI parser, we need to fix that.
+		sr, err := os.Open(source)
+		if err != nil {
+			return fmt.Errorf("Open: %v", err)
 		}

+		tw, err := os.Create(target)
+		if err != nil {
+			if err != nil {
+				return fmt.Errorf("Open: %v", err)
+			}
+		}
+
+		scanner := bufio.NewScanner(sr)
+		for scanner.Scan() {
+			line = scanner.Bytes()
+			idx := bytes.Index(line, badChars)
+			if idx > -1 && line[len(line)-1] == '"' {
+				// We still want the "=" sign
+				line = append(line[:idx+1], line[idx+2:len(line)-1]...)
+				line = bytes.Replace(line, escapedQuotes, regularQuotes, -1)
+			}
+			tw.Write(line)
+			tw.WriteString("\n")
+		}
+		sr.Close()
+		tw.Close()
+
 		// Modification time of files from Crowdin often ahead of current,
 		// so we need to set back to current.
 		os.Chtimes(target, now, now)
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -5,7 +5,6 @@
 package cmd

 import (
-	"crypto/tls"
 	"fmt"
 	"os"
 	"os/exec"
@@ -14,22 +13,19 @@ import (
 	"time"

 	"github.com/Unknwon/com"
-	git "github.com/gogits/git-module"
-	gouuid "github.com/satori/go.uuid"
 	"github.com/urfave/cli"
 	log "gopkg.in/clog.v1"

 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/httplib"
 	"github.com/gogits/gogs/modules/setting"
+	http "github.com/gogits/gogs/routers/repo"
 )

 const (
 	_ACCESS_DENIED_MESSAGE = "Repository does not exist or you do not have access"
 )

-var CmdServ = cli.Command{
+var Serv = cli.Command{
 	Name:        "serv",
 	Usage:       "This command should only be called by SSH shell",
 	Description: `Serv provide access auth for repositories`,
@@ -39,10 +35,34 @@ var CmdServ = cli.Command{
 	},
 }

-func setup(logPath string) {
+func fail(userMessage, logMessage string, args ...interface{}) {
+	fmt.Fprintln(os.Stderr, "Gogs:", userMessage)
+
+	if len(logMessage) > 0 {
+		if !setting.ProdMode {
+			fmt.Fprintf(os.Stderr, logMessage+"\n", args...)
+		}
+		log.Fatal(3, logMessage, args...)
+	}
+
+	os.Exit(1)
+}
+
+func setup(c *cli.Context, logPath string, connectDB bool) {
+	if c.IsSet("config") {
+		setting.CustomConf = c.String("config")
+	} else if c.GlobalIsSet("config") {
+		setting.CustomConf = c.GlobalString("config")
+	}
+
 	setting.NewContext()
-	setting.NewService()
+
+	level := log.TRACE
+	if setting.ProdMode {
+		level = log.ERROR
+	}
 	log.New(log.FILE, log.FileConfig{
+		Level:    level,
 		Filename: filepath.Join(setting.LogRootPath, logPath),
 		FileRotationConfig: log.FileRotationConfig{
 			Rotate:  true,
@@ -52,17 +72,23 @@ func setup(logPath string) {
 	})
 	log.Delete(log.CONSOLE) // Remove primary logger

+	if !connectDB {
+		return
+	}
+
 	models.LoadConfigs()

-	if setting.UseSQLite3 || setting.UseTiDB {
+	if setting.UseSQLite3 {
 		workDir, _ := setting.WorkDir()
 		os.Chdir(workDir)
 	}

-	models.SetEngine()
+	if err := models.SetEngine(); err != nil {
+		fail("Internal error", "SetEngine: %v", err)
+	}
 }

-func parseCmd(cmd string) (string, string) {
+func parseSSHCmd(cmd string) (string, string) {
 	ss := strings.SplitN(cmd, " ", 2)
 	if len(ss) != 2 {
 		return "", ""
@@ -96,72 +122,8 @@ var (
 	}
 )

-func fail(userMessage, logMessage string, args ...interface{}) {
-	fmt.Fprintln(os.Stderr, "Gogs:", userMessage)
-
-	if len(logMessage) > 0 {
-		if !setting.ProdMode {
-			fmt.Fprintf(os.Stderr, logMessage+"\n", args...)
-		}
-		log.Fatal(3, logMessage, args...)
-	}
-
-	log.Shutdown()
-	os.Exit(1)
-}
-
-func handleUpdateTask(uuid string, user, repoUser *models.User, reponame string, isWiki bool) {
-	task, err := models.GetUpdateTaskByUUID(uuid)
-	if err != nil {
-		if models.IsErrUpdateTaskNotExist(err) {
-			log.Trace("No update task is presented: %s", uuid)
-			return
-		}
-		log.Fatal(2, "GetUpdateTaskByUUID: %v", err)
-	} else if err = models.DeleteUpdateTaskByUUID(uuid); err != nil {
-		log.Fatal(2, "DeleteUpdateTaskByUUID: %v", err)
-	}
-
-	if isWiki {
-		return
-	}
-
-	if err = models.PushUpdate(models.PushUpdateOptions{
-		RefFullName:  task.RefName,
-		OldCommitID:  task.OldCommitID,
-		NewCommitID:  task.NewCommitID,
-		PusherID:     user.ID,
-		PusherName:   user.Name,
-		RepoUserName: repoUser.Name,
-		RepoName:     reponame,
-	}); err != nil {
-		log.Error(2, "Update: %v", err)
-	}
-
-	// Ask for running deliver hook and test pull request tasks.
-	reqURL := setting.LocalURL + repoUser.Name + "/" + reponame + "/tasks/trigger?branch=" +
-		strings.TrimPrefix(task.RefName, git.BRANCH_PREFIX) + "&secret=" + base.EncodeMD5(repoUser.Salt) + "&pusher=" + com.ToStr(user.ID)
-	log.Trace("Trigger task: %s", reqURL)
-
-	resp, err := httplib.Head(reqURL).SetTLSClientConfig(&tls.Config{
-		InsecureSkipVerify: true,
-	}).Response()
-	if err == nil {
-		resp.Body.Close()
-		if resp.StatusCode/100 != 2 {
-			log.Error(2, "Fail to trigger task: not 2xx response code")
-		}
-	} else {
-		log.Error(2, "Fail to trigger task: %v", err)
-	}
-}
-
 func runServ(c *cli.Context) error {
-	if c.IsSet("config") {
-		setting.CustomConf = c.String("config")
-	}
-
-	setup("serv.log")
+	setup(c, "serv.log", true)

 	if setting.SSH.Disabled {
 		println("Gogs: SSH has been disabled")
@@ -172,52 +134,48 @@ func runServ(c *cli.Context) error {
 		fail("Not enough arguments", "Not enough arguments")
 	}

-	cmd := os.Getenv("SSH_ORIGINAL_COMMAND")
-	if len(cmd) == 0 {
+	sshCmd := os.Getenv("SSH_ORIGINAL_COMMAND")
+	if len(sshCmd) == 0 {
 		println("Hi there, You've successfully authenticated, but Gogs does not provide shell access.")
 		println("If this is unexpected, please log in with password and setup Gogs under another user.")
 		return nil
 	}

-	verb, args := parseCmd(cmd)
-	repoPath := strings.ToLower(strings.Trim(args, "'"))
-	rr := strings.SplitN(repoPath, "/", 2)
-	if len(rr) != 2 {
+	verb, args := parseSSHCmd(sshCmd)
+	repoFullName := strings.ToLower(strings.Trim(args, "'"))
+	repoFields := strings.SplitN(repoFullName, "/", 2)
+	if len(repoFields) != 2 {
 		fail("Invalid repository path", "Invalid repository path: %v", args)
 	}
-	username := strings.ToLower(rr[0])
-	reponame := strings.ToLower(strings.TrimSuffix(rr[1], ".git"))
+	ownerName := strings.ToLower(repoFields[0])
+	repoName := strings.TrimSuffix(strings.ToLower(repoFields[1]), ".git")
+	repoName = strings.TrimSuffix(repoName, ".wiki")

-	isWiki := false
-	if strings.HasSuffix(reponame, ".wiki") {
-		isWiki = true
-		reponame = reponame[:len(reponame)-5]
-	}
-
-	repoUser, err := models.GetUserByName(username)
+	owner, err := models.GetUserByName(ownerName)
 	if err != nil {
 		if models.IsErrUserNotExist(err) {
-			fail("Repository owner does not exist", "Unregistered owner: %s", username)
+			fail("Repository owner does not exist", "Unregistered owner: %s", ownerName)
 		}
-		fail("Internal error", "Failed to get repository owner (%s): %v", username, err)
+		fail("Internal error", "Fail to get repository owner '%s': %v", ownerName, err)
 	}

-	repo, err := models.GetRepositoryByName(repoUser.ID, reponame)
+	repo, err := models.GetRepositoryByName(owner.ID, repoName)
 	if err != nil {
 		if models.IsErrRepoNotExist(err) {
-			fail(_ACCESS_DENIED_MESSAGE, "Repository does not exist: %s/%s", repoUser.Name, reponame)
+			fail(_ACCESS_DENIED_MESSAGE, "Repository does not exist: %s/%s", owner.Name, repoName)
 		}
-		fail("Internal error", "Failed to get repository: %v", err)
+		fail("Internal error", "Fail to get repository: %v", err)
 	}
+	repo.Owner = owner

-	requestedMode, has := allowedCommands[verb]
-	if !has {
-		fail("Unknown git command", "Unknown git command %s", verb)
+	requestMode, ok := allowedCommands[verb]
+	if !ok {
+		fail("Unknown git command", "Unknown git command '%s'", verb)
 	}

 	// Prohibit push to mirror repositories.
-	if requestedMode > models.ACCESS_MODE_READ && repo.IsMirror {
-		fail("mirror repository is read-only", "")
+	if requestMode > models.ACCESS_MODE_READ && repo.IsMirror {
+		fail("Mirror repository is read-only", "")
 	}

 	// Allow anonymous (user is nil) clone for public repositories.
@@ -225,36 +183,39 @@ func runServ(c *cli.Context) error {

 	key, err := models.GetPublicKeyByID(com.StrTo(strings.TrimPrefix(c.Args()[0], "key-")).MustInt64())
 	if err != nil {
-		fail("Invalid key ID", "Invalid key ID [%s]: %v", c.Args()[0], err)
+		fail("Invalid key ID", "Invalid key ID '%s': %v", c.Args()[0], err)
 	}

-	if requestedMode == models.ACCESS_MODE_WRITE || repo.IsPrivate {
+	if requestMode == models.ACCESS_MODE_WRITE || repo.IsPrivate {
 		// Check deploy key or user key.
 		if key.IsDeployKey() {
-			if key.Mode < requestedMode {
+			if key.Mode < requestMode {
 				fail("Key permission denied", "Cannot push with deployment key: %d", key.ID)
 			}
 			checkDeployKey(key, repo)
 		} else {
 			user, err = models.GetUserByKeyID(key.ID)
 			if err != nil {
-				fail("internal error", "Failed to get user by key ID(%d): %v", key.ID, err)
+				fail("Internal error", "Fail to get user by key ID '%d': %v", key.ID, err)
 			}

-			mode, err := models.AccessLevel(user, repo)
+			mode, err := models.AccessLevel(user.ID, repo)
 			if err != nil {
 				fail("Internal error", "Fail to check access: %v", err)
-			} else if mode < requestedMode {
+			}
+
+			if mode < requestMode {
 				clientMessage := _ACCESS_DENIED_MESSAGE
 				if mode >= models.ACCESS_MODE_READ {
 					clientMessage = "You do not have sufficient authorization for this action"
 				}
 				fail(clientMessage,
-					"User %s does not have level %v access to repository %s",
-					user.Name, requestedMode, repoPath)
+					"User '%s' does not have level '%v' access to repository '%s'",
+					user.Name, requestMode, repoFullName)
 			}
 		}
 	} else {
+		setting.NewService()
 		// Check if the key can access to the repository in case of it is a deploy key (a deploy keys != user key).
 		// A deploy key doesn't represent a signed in user, so in a site with Service.RequireSignInView activated
 		// we should give read access only in repositories where this deploy key is in use. In other case, a server
@@ -264,33 +225,6 @@ func runServ(c *cli.Context) error {
 		}
 	}

-	uuid := gouuid.NewV4().String()
-	os.Setenv("uuid", uuid)
-
-	// Special handle for Windows.
-	if setting.IsWindows {
-		verb = strings.Replace(verb, "-", " ", 1)
-	}
-
-	var gitcmd *exec.Cmd
-	verbs := strings.Split(verb, " ")
-	if len(verbs) == 2 {
-		gitcmd = exec.Command(verbs[0], verbs[1], repoPath)
-	} else {
-		gitcmd = exec.Command(verb, repoPath)
-	}
-	gitcmd.Dir = setting.RepoRootPath
-	gitcmd.Stdout = os.Stdout
-	gitcmd.Stdin = os.Stdin
-	gitcmd.Stderr = os.Stderr
-	if err = gitcmd.Run(); err != nil {
-		fail("Internal error", "Failed to execute git command: %v", err)
-	}
-
-	if requestedMode == models.ACCESS_MODE_WRITE {
-		handleUpdateTask(uuid, user, repoUser, reponame, isWiki)
-	}
-
 	// Update user key activity.
 	if key.ID > 0 {
 		key, err := models.GetPublicKeyByID(key.ID)
@@ -304,5 +238,35 @@ func runServ(c *cli.Context) error {
 		}
 	}

+	// Special handle for Windows.
+	if setting.IsWindows {
+		verb = strings.Replace(verb, "-", " ", 1)
+	}
+
+	var gitCmd *exec.Cmd
+	verbs := strings.Split(verb, " ")
+	if len(verbs) == 2 {
+		gitCmd = exec.Command(verbs[0], verbs[1], repoFullName)
+	} else {
+		gitCmd = exec.Command(verb, repoFullName)
+	}
+	if requestMode == models.ACCESS_MODE_WRITE {
+		gitCmd.Env = append(os.Environ(), http.ComposeHookEnvs(http.ComposeHookEnvsOptions{
+			AuthUser:  user,
+			OwnerName: owner.Name,
+			OwnerSalt: owner.Salt,
+			RepoID:    repo.ID,
+			RepoName:  repo.Name,
+			RepoPath:  repo.RepoPath(),
+		})...)
+	}
+	gitCmd.Dir = setting.RepoRootPath
+	gitCmd.Stdout = os.Stdout
+	gitCmd.Stdin = os.Stdin
+	gitCmd.Stderr = os.Stderr
+	if err = gitCmd.Run(); err != nil {
+		fail("Internal error", "Fail to execute git command: %v", err)
+	}
+
 	return nil
 }
--- a/cmd/update.go
+++ b/cmd/update.go
@@ -1,58 +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 cmd
-
-import (
-	"os"
-
-	"github.com/urfave/cli"
-	log "gopkg.in/clog.v1"
-
-	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/setting"
-)
-
-var CmdUpdate = cli.Command{
-	Name:        "update",
-	Usage:       "This command should only be called by Git hook",
-	Description: `Update get pushed info and insert into database`,
-	Action:      runUpdate,
-	Flags: []cli.Flag{
-		stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"),
-	},
-}
-
-func runUpdate(c *cli.Context) error {
-	if c.IsSet("config") {
-		setting.CustomConf = c.String("config")
-	}
-
-	setup("update.log")
-
-	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
-		log.Trace("SSH_ORIGINAL_COMMAND is empty")
-		return nil
-	}
-
-	args := c.Args()
-	if len(args) != 3 {
-		log.Fatal(2, "Arguments received are not equal to three")
-	} else if len(args[0]) == 0 {
-		log.Fatal(2, "First argument 'refName' is empty, shouldn't use")
-	}
-
-	task := models.UpdateTask{
-		UUID:        os.Getenv("uuid"),
-		RefName:     args[0],
-		OldCommitID: args[1],
-		NewCommitID: args[2],
-	}
-
-	if err := models.AddUpdateTask(&task); err != nil {
-		log.Fatal(2, "AddUpdateTask: %v", err)
-	}
-
-	return nil
-}
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -84,6 +84,7 @@ func checkVersion() {
 	}

 	// 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"},
@@ -91,10 +92,10 @@ func checkVersion() {
 		{"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.0"},
+		{"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.6"},
+		{"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 {
@@ -406,9 +407,11 @@ func runWeb(ctx *cli.Context) error {
 					m.Get("/:type/new", repo.WebhooksNew)
 					m.Post("/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
 					m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
+					m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost)
 					m.Get("/:id", repo.WebHooksEdit)
 					m.Post("/gogs/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
 					m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost)
+					m.Post("/discord/:id", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksEditPost)
 				})

 				m.Route("/delete", "GET,POST", org.SettingsDelete)
@@ -434,10 +437,21 @@ func runWeb(ctx *cli.Context) error {
 			m.Combo("").Get(repo.Settings).
 				Post(bindIgnErr(auth.RepoSettingForm{}), repo.SettingsPost)
 			m.Group("/collaboration", func() {
-				m.Combo("").Get(repo.Collaboration).Post(repo.CollaborationPost)
+				m.Combo("").Get(repo.SettingsCollaboration).Post(repo.SettingsCollaborationPost)
 				m.Post("/access_mode", repo.ChangeCollaborationAccessMode)
 				m.Post("/delete", repo.DeleteCollaboration)
 			})
+			m.Group("/branches", func() {
+				m.Get("", repo.SettingsBranches)
+				m.Post("/default_branch", repo.UpdateDefaultBranch)
+				m.Combo("/*").Get(repo.SettingsProtectedBranch).
+					Post(bindIgnErr(auth.ProtectBranchForm{}), repo.SettingsProtectedBranchPost)
+			}, func(ctx *context.Context) {
+				if ctx.Repo.Repository.IsMirror {
+					ctx.NotFound()
+					return
+				}
+			})

 			m.Group("/hooks", func() {
 				m.Get("", repo.Webhooks)
@@ -445,21 +459,23 @@ func runWeb(ctx *cli.Context) error {
 				m.Get("/:type/new", repo.WebhooksNew)
 				m.Post("/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
 				m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
+				m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost)
 				m.Get("/:id", repo.WebHooksEdit)
 				m.Post("/:id/test", repo.TestWebhook)
 				m.Post("/gogs/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
 				m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost)
+				m.Post("/discord/:id", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksEditPost)

 				m.Group("/git", func() {
-					m.Get("", repo.GitHooks)
-					m.Combo("/:name").Get(repo.GitHooksEdit).
-						Post(repo.GitHooksEditPost)
+					m.Get("", repo.SettingsGitHooks)
+					m.Combo("/:name").Get(repo.SettingsGitHooksEdit).
+						Post(repo.SettingsGitHooksEditPost)
 				}, context.GitHookService())
 			})

 			m.Group("/keys", func() {
-				m.Combo("").Get(repo.DeployKeys).
-					Post(bindIgnErr(auth.AddSSHKeyForm{}), repo.DeployKeysPost)
+				m.Combo("").Get(repo.SettingsDeployKeys).
+					Post(bindIgnErr(auth.AddSSHKeyForm{}), repo.SettingsDeployKeysPost)
 				m.Post("/delete", repo.DeleteDeployKey)
 			})

@@ -511,25 +527,9 @@ func runWeb(ctx *cli.Context) error {
 			m.Get("/new", repo.NewRelease)
 			m.Post("/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost)
 			m.Post("/delete", repo.DeleteRelease)
-		}, reqRepoWriter, context.RepoRef())
-
-		m.Group("/releases", func() {
 			m.Get("/edit/*", repo.EditRelease)
 			m.Post("/edit/*", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost)
-		}, reqRepoWriter, func(ctx *context.Context) {
-			var err error
-			ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch)
-			if err != nil {
-				ctx.Handle(500, "GetBranchCommit", err)
-				return
-			}
-			ctx.Repo.CommitsCount, err = ctx.Repo.Commit.CommitsCount()
-			if err != nil {
-				ctx.Handle(500, "CommitsCount", err)
-				return
-			}
-			ctx.Data["CommitsCount"] = ctx.Repo.CommitsCount
-		})
+		}, reqRepoWriter, context.RepoRef())

 		// FIXME: Should use ctx.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.
@@ -554,13 +554,13 @@ func runWeb(ctx *cli.Context) error {
 				m.Post("/upload-remove", bindIgnErr(auth.RemoveUploadFileForm{}), repo.RemoveUploadFileFromServer)
 			}, func(ctx *context.Context) {
 				if !setting.Repository.Upload.Enabled {
-					ctx.Handle(404, "", nil)
+					ctx.NotFound()
 					return
 				}
 			})
 		}, reqRepoWriter, context.RepoRef(), func(ctx *context.Context) {
-			if !ctx.Repo.Repository.CanEnableEditor() || ctx.Repo.IsViewCommit {
-				ctx.Handle(404, "", nil)
+			if !ctx.Repo.CanEnableEditor() {
+				ctx.NotFound()
 				return
 			}
 		})
@@ -608,7 +608,7 @@ func runWeb(ctx *cli.Context) error {
 		}, context.RepoRef())
 		m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.RawDiff)

-		m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.CompareDiff)
+		m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", context.RepoRef(), repo.CompareDiff)
 	}, ignSignIn, context.RepoAssignment(), repo.MustBeNotBare)
 	m.Group("/:username/:reponame", func() {
 		m.Get("/stars", repo.Stars)
@@ -616,15 +616,18 @@ func runWeb(ctx *cli.Context) error {
 	}, ignSignIn, context.RepoAssignment(), context.RepoRef())

 	m.Group("/:username", func() {
-		m.Group("/:reponame", func() {
-			m.Get("", repo.Home)
-			m.Get("\\.git$", repo.Home)
+		m.Group("", func() {
+			m.Get("/:reponame", repo.Home)
 		}, ignSignIn, context.RepoAssignment(true), context.RepoRef())

 		m.Group("/:reponame", func() {
-			m.Any("/*", ignSignInAndCsrf, repo.HTTP)
 			m.Head("/tasks/trigger", repo.TriggerTask)
 		})
+		// Use the regexp to match the repository name validation
+		m.Group("/:reponame([\\d\\w-_\\.]+\\.git$)", func() {
+			m.Get("", ignSignIn, context.RepoAssignment(true), context.RepoRef(), repo.Home)
+			m.Route("/*", "GET,POST", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP)
+		})
 	})
 	// ***** END: Repository *****

@@ -663,7 +666,17 @@ func runWeb(ctx *cli.Context) error {
 	case setting.SCHEME_HTTP:
 		err = http.ListenAndServe(listenAddr, m)
 	case setting.SCHEME_HTTPS:
-		server := &http.Server{Addr: listenAddr, TLSConfig: &tls.Config{MinVersion: tls.VersionTLS10}, Handler: m}
+		server := &http.Server{Addr: listenAddr, TLSConfig: &tls.Config{
+			MinVersion:               tls.VersionTLS10,
+			CurvePreferences:         []tls.CurveID{tls.CurveP521, tls.CurveP384, tls.CurveP256},
+			PreferServerCipherSuites: true,
+			CipherSuites: []uint16{
+				tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+				tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, // Required for HTTP/2 support.
+				tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+				tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+			},
+		}, Handler: m}
 		err = server.ListenAndServeTLS(setting.CertFile, setting.KeyFile)
 	case setting.SCHEME_FCGI:
 		err = fcgi.Serve(nil, m)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -3,65 +3,12 @@
 # !!! IF YOU ARE PACKAGING PROVIDER, PLEASE MAKE OWN COPY OF IT !!!

 ; App name that shows on every page title
-APP_NAME = Gogs: Go Git Service
+APP_NAME = Gogs
 ; The name of the system user that runs Gogs
 RUN_USER = git
 ; Either "dev", "prod" or "test"
 RUN_MODE = dev

-[repository]
-; Root path for storing repositories's data, default is "~/<username>/gogs-repositories"
-ROOT =
-; The script type server supports, sometimes could be "sh"
-SCRIPT_TYPE = bash
-; Default ANSI charset for an unrecognized charset
-ANSI_CHARSET =
-; Force every new repository to be private
-FORCE_PRIVATE = false
-; Global maximum creation limit of repository per user, -1 means no limit
-MAX_CREATION_LIMIT = -1
-; Mirror sync queue length, increase if mirror syncing starts hanging
-MIRROR_QUEUE_LENGTH = 1000
-; Patch test queue length, increase if pull request patch testing starts hanging
-PULL_REQUEST_QUEUE_LENGTH = 1000
-; Preferred Licenses to place at the top of the list
-; Name must match file name in conf/license or custom/conf/license
-PREFERRED_LICENSES = Apache License 2.0,MIT License
-; Disable ability to interact with repositories by HTTP protocol
-DISABLE_HTTP_GIT = false
-; Enable ability to migrate repository by local path
-ENABLE_LOCAL_PATH_MIGRATION = false
-
-[repository.editor]
-; List of file extensions that should have line wraps in the CodeMirror editor.
-; Separate extensions with a comma. To line wrap files without extension, just put a comma
-LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd,
-; Valid file modes that have a preview API associated with them, such as api/v1/markdown.
-; Separate values by commas. Preview tab in edit mode won't show if the file extension doesn't match
-PREVIEWABLE_FILE_MODES = markdown
-
-[repository.upload]
-; Enable repository file uploads.
-ENABLED = true
-; Path to temporarily store uploads (default path gets cleaned by Gogs in every start)
-TEMP_PATH = data/tmp/uploads
-; File types that are allowed to be uploaded, e.g. image/jpeg|image/png. Leave empty means allow any file type
-ALLOWED_TYPES =
-; Maximum size of each file in MB
-FILE_MAX_SIZE = 3
-; Maximum number of files per upload
-MAX_FILES = 5
-
-[markdown]
-; Enable hard line break extension
-ENABLE_HARD_LINE_BREAK = false
-; List of custom URL-Schemes that are allowed as links when rendering Markdown
-; for example git,magnet
-CUSTOM_URL_SCHEMES =
-; List of file extensions that should be rendered/edited as Markdown
-; Separate extensions with a comma. To render files w/o extension as markdown, just put a comma
-FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
-
 [server]
 PROTOCOL = http
 DOMAIN = localhost
@@ -119,6 +66,64 @@ ENABLE_GZIP = false
 ; Landing page for non-logged users, can be "home" or "explore"
 LANDING_PAGE = home

+[repository]
+; Root path for storing repositories's data, default is "~/<username>/gogs-repositories"
+ROOT =
+; The script type server supports, sometimes could be "sh"
+SCRIPT_TYPE = bash
+; Default ANSI charset for an unrecognized charset
+ANSI_CHARSET =
+; Force every new repository to be private
+FORCE_PRIVATE = false
+; Global maximum creation limit of repository per user, -1 means no limit
+MAX_CREATION_LIMIT = -1
+; Mirror sync queue length, increase if mirror syncing starts hanging
+MIRROR_QUEUE_LENGTH = 1000
+; Patch test queue length, increase if pull request patch testing starts hanging
+PULL_REQUEST_QUEUE_LENGTH = 1000
+; Preferred Licenses to place at the top of the list
+; Name must match file name in conf/license or custom/conf/license
+PREFERRED_LICENSES = Apache License 2.0,MIT License
+; Disable ability to interact with repositories by HTTP protocol
+DISABLE_HTTP_GIT = false
+; Enable ability to migrate repository by local path
+ENABLE_LOCAL_PATH_MIGRATION = false
+; Concurrency is used to retrieve commits information. This variable define
+; the maximum number of tasks that can be run at the same time. Usually, the
+; 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
+
+[repository.editor]
+; List of file extensions that should have line wraps in the CodeMirror editor.
+; Separate extensions with a comma. To line wrap files without extension, just put a comma
+LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd,
+; Valid file modes that have a preview API associated with them, such as api/v1/markdown.
+; Separate values by commas. Preview tab in edit mode won't show if the file extension doesn't match
+PREVIEWABLE_FILE_MODES = markdown
+
+[repository.upload]
+; Enable repository file uploads.
+ENABLED = true
+; Path to temporarily store uploads (default path gets cleaned by Gogs in every start)
+TEMP_PATH = data/tmp/uploads
+; File types that are allowed to be uploaded, e.g. image/jpeg|image/png. Leave empty means allow any file type
+ALLOWED_TYPES =
+; Maximum size of each file in MB
+FILE_MAX_SIZE = 3
+; Maximum number of files per upload
+MAX_FILES = 5
+
+[markdown]
+; Enable hard line break extension
+ENABLE_HARD_LINE_BREAK = false
+; List of custom URL-Schemes that are allowed as links when rendering Markdown
+; for example git,magnet
+CUSTOM_URL_SCHEMES =
+; List of file extensions that should be rendered/edited as Markdown
+; Separate extensions with a comma. To render files w/o extension as markdown, just put a comma
+FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
+
 [http]
 ; Value for Access-Control-Allow-Origin header, default is not to present
 ACCESS_CONTROL_ALLOW_ORIGIN = 
@@ -154,6 +159,7 @@ SECRET_KEY = !#@FDEWREWR&*(
 LOGIN_REMEMBER_DAYS = 7
 COOKIE_USERNAME = gogs_awesome
 COOKIE_REMEMBER_NAME = gogs_incredible
+COOKIE_SECURE = false
 ; Reverse proxy authentication header name of user name
 REVERSE_PROXY_AUTHENTICATION_USER = X-WEBAUTH-USER

@@ -175,6 +181,8 @@ ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
 ENABLE_CAPTCHA = true

 [webhook]
+; Types are enabled for users to use, can be "gogs", "slack", "discord"
+TYPES = gogs, slack, discord
 ; Hook task queue length, increase if webhook shooting starts hanging
 QUEUE_LENGTH = 1000
 ; Deliver timeout in seconds
@@ -242,6 +250,8 @@ ENABLE_SET_COOKIE = true
 GC_INTERVAL_TIME = 86400
 ; Session life time, default is 86400
 SESSION_LIFE_TIME = 86400
+; Cookie name for CSRF
+CSRF_COOKIE_NAME = _csrf

 [picture]
 ; Path to store user uploaded avatars
@@ -335,6 +345,13 @@ ARGS =
 RUN_AT_START = true
 SCHEDULE = @every 24h

+; Cleanup repository archives
+[cron.repo_archive_cleanup]
+RUN_AT_START = false
+SCHEDULE = @every 24h
+; Time duration to check if archive should be cleaned
+OLDER_THAN = 24h
+
 [git]
 ; Disables highlight of added and removed changes
 DISABLE_DIFF_HIGHLIGHT = false
@@ -393,8 +410,8 @@ ORG_PAGING_NUM = 50
 REPO_PAGING_NUM = 15

 [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
-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
+NAMES = English,简体中文,繁體中文（香港）,繁體中文（台湾）,Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen,Türkçe,čeština,Српски,Svenska,한국어,Galego,Українська

 ; Used for datetimepicker
 [i18n.datelang]
@@ -420,6 +437,7 @@ sr-SP = sr
 sv-SE = sv
 ko-KR = ko
 gl-ES = gl
+uk-UA = uk

 ; Extension mapping to highlight class
 ; e.g. .toml=ini
--- a/conf/locale/TRANSLATORS
+++ b/conf/locale/TRANSLATORS
@@ -7,8 +7,12 @@ Akihiro YAGASAKI <yaggytter AT momiage DOT com>
 Aleksejs Grocevs <aleksejs AT grocevs DOT pro>
 Aleksey Tarakin <hukendo AT yandex DOT ru>
 Alexander Steinhöfer <kontakt AT lx-s DOT de>
+Alexandre Espinosa Menor <aemenor DOT gmail DOT com>
 Alexandre Magno <alexandre DOT mbm AT gmail DOT com>
+Anders B. Hansen <anders AT birkoe DOT com>
+András Schenkerik <moviesharkteam AT gmail DOT com>
 Andrey Nering <andrey AT nering DOT com DOT br>
+Andrey Paskal <apaskal AT gmail DOT com>
 Andrey Solomatin <toadron AT yandex DOT ru>
 Antoine GIRARD <sapk AT sapk DOT fr>
 Arthur Aslanyan <arthur DOT e DOT aslanyan AT gmail DOT com>
@@ -20,10 +24,13 @@ Cysioland
 Damaris Padieu <damizx AT hotmail DOT fr>
 Daniel Speichert <daniel AT speichert DOT pl>
 David Yzaguirre <dvdyzag AT gmail DOT com>
+Denys Khomenko
 Dmitriy Nogay <me AT catwhocode DOT ga>
 Enrico Testori hypertesto AT gmail DOT com
 Ezequiel Gonzalez Rial <gonrial AT gmail DOT com>
+Farhan Naysee <wpmagic70 AT gmail DOT com>
 Gabriel Dugny <gabriel DOT dugny AT gmail DOT com>
+Ganesha <reekoheek AT gmail DOT com>
 Gregor Santner <gdev AT live DOT de>
 Halil Kaya <halil AT halilkaya DOT net>
 Hamid Feizabadi <hamidfzm AT gmail DOT com>
@@ -31,14 +38,17 @@ Huimin Wang <wanghm2009 AT hotmail DOT co DOT jp>
 ilko <kontact-mr.k AT outlook DOT com">
 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>
+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>
 Lafriks <lafriks AT gmail DOT com>
 Lauri Ojansivu <x AT xet7 DOT org>
-Luc Stepniewski <luc AT stepniewski DOT fr>
 Luca Bozzo <luca AT bozzo DOT it>
 Luca Kröger <l DOT kroeger01 AT gmail DOT com>
+Luc Stepniewski <luc AT stepniewski DOT fr>
+Łukasz Jan Niemier <lukasz AT niemier DOT pl>
 Marc Schiller <marc AT schiller DOT im>
 Marvin Menzerath <github AT marvin-menzerath DOT de>
 Michael Härtl <haertl DOT mike AT gmail DOT com>
@@ -49,15 +59,21 @@ Muhammad Fawwaz Orabi <mfawwaz93 AT gmail DOT com>
 Nakao Takamasa <at.mattenn AT gmail DOT com>
 Natan Albuquerque <natanalbuquerque5 AT gmail DOT com>
 Odilon Junior <odilon DOT junior93 AT gmail DOT com>
+Oleksandr Yermakov <olexander DOT yermakov AT gmail DOT com>
+Óscar García Amor <ogarcia AT connectical DOT com>
+Pablo Saavedra <psaavedra AT igalia DOT com>
+Pierre Prinetti >meatqrawldotnet<
 Richard Bukovansky <richard DOT bukovansky @ gmail DOT com>
 Robert Nuske <robert DOT nuske AT web DOT de>
 Robin Hübner <profan AT prfn DOT se>
+Rste Risafov <risafov AT lazy DOT com>
 SeongJae Park <sj38 DOT park AT gmail DOT com>
+Sergey Stepanov <sergystepanov AT gmail DOT com>
 Thomas Fanninger <gogs DOT thomas AT fanninger DOT at>
 Tilmann Bach <tilmann AT outlook DOT com>
 Toni Villena Jiménez <tonivj5 AT gmail DOT com>
 Vladimir Jigulin mogaika AT yandex DOT ru
 Vladimir Vissoultchev <wqweto AT gmail DOT com>
+Vongola <me AT vongola DOT tw>
 YJSoft <yjsoft AT yjsoft DOT pe DOT kr>
-Łukasz Jan Niemier <lukasz AT niemier DOT pl>
-Pablo Saavedra <psaavedra AT igalia DOT com>
+Oscar Quisbert <quisbert_karos AT outlook DOT com>
--- a/conf/locale/locale_bg-BG.ini
+++ b/conf/locale/locale_bg-BG.ini
@@ -48,7 +48,7 @@ cancel=Отказ
 install=Инсталация
 title=Стъпки за инсталиране при първоначално стартиране
 docker_helper=Ако Gogs е стартиран в Docker контейнер, моля прочетете <a target="_blank" href="%s">нашите указания</a> внимателно, преди да правите промени по настройките на тази страница!
-requite_db_desc=Gogs изисква MySQL, PostgreSQL, SQLite3 или TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Настройки на базата данни
 db_type=Тип на база данни
 host=Сървър
@@ -58,9 +58,8 @@ db_name=Име на база данни
 db_helper=Моля, използвайте INNODB engine с utf8_general_ci кодиране на знаци за MySQL.
 ssl_mode=Режим SSL
 path=Път
-sqlite_helper=Файл на SQLite3 или TiDB база данни.<br>Моля използвайте абсолютен път до файл когато стартирате Gogs като услуга.
-err_empty_db_path=Пътят до SQLite3 или TiDB база данни не може да е празен.
-err_invalid_tidb_name=TiDB не позволява "." и "-" в името на базата данни.
+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.
 no_admin_and_disable_registration=Невъзможно изключване на регистрациите без предварително да е създаден поне един административен профил.
 err_empty_admin_password=Паролата на администратор не може да е празна.

@@ -75,6 +74,8 @@ 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.
 http_port=HTTP порт
 http_port_helper=Порт, на който приложението ще слуша.
 app_url=URL адрес на приложението
@@ -116,7 +117,7 @@ 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
+invalid_smtp_from=Невалидно поле От: %v
 save_config_failed=Неуспешно запазване на конфигурация: %v
 invalid_admin_setting=Настройките на профил на администратора са невалидни: %v
 install_success=Добре дошли! Радваме се, че избрахте Gogs, и Ви пожелаваме приятна работа и сърдечни поздрави!
@@ -338,9 +339,9 @@ access_token_deletion=Изтрий индивидуален API ключ за д
 access_token_deletion_desc=При изтриване на този индивидуален API ключ за достъп ще се премахнат всички свързани права на приложението. Желаете ли да продължите?
 delete_token_success=Индивидуалният API ключ за достъп е изтрит успешно! Не забравяйте да преконфигурирате приложението също.

-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=Ще загубите достъп до всички хранилища и екипи, след като напуснете организацията. Желаете ли да продължите?

 delete_account=Изтриване на собствения профил
 delete_prompt=Тази операция ще изтрие Вашия профил завинаги и тя <strong>НЕ МОЖЕ</strong> да бъде отменена в последствие!
@@ -389,15 +390,14 @@ 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

 mirror_from=огледало от
 forked_from=разклонено от
-fork_from_self=Не можете да разклоните хранилище което си е Ваше!
 copy_link=Копирай
 copy_link_success=Копирано!
 copy_link_error=Натиснете ⌘-C или Ctrl-C за да копирате
@@ -415,7 +415,7 @@ create_new_repo_command=Създай ново хранилище чрез ком
 push_exist_repo=Предай съществуващо хранилище през командния ред
 repo_is_empty=Това хранилище е празно. Моля проверете по-късно пак!

-files=Files
+files=Файлове
 branch=Клон
 tree=ИН на ревизия
 filter_branch_and_tag=Филтър по маркер или клон
@@ -473,6 +473,7 @@ editor.add_subdir=Добави поддиректория...
 editor.unable_to_upload_files=Невъзможно качване на файлове в '%s' заради грешка: %v
 editor.upload_files_to_dir=Качи файлове в '%s'

+commits.commit_history=Commit History
 commits.commits=Ревизии
 commits.search=Търсене в ревизии
 commits.find=Намери
@@ -639,6 +640,27 @@ 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.hooks=Уеб-куки
 settings.githooks=Git куки
 settings.basic_settings=Основни настройки
@@ -657,8 +679,8 @@ settings.external_wiki_url_desc=Посетителите ще бъдат пре
 settings.issues_desc=Включи система за проследяване на задачи
 settings.use_internal_issue_tracker=Изполвай вградена система за проследяване на задачи
 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=Формат на URL адрес на външна система за проследяване на задачи
 settings.tracker_issue_style=Стил на именуване на външна система за проследяване на задачи:
 settings.tracker_issue_style.numeric=Цифров
@@ -666,6 +688,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.new_owner_has_same_repo=Новият притежател вече има хранилище със същото име. Изберете друго име.
 settings.convert=Промени към редовно хранилище
 settings.convert_desc=Можете да промените това огледало към редовно хранилище. Конверсията не може да се отмени.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Този потребител няма да
 settings.remove_collaborator_success=Сътрудникът е премахнат.
 settings.search_user_placeholder=Име на потребител...
 settings.org_not_allowed_to_be_collaborator=Невъзможно добавяне на организация като сътрудник.
-settings.user_is_org_member=Потребителят вече участва в организацията и не може да бъде добавен като сътрудник.
 settings.add_webhook=Добави уеб-кука
 settings.hooks_desc=Уеб-куките много приличат на обикновен HTTP POST тригер. Когато нещо се случи в Gogs, ние ще изпратим уведомление до сървъра, който посочите. Научете повече в <a target="_blank" href="%s">Ръководство за уеб-куки</a>.
 settings.webhook_deletion=Изтрий уеб-кука
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Gogs ще изпрати <code>POST</code> заявк
 settings.payload_url=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.slack_username=Потребителско име
 settings.slack_icon_url=URL адрес на икона
 settings.slack_color=Цвят
@@ -745,10 +768,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.slack_token=API ключ
 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.add_deploy_key=Добави ключ за внедряване
 settings.deploy_key_desc=Този ключ за внедряване има права само за четене. Това не е същото като SSH ключове на персонален потребител.
 settings.no_deploy_keys=Все още няма настроен никакъв ключ за внедряване.
@@ -827,6 +852,7 @@ team_permission_desc=Какво ниво на достъп трябва да и

 form.name_reserved=Името на организацията '%s' е запазено.
 form.name_pattern_not_allowed=Име на организацията от вида '%s' не е разрешено.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Настройки
 settings.options=Опции
@@ -917,8 +943,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_update_hooks=Презапис на всички куки, закачени на актуализация на хранилищата (необходимо, когато се ползва собствен път за конфигурацията)
-dashboard.resync_all_update_hooks_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.reinit_missing_repos=Реинициализира всички записи за хранилища
 dashboard.reinit_missing_repos_success=Всички записи за хранилища със загубени Git файлове са реинициализирани успешно.

@@ -1051,11 +1077,9 @@ config.offline_mode=Офлайн режим
 config.disable_router_log=Изключи журнал на маршрутизатора
 config.run_user=Потребителски контекст
 config.run_mode=Режим на изпълнение
-config.git_version=Git Version
-config.repo_root_path=Основен път към хранилища
+config.git_version=Git версия
 config.static_file_root_path=Път към статични файлове
 config.log_file_root_path=Път към журнал
-config.script_type=Тип на скрипта
 config.reverse_auth_user=Потребителско име при обратно удостоверяване

 config.ssh_config=SSH конфигурация
@@ -1070,6 +1094,16 @@ 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.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.db_config=Настройки на базата данни
 config.db_type=Тип
 config.db_host=Сървър
--- a/conf/locale/locale_cs-CZ.ini
+++ b/conf/locale/locale_cs-CZ.ini
@@ -48,7 +48,7 @@ cancel=Zrušit
 install=Instalace
 title=Kroky instalace pro první běh
 docker_helper=Spouštíte-li Gogs uvnitř Dockeru, přečtěte si prosím pečlivě <a target="_blank" href="%s">návod</a>, než něco změníte na této stránce!
-requite_db_desc=Gogs vyžaduje MySQL, PostgreSQL, SQLite3 nebo TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Nastavení databáze
 db_type=Typ databáze
 host=Hostitel
@@ -58,9 +58,8 @@ db_name=Název databáze
 db_helper=Prosíme, pro MySQL použijte INNODB engine se znakovou sadou utf8_general_ci.
 ssl_mode=SSL Mód
 path=Cesta
-sqlite_helper=Cesta k souboru s SQLite3 nebo TiDB databází.<br>Prosíme, použijte absolutní cestu, když startujete službu.
-err_empty_db_path=Cesty k databázovým souborům SQLite3 nebo TiDB nemohou být prázdné.
-err_invalid_tidb_name=Název databáze TiDB nemůže obsahovat znaky "." a "-".
+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.
 no_admin_and_disable_registration=Nemůžete vypnout registraci účtů bez vytvoření účtu správce.
 err_empty_admin_password=Heslo správce nemůže být prázdné.

@@ -75,6 +74,8 @@ domain=Doména
 domain_helper=Toto ovlivňuje URL klonů skrze SSH.
 ssh_port=Port SSH
 ssh_port_helper=Číslo portu, které používá váš SSH server. Nechte jej prázdné pro vypnutí používání 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.
 http_port=Port HTTP
 http_port_helper=Číslo portu, na kterém aplikace naslouchá.
 app_url=URL aplikace
@@ -397,7 +398,6 @@ migrate.failed=Přenesení selhalo: %v

 mirror_from=zrcadlo
 forked_from=rozštěpen z
-fork_from_self=Nemůžete rozštěpit repositář, který již vlastníte!
 copy_link=Kopie
 copy_link_success=Zkopírováno!
 copy_link_error=Pro zkopírování stiskněte ⌘-C nebo Ctrl-C
@@ -473,6 +473,7 @@ editor.add_subdir=Přidat podadresář...
 editor.unable_to_upload_files=Nepodařilo se nahrát soubor '%s'. Chyba: %v
 editor.upload_files_to_dir=Nahrát soubory do '%s'

+commits.commit_history=Commit History
 commits.commits=Revize
 commits.search=Hledání revizí
 commits.find=Hledat
@@ -639,6 +640,27 @@ settings.collaboration.admin=Správce
 settings.collaboration.write=Zápis
 settings.collaboration.read=Čtení
 settings.collaboration.undefined=Neurčeno
+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.hooks=Webové háčky
 settings.githooks=Háčky Gitu
 settings.basic_settings=Základní nastavení
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Alfanumerický
 settings.tracker_url_format_desc=Můžete použít zástupné výrazy <code>{user} {repo} {index}</code> pro uživatelské jméno, název repositáře a index úkolu.
 settings.pulls_desc=Povolit požadavky na stažení, aby veřejné příspěvky mohly být akceptovány
 settings.danger_zone=Nebezpečná zóna
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Nový vlastník již repositář se stejným názvem má. Vyberte, prosíme, jiné jméno.
 settings.convert=Převést na běžný repositář
 settings.convert_desc=Můžete převést toto zrcadlo na běžný repositář. Tato změna nemůže být vrácena.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Tento uživatel po tom, co bude smazán, ji
 settings.remove_collaborator_success=Spolupracovník byl smazán.
 settings.search_user_placeholder=Hledat uživatele...
 settings.org_not_allowed_to_be_collaborator=Není dovoleno přidat organizaci jako spolupracovníka.
-settings.user_is_org_member=Uživatel je již členem organizace, tudíž nemůže být přidán jako spolupracovník.
 settings.add_webhook=Přidat webový háček
 settings.hooks_desc=Webové háčky jsou podobné základním spouštím HTTP POST událostí. Kdykoliv se něco stane v Gogs, bude postaráno o oznámení specifikovanému cílovému serveru. Více se o daném dozvíte v <a target="_blank" href="%s">příručce webových háčků</a>.
 settings.webhook_deletion=Smazat webový háček
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Gogs zašle požadavek typu <code>POST</code> na zadan
 settings.payload_url=URL obsahu
 settings.content_type=Typ obsahu
 settings.secret=Tajný klíč
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Uživatelské jméno
 settings.slack_icon_url=URL ikony uživatele
 settings.slack_color=Barva
@@ -745,10 +768,12 @@ settings.delete_webhook=Smazat webový háček
 settings.recent_deliveries=Nedávné dodávky
 settings.hook_type=Typ háčku
 settings.add_slack_hook_desc=Přidat integraci <a href="%s">Slacku</a> do vašeho repositáře.
+settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
 settings.slack_token=Poukázka
 settings.slack_domain=Doména
 settings.slack_channel=Kanál
 settings.deploy_keys=Klíče pro nasazení
+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=Přidat klíč pro nasazení
 settings.deploy_key_desc=Klíče pro nasazení mají pouze přístup ke čtení. Nejsou stejné jako osobní klíče SSH.
 settings.no_deploy_keys=Žádné klíče pro nasazení nebyly ještě přidány.
@@ -827,6 +852,7 @@ team_permission_desc=Jakou úroveň přístupu má mít tento tým?

 form.name_reserved=Název organizace '%s' je již rezervován.
 form.name_pattern_not_allowed=Vzor názvu organizace '%s' není povolen.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Nastavení
 settings.options=Možnosti
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Provést úklid nad repositáři
 dashboard.git_gc_repos_success=Úklid nad všemi repositáři byl úspěšně proveden.
 dashboard.resync_all_sshkeys=Přepsat soubor '.ssh/authorized_keys' (upozornění: klíče nevzniklé v Gogs budou ztraceny)
 dashboard.resync_all_sshkeys_success=Všechny veřejné klíče byly úspěšně přepsány.
-dashboard.resync_all_update_hooks=Přepsat háček úprav všech repositářů (potřebný v momentě změny cesty k uživatelskému konfiguračnímu souboru)
-dashboard.resync_all_update_hooks_success=Háček úprav všech repositářů byl úspěšně přepsán.
+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.reinit_missing_repos=Znovu inicializovat záznamy všech repositářů, které ztratily soubory Gitu
 dashboard.reinit_missing_repos_success=Záznamy všech repositářů, které ztratily soubory Gitu, byly znovu úspěšně inicializovány.

@@ -1052,10 +1078,8 @@ config.disable_router_log=Vypnout log směrovače
 config.run_user=Účet pro spouštění
 config.run_mode=Režim spouštění
 config.git_version=Git Version
-config.repo_root_path=Kořenový adresář repositářů
 config.static_file_root_path=Kořenový adresář statického souboru
 config.log_file_root_path=Kořenový adresář souboru logu
-config.script_type=Typ skriptu
 config.reverse_auth_user=Uživatel obráceného ověření

 config.ssh_config=Nastavení SSH
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Cesta ke generátoru klíčů ('ssh-keygen')
 config.ssh_minimum_key_size_check=Kontrola minimální velikosti klíčů
 config.ssh_minimum_key_sizes=Minimální velikost klíčů

+config.repo_config=Repository Configuration
+config.repo_root_path=Kořenový adresář repositářů
+config.script_type=Typ skriptu
+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.db_config=Nastavení databáze
 config.db_type=Typ
 config.db_host=Server
--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
@@ -48,7 +48,7 @@ cancel=Abbrechen
 install=Installation
 title=Installationsschritte für den ersten Start
 docker_helper=Wenn Gogs innerhalb von Docker läuft, lesen Sie sich bitte den <a target="_blank" href="%s">Leitfaden</a> genau durch, bevor Sie irgendwas auf dieser Seite ändern!
-requite_db_desc=Gogs benötigt MySQL, PostgreSQL, SQLite3 oder TiDB.
+requite_db_desc=Gogs benötigt MySQL, PostgreSQL, SQLite3, MSSQL oder TiDB.
 db_title=Datenbankeinstellungen
 db_type=Datenbanktyp
 host=Host
@@ -58,9 +58,8 @@ db_name=Datenbankname
 db_helper=Bitte verwenden Sie in MySQL die InnoDB-Engine mit dem Zeichensatz utf8_general_ci.
 ssl_mode=SSL-Modus
 path=Pfad
-sqlite_helper=Der Dateipfad zur SQLite3- oder TiDB-Datenbank. <br>Bitte verwenden Sie einen absoluten Pfad, wenn Gogs als Service gestartet wird.
-err_empty_db_path=SQLite3 oder TiDB Datenbankpfad darf nicht leer sein.
-err_invalid_tidb_name=Der TiDB Datenbankname darf nicht "." und "-" enthalten.
+sqlite_helper=Der Dateipfad zur SQLite3-Datenbank. <br>Bitte verwenden Sie einen absoluten Pfad, wenn Gogs als Service gestartet wird.
+err_empty_db_path=SQLite3 Datenbankpfad darf nicht leer sein.
 no_admin_and_disable_registration=Sie können die Registrierung nicht deaktivieren, ohne ein Administratorkonto zu erstellen.
 err_empty_admin_password=Das Administrator-Passwort darf nicht leer sein.

@@ -75,6 +74,8 @@ domain=Domain
 domain_helper=Dies hat Auswirkung auf die SSH Klon-URLs.
 ssh_port=SSH Port
 ssh_port_helper=Der Port Ihres SSH-Servers. Leer lassen um SSH zu deaktivieren.
+use_builtin_ssh_server=Eingebauten SSH-Server verwenden
+use_builtin_ssh_server_popup=Starte eingebauten SSH-Server für git-Aufgaben, um es vom System-SSH-Dämon zu trennen.
 http_port=HTTP Port
 http_port_helper=Auf dieser Port Nummer wird Gogs erreichbar sein.
 app_url=Anwendungs-URL
@@ -116,7 +117,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
-invalid_smtp_from=SMTP From field is not valid: %v
+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
 install_success=Herzlich Willkommen! Wir sind froh, dass Sie sich für Gogs entschieden haben. Wir wünschen viel Vergnügen damit.
@@ -327,7 +328,7 @@ unbind=Verknüpfung entfernen
 unbind_success=Die Verknüpfung zum sozialen Konto wurde entfernt.

 manage_access_token=Verwaltung persönlicher Zugangs-Token
-generate_new_token=Neuen Token erzeugen
+generate_new_token=Neues Token erzeugen
 tokens_desc=Die von Ihnen erzeugten Token können zum Zugriff auf die Gogs-API verwendet werden.
 new_token_desc=Jeder Token erlaubt vollen Zugriff auf ihr Konto.
 token_name=Token-Name
@@ -356,7 +357,7 @@ visibility=Sichtbarkeit
 visiblity_helper=Dieses Repository ist <span class="ui red text">privat</span>
 visiblity_helper_forced=Der Administrator hat festgelegt, dass alle neuen Repositories <span class="ui red text">privat</span> sein müssen
 visiblity_fork_helper=(Eine Änderung dieses Wertes wirkt sich auf alle Forks aus)
-clone_helper=Sie brauchen Hilfe beim Klonen? Öffnen Sie die <a target="_blank" href="%s">Hilfe</a>!
+clone_helper=Brauchen Sie Hilfe beim Klonen? Hier gibt es <a target="_blank" href="%s">Hilfe</a>!
 fork_repo=Repository forken
 fork_from=Fork von
 fork_visiblity_helper=Die Sichtbarkeit von geforkten Repositories ist nicht veränderbar.
@@ -390,14 +391,13 @@ 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=Du darfst ein Repository vom lokalen Serverpfad migrieren.
+migrate.clone_address_desc_import_local=Sie dürfen auch eine 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

 mirror_from=Mirror von
 forked_from=geforkt von
-fork_from_self=Sie können kein Repository forken, das Ihnen gehört!
 copy_link=Kopieren
 copy_link_success=Kopiert!
 copy_link_error=Drücken Sie ⌘-C oder Strg-C zum Kopieren
@@ -462,7 +462,7 @@ editor.cancel=Abbrechen
 editor.filename_cannot_be_empty=Der Dateiname darf nicht leer sein.
 editor.branch_already_exists=Branch '%s' existiert bereits in diesem Repository.
 editor.directory_is_a_file='%s' im übergeordneten Verzeichnis ist eine Datei und kein Verzeichnis.
-editor.file_is_a_symlink=Die Datei '%s' ist ein Symlink die nicht im Webeditor verändert werden kann.
+editor.file_is_a_symlink=Die Datei '%s' ist ein Symlink, der im Webeditor nicht bearbeitet werden kann.
 editor.filename_is_a_directory=Die Datei '%s' existiert bereits als Verzeichnis in diesem Repository.
 editor.file_editing_no_longer_exists=Die Datei '%s', welche Sie bearbeiten, existiert in diesem Repository nicht mehr.
 editor.file_changed_while_editing=Seit dem Start der Bearbeitung hat sich die Datei geändert. <a target="_blank" href="%s">Hier klicken</a> um die Änderungen zu sehen, oder nochmals <strong>Commit drücken</strong> um die Änderungen zu überschreiben.
@@ -473,6 +473,7 @@ editor.add_subdir=Unterverzeichnis erstellen...
 editor.unable_to_upload_files=Fehler beim Hochladen der Dateien zu '%s'. Fehler: %v
 editor.upload_files_to_dir=Dateien hochladen nach '%s'

+commits.commit_history=Commit Verlauf
 commits.commits=Commits
 commits.search=Commits durchsuchen
 commits.find=Finden
@@ -639,6 +640,27 @@ settings.collaboration.admin=Adminrechte
 settings.collaboration.write=Schreibrechte
 settings.collaboration.read=Leserechte
 settings.collaboration.undefined=Nicht definiert
+settings.branches=Branches
+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_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.
+settings.choose_a_branch=Wählen Sie einen Branch...
+settings.branch_protection=Branch-Schutz
+settings.branch_protection_desc=Bitte wählen Sie Schutzoptionen für den Branch <b>%s</b>.
+settings.protect_this_branch=Diesen Branch schützen
+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=Fügt die Benutzer zu Whitelist hinzu, die in diesen Branch pushen dürfen
+settings.protect_whitelist_committers_desc=Benutzer oder Teams zur Whitelist hinzufügen.
+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
+settings.protect_whitelist_search_teams=Teams suchen
+settings.update_protect_branch_success=Schutzoptionen für diesen Branch wurden erfolgreich aktualisiert!
 settings.hooks=Webhooks
 settings.githooks=Git-Hooks
 settings.basic_settings=Grundeinstellungen
@@ -657,8 +679,8 @@ settings.external_wiki_url_desc=Besucher werden auf diese URL umgeleitet, wenn s
 settings.issues_desc=Issue-Tracker einschalten
 settings.use_internal_issue_tracker=Eingebauten Issue-Tracker verwenden
 settings.use_external_issue_tracker=Externes Issue-System verwenden
-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 eines externen Issue Trackers
+settings.external_tracker_url_desc=Besucher werden auf diese URL umgeleitet, wenn sie auf den Tab klicken.
 settings.tracker_url_format=URL-Format des externen Issue-Systems
 settings.tracker_issue_style=Namenskonvention des externen Issue-Trackers:
 settings.tracker_issue_style.numeric=Numerisch
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Alphanumerisch
 settings.tracker_url_format_desc=Sie können die Platzhalter <code>{user} {repo} {index}</code> für den Benutzernamen, den Namen des Repositories und die Issue-Nummer verwenden.
 settings.pulls_desc=Pull-Requests aktivieren, um öffentliche Mitwirkung zu ermöglichen
 settings.danger_zone=Gefahrenzone
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Der neue Eigentümer hat bereits ein Repository mit dem gleichen Namen. Bitte wählen Sie einen anderen Namen.
 settings.convert=In ein normales Repository umwandeln
 settings.convert_desc=Dieser Mirror kann in ein normales Repository umgewandelt werden. Dies kann nicht rückgängig gemacht werden.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Nach dem Löschen wird dieser Benutzer keine
 settings.remove_collaborator_success=Mitarbeiter wurde entfernt.
 settings.search_user_placeholder=Benutzer suchen...
 settings.org_not_allowed_to_be_collaborator=Eine Organisation kann nicht als Mitarbeiter hinzugefügt werden.
-settings.user_is_org_member=Benutzer ist ein Organisationsmitglied und kann nicht als Mitarbeiter hinzugefügt werden.
 settings.add_webhook=Webhook hinzufügen
 settings.hooks_desc=Webhooks erlauben es Ihnen, externe Dienste zu informieren, wenn etwas Bestimmtes in Ihrem Repository passiert. Gogs sendet dann einen POST-Request an alle angegebenen URLs. Erfahren Sie mehr in unserem <a target="_blank" href="%s">Webhooks Guide</a>.
 settings.webhook_deletion=Webhook entfernen
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Gogs sendet einen <code>POST</code>-Request an die unt
 settings.payload_url=Payload URL
 settings.content_type=Inhaltstyp
 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.slack_username=Benutzername
 settings.slack_icon_url=Icon URL
 settings.slack_color=Farbe
@@ -745,10 +768,12 @@ settings.delete_webhook=Webhook löschen
 settings.recent_deliveries=Letzte Zustellungen
 settings.hook_type=Hook Typ
 settings.add_slack_hook_desc=Fügen Sie <a href="%s">Slack</a>-Integration zu Ihrem Repository hinzu.
+settings.add_discord_hook_desc=Fügen Sie <a href="%s">Discord</a>-Integration zu Ihrem Repository hinzu.
 settings.slack_token=Token
 settings.slack_domain=Domain
 settings.slack_channel=Kanal
 settings.deploy_keys=Deploy-Schlüssel
+settings.deploy_keys_helper=<b>Häufiger Fehler!</b> Wenn Sie öffentliche Schlüssel hinzufügen wollen, gehen Sie zu Ihren <a href="%s%s"> Kontoeinstellungen</a>.
 settings.add_deploy_key=Deploy-Schlüssel hinzufügen
 settings.deploy_key_desc=Deploy-Schlüssel haben nur lesenden Zugriff. Sie sind nicht identisch mit dem SSH-Schlüssel des persönlichen Kontos.
 settings.no_deploy_keys=Sie haben noch keine Deploy-Schlüssel hinzugefügt.
@@ -827,6 +852,7 @@ team_permission_desc=Welche Berechtigungsstufe soll das Team haben?

 form.name_reserved=Organisationsname '%s' ist bereits vergeben.
 form.name_pattern_not_allowed=Organisationsnamen der Form '%s' sind nicht erlaubt.
+form.team_name_reserved=Der Teamname '%s' ist reserviert.

 settings=Einstellungen
 settings.options=Optionen
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Garbage Collection auf Repositories ausführen
 dashboard.git_gc_repos_success=Garbage Collection wurde auf allen Repositories erfolgreich ausgeführt.
 dashboard.resync_all_sshkeys=Datei '.ssh/authorized_keys' neu anlegen (Achtung: Schlüssel, die nicht zu Gogs gehören gehen verloren)
 dashboard.resync_all_sshkeys_success=Alle öffentlichen Keys wurden erfolgreich neu geschrieben.
-dashboard.resync_all_update_hooks=Alle Aktualisierungs-Hooks von Repositories neu anlegen (wird benötigt, wenn der angepasste Konfigurationspfad geändert wurde)
-dashboard.resync_all_update_hooks_success=Die Hooks aller Repositories wurden erfolgreich neu angelegt.
+dashboard.resync_all_hooks=Synchronisiere pre-receive, update und post-receive Hooks für alle Repositorien
+dashboard.resync_all_hooks_success=Pre-receive, update und post-receive Hooks aller Repositorien wurden erfolgreich synchronisiert.
 dashboard.reinit_missing_repos=Alle Repository-Datensätze mit verloren gegangenen Git-Dateien neu initialisieren
 dashboard.reinit_missing_repos_success=Alle Repository-Datensätze, die Git-Dateien verloren haben wurden erfolgreich neu initialisiert.

@@ -1010,7 +1036,7 @@ auths.bind_dn=DN binden
 auths.bind_password=Passwort binden
 auths.bind_password_helper=Achtung: Das Passwort wird im Klartext gespeichert. Benutzen Sie kein Konto mit hoher Berechtigungsstufe.
 auths.user_base=Basis für Benutzersuche
-auths.user_dn=Benutzer DN
+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
@@ -1052,10 +1078,8 @@ config.disable_router_log=Router-Log deaktivieren
 config.run_user=Ausführender Benutzer
 config.run_mode=Laufzeit-Modus
 config.git_version=Git Version
-config.repo_root_path=Repository-Verzeichnis
 config.static_file_root_path=Verzeichnis für statische Dateien
 config.log_file_root_path=Log-Verzeichnis
-config.script_type=Skript-Typ
 config.reverse_auth_user=Nutzer bei Reverse-Authentifizierung

 config.ssh_config=SSH Konfiguration
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Keygen ('ssh-keygen') Pfad
 config.ssh_minimum_key_size_check=Prüfung der Mindestschlüssellänge
 config.ssh_minimum_key_sizes=Minimale Schlüssellängen

+config.repo_config=Repository-Konfiguration
+config.repo_root_path=Repository-Verzeichnis
+config.script_type=Skript-Typ
+config.repo_force_private=Erzwinge privat
+config.max_creation_limit=Maximal erstellbare Anzahl
+config.preferred_licenses=Bevorzugte Lizenzen
+config.disable_http_git=Deaktiviere HTTP-Git
+config.enable_local_path_migration=Erlaube Migration von lokalem Pfad
+config.commits_fetch_concurrency=Anzahl gleichzeitiger Commit-/Fetch-Prozesse
+
 config.db_config=Datenbankkonfiguration
 config.db_type=Typ
 config.db_host=Host
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -48,7 +48,7 @@ cancel = Cancel
 install = Installation
 title = Install Steps For First-time Run
 docker_helper = If you're running Gogs inside Docker, please read <a target="_blank" href="%s">Guidelines</a> carefully before you change anything in this page!
-requite_db_desc = Gogs requires MySQL, PostgreSQL, SQLite3 or TiDB.
+requite_db_desc = Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title = Database Settings
 db_type = Database Type
 host = Host
@@ -58,9 +58,8 @@ db_name = Database Name
 db_helper = Please use INNODB engine with utf8_general_ci charset for MySQL.
 ssl_mode = SSL Mode
 path = Path
-sqlite_helper = The file path of SQLite3 or TiDB database. <br>Please use absolute path when you start as service.
-err_empty_db_path = SQLite3 or TiDB database path cannot be empty.
-err_invalid_tidb_name = TiDB database name does not allow characters "." and "-".
+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.
 no_admin_and_disable_registration = You cannot disable registration without creating an admin account.
 err_empty_admin_password = Admin password cannot be empty.

@@ -75,6 +74,8 @@ domain = Domain
 domain_helper = This affects SSH clone URLs.
 ssh_port = SSH Port
 ssh_port_helper = Port number which your SSH server is using, leave it empty to disable SSH feature.
+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.
 http_port = HTTP Port
 http_port_helper = Port number which application will listen on.
 app_url = Application URL
@@ -146,7 +147,7 @@ create_new_account = Create New Account
 register_hepler_msg = Already have an account? Sign in now!
 social_register_hepler_msg = Already have an account? Bind now!
 disable_register_prompt = Sorry, registration has been disabled. Please contact the site administrator.
-disable_register_mail = Sorry, Register Mail Confirmation has been disabled.
+disable_register_mail = Sorry, email services are disabled. Please contact the site administrator.
 remember_me = Remember Me
 forgot_password= Forgot Password
 forget_password = Forgot password?
@@ -397,7 +398,6 @@ migrate.failed = Migration failed: %v

 mirror_from = mirror of
 forked_from = forked from
-fork_from_self = You cannot fork a repository you already own!
 copy_link = Copy
 copy_link_success = Copied!
 copy_link_error = Press ⌘-C or Ctrl-C to copy
@@ -473,6 +473,7 @@ 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'

+commits.commit_history = Commit History
 commits.commits = Commits
 commits.search = Search commits
 commits.find = Find
@@ -499,7 +500,7 @@ issues.new_label = New Label
 issues.new_label_placeholder = Label name...
 issues.create_label = 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.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
@@ -639,6 +640,27 @@ settings.collaboration.admin = Admin
 settings.collaboration.write = Write
 settings.collaboration.read = Read
 settings.collaboration.undefined = 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.hooks = Webhooks
 settings.githooks = Git Hooks
 settings.basic_settings = Basic Settings
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric = 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 = Danger Zone
+settings.cannot_fork_to_same_owner = You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name.
 settings.convert = Convert To Regular Repository
 settings.convert_desc = You can convert this mirror to a regular repository. This cannot be reversed.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc = This user will no longer have collaboratio
 settings.remove_collaborator_success = Collaborator has been removed.
 settings.search_user_placeholder = Search user...
 settings.org_not_allowed_to_be_collaborator = Organization is not allowed to be added as a collaborator.
-settings.user_is_org_member = User is organization member who cannot be added as a collaborator.
 settings.add_webhook = Add Webhook
 settings.hooks_desc = Webhooks are much like basic HTTP POST event triggers. Whenever something occurs in Gogs, we will handle the notification to the target host you specify. Learn more in this <a target="_blank" href="%s">Webhooks Guide</a>.
 settings.webhook_deletion = Delete Webhook
@@ -723,6 +745,7 @@ settings.add_webhook_desc = Gogs will send a <code>POST</code> request to the UR
 settings.payload_url = Payload URL
 settings.content_type = 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.slack_username = Username
 settings.slack_icon_url = Icon URL
 settings.slack_color = Color
@@ -745,10 +768,12 @@ settings.delete_webhook = Delete Webhook
 settings.recent_deliveries = Recent Deliveries
 settings.hook_type = Hook Type
 settings.add_slack_hook_desc = Add <a href="%s">Slack</a> integration to your repository.
+settings.add_discord_hook_desc = Add <a href="%s">Discord</a> integration to your repository.
 settings.slack_token = Token
 settings.slack_domain = Domain
 settings.slack_channel = Channel
 settings.deploy_keys = 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 = Add Deploy Key
 settings.deploy_key_desc = Deploy keys have read-only access. They are not the same as personal account SSH keys.
 settings.no_deploy_keys = You haven't added any deploy keys.
@@ -827,6 +852,7 @@ team_permission_desc = What permission level should this team have?

 form.name_reserved = Organization name '%s' is reserved.
 form.name_pattern_not_allowed = Organization name pattern '%s' is not allowed.
+form.team_name_reserved = Team name '%s' is reserved.

 settings = Settings
 settings.options = Options
@@ -917,8 +943,8 @@ dashboard.git_gc_repos = Do garbage collection on repositories
 dashboard.git_gc_repos_success = All repositories have done garbage collection successfully.
 dashboard.resync_all_sshkeys = Rewrite '.ssh/authorized_keys' file (caution: non-Gogs keys will be lost)
 dashboard.resync_all_sshkeys_success = All public keys have been rewritten successfully.
-dashboard.resync_all_update_hooks = Rewrite all update hook of repositories (needed when custom config path is changed)
-dashboard.resync_all_update_hooks_success = All repositories' update hook have been rewritten successfully.
+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.reinit_missing_repos = Reinitialize all repository records that lost Git files
 dashboard.reinit_missing_repos_success = All repository records that lost Git files have been reinitialized successfully.

@@ -1052,10 +1078,8 @@ config.disable_router_log = Disable Router Log
 config.run_user = Run User
 config.run_mode = Run Mode
 config.git_version = Git Version
-config.repo_root_path = Repository Root Path
 config.static_file_root_path = Static File Root Path
 config.log_file_root_path = Log File Root Path
-config.script_type = Script Type
 config.reverse_auth_user = Reverse Authentication User

 config.ssh_config = SSH Configuration
@@ -1070,6 +1094,16 @@ 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.repo_config = Repository Configuration
+config.repo_root_path = Repository Root Path
+config.script_type = 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.db_config = Database Configuration
 config.db_type = Type
 config.db_host = Host
--- a/conf/locale/locale_es-ES.ini
+++ b/conf/locale/locale_es-ES.ini
@@ -48,7 +48,7 @@ cancel=Cancelar
 install=Instalación
 title=Pasos de la instalación por primera vez
 docker_helper=Si está ejecutando Gogs usando Docker, ¡por favor lea <a target="_blank" href="%s"> estas pautas</a> antes de cambiar nada en esta página!
-requite_db_desc=Gogs requiere una base de datos MySQL, PostgreSQL, SQLite3 o TiDB.
+requite_db_desc=Gogs requiere un SGBD como MySQL, PostgreSQL, SQLite3 o TiDB.
 db_title=Configuración de base de datos
 db_type=Tipo de base de datos
 host=Host
@@ -58,9 +58,8 @@ db_name=Nombre de la base de datos
 db_helper=Por favor utilice el motor INNODB con la configuración de caracteres utf8_general_ci para MySQL.
 ssl_mode=Modo SSL
 path=Ruta
-sqlite_helper=Ruta al archivo de base de datos SQLite3 o TiDB. <br>Por favor, usa una ruta absoluta cuando inicies como servicio.
-err_empty_db_path=La ruta a la base de datos SQLite3 o TiDB no puede estar vacía.
-err_invalid_tidb_name=El nombre de la base de datos TiDB no puede contener los caracteres "." ni "-".
+sqlite_helper=La ruta del archivo de base de datos de SQLite3. <br> Por favor usar una ruta absoluta al iniciar Gogs como servicio.
+err_empty_db_path=La ruta de la base de datos SQLite3 no puede estar vacía.
 no_admin_and_disable_registration=No puede deshabilitar el registro sin crear una cuenta de administrador.
 err_empty_admin_password=La contraseña de administrador no puede estar vacía.

@@ -75,6 +74,8 @@ domain=Dominio
 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.
 http_port=Puerto HTTP
 http_port_helper=Puerto en el que escuchará la aplicación.
 app_url=URL de la aplicación
@@ -116,7 +117,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
-invalid_smtp_from=SMTP From field is not valid: %v
+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
 install_success=Bienvenido! Estamos encantados de que hayas escogido Gogs, diviértete y cuídate.
@@ -397,7 +398,6 @@ migrate.failed=Migración fallida: %v

 mirror_from=espejo de
 forked_from=forked de
-fork_from_self=¡No puedes crear un fork de un repositorio que ya es tuyo!
 copy_link=Copiar
 copy_link_success=¡Copiado!
 copy_link_error=Presione ⌘ + C o Ctrl-C para copiar
@@ -473,6 +473,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.commits=Commits
 commits.search=Buscar commits
 commits.find=Buscar
@@ -639,6 +640,27 @@ settings.collaboration.admin=Administrador
 settings.collaboration.write=Escritura
 settings.collaboration.read=Lectura
 settings.collaboration.undefined=Indefinido
+settings.branches=Ramas
+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_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.
+settings.choose_a_branch=Elegir una rama...
+settings.branch_protection=Protección de la rama
+settings.branch_protection_desc=Por favor, elija una opción de protección para la rama <b>%s</b>.
+settings.protect_this_branch=Proteger esta rama
+settings.protect_this_branch_desc=Desactivar force pushes y evite la eliminación.
+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.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Configuración Básica
@@ -657,8 +679,8 @@ settings.external_wiki_url_desc=Los visitantes serán redireccionados a la URL c
 settings.issues_desc=Habilitar rastreo de incidencias
 settings.use_internal_issue_tracker=Usar rastreo de incidencias ligero incluido
 settings.use_external_issue_tracker=Usar tracker externo de incidencias
-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 de seguimiento de problemas externos
+settings.external_tracker_url_desc=Los visitantes serán redirigidos a la URL cuando hagan click en la barra.
 settings.tracker_url_format=Formato URL del tracker de incidencias externo
 settings.tracker_issue_style=Estilo de etiquetado del tracker externo de incidencias:
 settings.tracker_issue_style.numeric=Numérico
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Alfanumérico
 settings.tracker_url_format_desc=Puedes usar las plantillas <code>{user} {repo} {index}</code> para el nombre de usuario, nombre del repositorio e índice de la incidencia.
 settings.pulls_desc=Habilitar Pull Requests para aceptar contribuciones públicas
 settings.danger_zone=Zona de Peligro
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=El nuevo propietario tiene un repositorio con el mismo nombre.
 settings.convert=Convertir en un repositorio normal
 settings.convert_desc=Puedes convertir este repositorio en un repositorio normal. Este cambio no se puede deshacer.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Este usuario no podrá colaborar en este rep
 settings.remove_collaborator_success=El colaborador ha sido eliminado.
 settings.search_user_placeholder=Buscar usuario...
 settings.org_not_allowed_to_be_collaborator=Las organizaciones no tiene permitido ser añadidas como colaboradores.
-settings.user_is_org_member=El usuario es miembro de la organización, no puede ser añadido como colaborador.
 settings.add_webhook=Añadir Webhook
 settings.hooks_desc=Los Webhooks permiten a servicios externos recibir notificaciones cuando sucedan ciertos eventos en Gogs. Cuando sucedan los eventos especificados, enviaremos una petición POST a cada una de las URLs indicadas. Para obtener más información, consulta nuestra <a target="_blank" href="%s">Guía de Webhooks</a>.
 settings.webhook_deletion=Eliminar Webhook
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Enviaremos una petición <code>POST</code> a la siguie
 settings.payload_url=URL de Payload
 settings.content_type=Tipo de contenido
 settings.secret=Secreto
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Nombre de usuario
 settings.slack_icon_url=URL de icono
 settings.slack_color=Color
@@ -745,10 +768,12 @@ settings.delete_webhook=Borrar Webhook
 settings.recent_deliveries=Envíos Recientes
 settings.hook_type=Tipo de Hook
 settings.add_slack_hook_desc=Añade integración con <a href="%s">Slack</a> a tu repositorio.
+settings.add_discord_hook_desc=Añade integración con <a href="%s">Slack</a> a tu repositorio.
 settings.slack_token=Token
 settings.slack_domain=Dominio
 settings.slack_channel=Canal
 settings.deploy_keys=Claves de Despliegue
+settings.deploy_keys_helper=<b>Gotcha!</b> Si usted está buscando agregar claves públicas personales, por favor, agréguelos en la <a href="%s%s"> configuración de la cuenta</a>.
 settings.add_deploy_key=Añadir Clave de Despliegue
 settings.deploy_key_desc=La clave de desarrollo tiene sólo acceso de lectura. No es igual que las claves SSH de las cuentas personales.
 settings.no_deploy_keys=No has añadido ninguna clave de despliegue.
@@ -827,6 +852,7 @@ team_permission_desc=¿Qué nivel de permisos debería tener este equipo?

 form.name_reserved=El nombre de la organización '%s' está reservado.
 form.name_pattern_not_allowed=El patrón de nombre de la organización '%s' no está permitido.
+form.team_name_reserved=El nombre de equipo '%s' está reservado.

 settings=Configuración
 settings.options=Opciones
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Ejecutar la recolección de basura en los repositorios
 dashboard.git_gc_repos_success=Todos los repositorios han ejecutado correctamente el recolector de basuras.
 dashboard.resync_all_sshkeys=Reescribir el fichero '.ssh/authorized_keys'(atención: se perderán las claves que no pertenezcan a Gogs)
 dashboard.resync_all_sshkeys_success=Todas las claves públicas se han reescrito correctamente.
-dashboard.resync_all_update_hooks=Reescribir todos los hooks de actualización de los repositorios (necesario cuando se modifica la ruta de configuración personalizada)
-dashboard.resync_all_update_hooks_success=Todos los hooks de actualización de los repositorios se han reescrito correctamente.
+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.reinit_missing_repos=Reinicializar todos los registros del repositorio que tienen archivos Git eliminados
 dashboard.reinit_missing_repos_success=Todos los registros del repositorio con archivos Git eliminados han sido reinicializados con éxito.

@@ -1051,11 +1077,9 @@ config.offline_mode=Modo Sin Conexión
 config.disable_router_log=Deshabilitar Log del Router
 config.run_user=Ejecutada como Usuario
 config.run_mode=Modo de ejecución
-config.git_version=Git Version
-config.repo_root_path=Ruta del Repositorio
+config.git_version=Versión de Git
 config.static_file_root_path=Ruta de los Ficheros Estáticos
 config.log_file_root_path=Ruta de los Ficheros de Log
-config.script_type=Tipo de Script
 config.reverse_auth_user=Autenticación Inversa de Usuario

 config.ssh_config=Configuración SSH
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Ruta del generador de claves ('ssh-keygen')
 config.ssh_minimum_key_size_check=Tamaño mínimo de la clave de verificación
 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.max_creation_limit=Limite máximo de creación
+config.preferred_licenses=Preferred Licenses
+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
+
 config.db_config=Configuración de la Base de Datos
 config.db_type=Tipo
 config.db_host=Host
--- a/conf/locale/locale_fi-FI.ini
+++ b/conf/locale/locale_fi-FI.ini
@@ -23,13 +23,13 @@ password=Salasana
 re_type=Kirjoita uudelleen
 captcha=Captcha

-repository=Repo
+repository=Repository
 organization=Organisaatio
 mirror=Peili
-new_repo=Uusi repo
+new_repo=Uusi repository
 new_migrate=Uusi migraatio
 new_mirror=Uusi peilaus
-new_fork=Uusi haara reposta
+new_fork=Uusi fork-repository
 new_org=Uusi organisaatio
 manage_org=Ylläpidä organisaatioita
 admin_panel=Ylläpito paneeli
@@ -48,7 +48,7 @@ cancel=Peruuta
 install=Asennus
 title=Asennusvaiheet ottaessa ensi kertaa käyttöön
 docker_helper=Jos käytät Gogsia Dockerin sisällä, ole hyvä ja lue <a target="_blank" href="%s">ohjeet</a> huolellisesti ennen kuin muutat mitään tältä sivulta!
-requite_db_desc=Gogs tarvitsee MySQL, PostgreSQL, SQLite3 tai TiDB.
+requite_db_desc=Gogs tarvitsee jonkin seuraavista: MySQL, PostgreSQL, SQLite3, MSSQL tai TiDB.
 db_title=Tietokanta asetukset
 db_type=Tietokanta tyyppi
 host=Isäntä
@@ -58,9 +58,8 @@ db_name=Tietokannan nimi
 db_helper=Ole hyvä ja käytä INNODB moottoria ja utf8_general_ci merkistöä MySQLssä.
 ssl_mode=SSL tila
 path=Polku
-sqlite_helper=SQLite3 tai TiDB tietokanta polku. <br>Käytä absoluuttista polkua kun käynnistät palvelun.
-err_empty_db_path=SQLite3 tai TiDB tietokanta polku ei voi olla tyhjä.
-err_invalid_tidb_name=TiDB tietokannan nimessä ei voi olla merkkejä "." ja "-".
+sqlite_helper=Tiedostopolku SQLite3 tietokantaan. <br>Käytä absoluuttista polkua ajaessasi palveluna.
+err_empty_db_path=SQLite3 tietokantapolku ei voi olla tyhjä.
 no_admin_and_disable_registration=Et voi poistaa käytöstä rekisteröintiä luomatta ylläpito tiliä.
 err_empty_admin_password=Ylläpito salasana ei voi olla tyhjä.

@@ -70,11 +69,13 @@ 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.
 run_user=Suorita käyttäjänä
-run_user_helper=Käyttäjällä täytyy olla pääsy repo juuri polkuun ja suorittaa Gogs.
+run_user_helper=Käyttäjällä täytyy olla oikeus repositoryn juuripolkuun. Käyttäjällä täytyy myös olla oikeus suorittaa Gogs.
 domain=Verkkotunnus
 domain_helper=Tämä vaikuttaa SSH klooni URLeihin.
 ssh_port=SSH portti
 ssh_port_helper=Portti numero jota SSH palvelimesi käyttää, jätä tyhjäksi poistaaksesi käytöstä SSH toiminnon.
+use_builtin_ssh_server=Käytä sisäänrakennettua SSH palvelinta
+use_builtin_ssh_server_popup=Käynnistä sisäänrakennettu SSH-palvelin Git-operaatioille, järjestelmän SSH-palvelusta erottautumiseksi.
 http_port=HTTP portti
 http_port_helper=Portti numero jota sovellus tulee kuuntelemaan.
 app_url=Sovellus URL
@@ -96,8 +97,8 @@ offline_mode=Ota käyttöön Offline tila
 offline_mode_popup=Poista käytöstä CDN myös tuotanto tilassa, kaikki resurssi tiedostot palvellaan paikallisesti.
 disable_gravatar=Poista käytöstä Gravatar palvelu
 disable_gravatar_popup=Poista käytöstä Gravatar ja mukautetut lähteet, kaikki profiilikuvat on käyttäjien palvelimelle lähettämiä tai oletus.
-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=Käytä ulkopuolista profiilikuvien hakua
+federated_avatar_lookup_popup=Ota ulkopuolinen profiilikuvien haku käyttöön käyttääksesi avoimen lähdekoodin libravatar-palvelua.
 disable_registration=Poista käytöstä itse-rekisteröinti
 disable_registration_popup=Poista käyttäjän itse rekisteröinti, vain ylläpito voi luoda tilejä.
 enable_captcha=Ota käyttöön Captcha
@@ -116,7 +117,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
-invalid_smtp_from=SMTP From field is not valid: %v
+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
 install_success=Tervetuloa! Olemme iloisia että valitsit Gogs, pidä hauskaa ja pidä huolta itsestäsi.
@@ -127,7 +128,7 @@ uname_holder=Käyttäjätunnus tai sähköposti
 password_holder=Salasana
 switch_dashboard_context=Vaihda kojelaudan kontekstia
 my_repos=Reponi
-show_more_repos=Show more repositories...
+show_more_repos=Näytä lisää repoja...
 collaborative_repos=Yhteistyö repot
 my_orgs=Organisaationi
 my_mirrors=Peilini
@@ -154,7 +155,7 @@ sign_up_now=Tarvitsetko tilin? Rekisteröidy nyt.
 confirmation_mail_sent_prompt=Uusi varmistus sähköposti on lähetetty osoitteeseen <b>%s</b>, ole hyvä ja tarkista saapuneet seuraavan %d tunnin sisällä saadaksesi rekisteröintiprosessin valmiiksi.
 active_your_account=Aktivoi tilisi
 prohibit_login=Kirjautuminen kielletty
-prohibit_login_desc=Your account is prohibited to login, please contact site admin.
+prohibit_login_desc=Käyttäjätilisi kirjautuminen on estetty. Ota yhteys sivuston ylläpitäjään.
 resent_limit_prompt=Sori, olet jo tilannut aktivointi sähköpostin lähiaikoina. Ole hyvä ja odota 3 minuuttia ja yritä sitten uudelleen.
 has_unconfirmed_mail=Hei %s, sinulla on varmistamaton sähköposti osoite (<b>%s</b>). Jos et ole saanut varmistus sähköpostia tai tarvitset uudelleenlähetyksen, ole hyvä ja klikkaa allaolevaa painiketta.
 resend_mail=Klikkaa tästä uudelleenlähettääksesi aktivointi sähköpostisi
@@ -163,7 +164,7 @@ reset_password=Nollaa salasanasi
 invalid_code=Sori, varmistuskoodisi on vanhentunut tai väärä.
 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=Non-local accounts cannot change passwords through Gogs.
+non_local_account=Vain paikallisten käyttäjätilien salasanan vaihto onnistuu Gogsin kautta.

 [mail]
 activate_account=Ole hyvä ja aktivoi tilisi
@@ -190,10 +191,10 @@ TeamName=Tiimin nimi
 AuthName=Luvan nimi
 AdminEmail=Ylläpito sähköposti

-NewBranchName=New branch name
-CommitSummary=Commit summary
-CommitMessage=Commit message
-CommitChoice=Commit choice
+NewBranchName=Uuden haaran nimi
+CommitSummary=Commitin yhteenveto
+CommitMessage=Commitin viesti
+CommitChoice=Commitin valinta
 TreeName=Tiedostopolku
 Content=Sisältö

@@ -233,7 +234,7 @@ org_still_own_repo=Tällä organisaatiolla on yhä omistajuus repoon, sinun täy
 target_branch_not_exist=Kohde branchia ei ole olemassa.

 [user]
-change_avatar=Change your avatar
+change_avatar=Vaihda profiilikuvasi
 join_on=Liitytty
 repositories=Repot
 activity=Julkinen toiminta
@@ -249,7 +250,7 @@ form.name_pattern_not_allowed=Käyttäjätunnus mallia '%s' ei ole sallittu.
 [settings]
 profile=Profiili
 password=Salasana
-avatar=Avatar
+avatar=Profiilikuva
 ssh_keys=SSH avaimet
 social=Sosiaaliset tilit
 applications=Sovellukset
@@ -270,8 +271,8 @@ change_username_prompt=Tämä muutos vaikuttaa tapaan kuinka linkit liittyvät t
 continue=Jatka
 cancel=Peruuta

-lookup_avatar_by_mail=Lookup Avatar by mail
-federated_avatar_lookup=Federated Avatar Lookup
+lookup_avatar_by_mail=Hae profiilikuva sähköpostiosoitteen avulla
+federated_avatar_lookup=Ulkopuolinen profiilikuvan haku
 enable_custom_avatar=Ota käyttöön mukautettu profiilikuva
 choose_new_avatar=Valitse uusi profiilikuva
 update_avatar=Päivitä profiilikuva asetus
@@ -338,9 +339,9 @@ access_token_deletion=Henkilökohtaisen pääsymerkin poisto
 access_token_deletion_desc=Tämän henkilökohtaisen pääsymerkin poistaminen poistaa kaikki siihen liittyvät pääsyt sovellukseen. Haluatko jatkaa?
 delete_token_success=Henkilökohtainen pääsymerkki on poistettu onnistuneesti! Älä unohda päivittää sovellustasi myös.

-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=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?

 delete_account=Poista tilisi
 delete_prompt=Toiminto poistaa tilisi pysyvästi ja tätä <strong>EI VOI</strong> peruuttaa myöhemmin!
@@ -362,7 +363,7 @@ fork_from=Forkkaa lähteestä
 fork_visiblity_helper=Et voi muuttaa forkatun repon näkyvyyttä.
 repo_desc=Kuvaus
 repo_lang=Kieli
-repo_gitignore_helper=Select .gitignore templates
+repo_gitignore_helper=Valitse .gitignore malli
 license=Lisenssi
 license_helper=Valitse lisenssitiedosto
 readme=Lueminut-tiedosto
@@ -370,12 +371,12 @@ readme_helper=Valitse Lueminut-malli
 auto_init=Alusta tämä repo valituilla tiedostoilla ja mallilla
 create_repo=Luo repo
 default_branch=Oletus branch
-mirror_prune=Prune
-mirror_prune_desc=Remove any remote-tracking references that no longer exist on the remote
+mirror_prune=Karsi
+mirror_prune_desc=Poista kaikki paikalliset seurantahaarat joiden vastaavia etähaaroja ei ole enää olemassa
 mirror_interval=Peili aikaväli (tuntia)
 mirror_address=Peili osoite
 mirror_address_desc=Ole hyvä ja liitä osoitteeseen tarvittavat käyttäjätunnukset.
-mirror_last_synced=Last Synced
+mirror_last_synced=Synkronoitu viimeksi
 watchers=Tarkkailijat
 stargazers=Tähtiharrastajat
 forks=Haarat
@@ -389,15 +390,14 @@ migrate_type=Siirtotyyppi
 migrate_type_helper=Tämä repo tulee olemaan <span class="text blue">peili</span>
 migrate_repo=Siirrä repo
 migrate.clone_address=Kloonaa osoite
-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=Tämä voi olla HTTP/HTTPS/GIT URL.
+migrate.clone_address_desc_import_local=Paikallisen palvelimen kansiopolun käyttö repon migraatiossa on myös salittua.
 migrate.permission_denied=Sinun ei sallita tuovan paikallisia repoja.
 migrate.invalid_local_path=Virheellinen paikallinen polku, ei ole olemassa tai ei ole hakemisto.
 migrate.failed=Siirto epäonnistui: %v

 mirror_from=peilaus alkaen
 forked_from=forkattu lähteestä
-fork_from_self=Et voi forkata repoa jonka jo omistat!
 copy_link=Kopioi
 copy_link_success=Kopioitu!
 copy_link_error=Paina ⌘-C tai Ctrl-C kopioidaksesi
@@ -415,7 +415,7 @@ 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!

-files=Files
+files=Tiedostot
 branch=Branch
 tree=Puu
 filter_branch_and_tag=Suodata haara tai tagi
@@ -431,17 +431,17 @@ file_raw=Raaka
 file_history=Historia
 file_view_raw=Näytä raaka
 file_permalink=Pysyvä linkki
-file_too_large=This file is too large to be shown
-video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
+file_too_large=Tämä tiedosto on liian suuri näytettäväksi
+video_not_supported_in_browser=Selaimesi ei tue HTML5 video-tagia.

 editor.new_file=Uusi tiedosto
 editor.upload_file=Liitä tiedosto
 editor.edit_file=Muokkaa tiedostoa
 editor.preview_changes=Muutosten esikatselu
-editor.cannot_edit_non_text_files=Cannot edit non-text files
-editor.edit_this_file=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.cannot_edit_non_text_files=Voit editoida vain tekstitiedostoja
+editor.edit_this_file=Muokkaa tätä tiedostoa
+editor.must_be_on_a_branch=Haara täytyy olla valittuna jotta voit tehdä tai ehdottaa muutoksia tähän tiedostoon
+editor.fork_before_edit=Sinun täytyy forkata tämä repo ennenkuin voit muokata tiedostoa
 editor.delete_this_file=Poista tämä tiedosto
 editor.must_have_write_access=Sinulla on kirjoitusoikeus tai ehdottaa muutoksia tiedostoon
 editor.file_delete_success=Tiedosto "%s" on poistettu onnistuneesti!
@@ -454,25 +454,26 @@ editor.add_tmpl=Lisää '%s/<filename>'
 editor.add=Lisää "%s"
 editor.update=Päivitä '%s'
 editor.delete=Poista "%s"
-editor.commit_message_desc=Add an optional extended description...
-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.commit_message_desc=Lisää pidennetty selite (valinnainen)...
+editor.commit_directly_to_this_branch=Committaa suoraan haaraan <strong class="branch-name">%s</strong>.
+editor.create_new_branch=Luo <strong>uusi haara</strong> tälle commitille tai aloita pull-pyyntö.
+editor.new_branch_name_desc=Uuden haaran nimi...
 editor.cancel=Peruuta
-editor.filename_cannot_be_empty=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_cannot_be_empty=Tiedostonimi ei voi olla tyhjä.
+editor.branch_already_exists=Haara '%s' on jo olemassa tässä repossa.
+editor.directory_is_a_file=Annettu nimi '%s' on tiedosto, ei kansio.
+editor.file_is_a_symlink=Tiedosto '%s' on symlinkki jota ei voi muokata web-selaimesta.
+editor.filename_is_a_directory=Kansio nimeltä '%s' on jo olemassa tässä repossa.
+editor.file_editing_no_longer_exists=Tiedostoa '%s' jota olet muokkaamassa ei ole enää olemassa tässä repossa.
+editor.file_changed_while_editing=Tiedoston sisältöä on muutettu aloittamisesi jälkeen. <a target="_blank" href="%s">Klikkaa tästä</a> nähdäksesi mitä on muutettu tai <strong>paina commit uudelleen</strong> ylikirjoittaaksesi muutokset.
+editor.file_already_exists=Tiedosto '%s' on jo olemassa tässä repossa.
+editor.no_changes_to_show=Ei muutoksia näytettäväksi.
+editor.fail_to_update_file=Tiedoston '%s' päivitys/luonti epäonnistui virheeseen: %v
+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.commits=Commitit
 commits.search=Etsi commiteista
 commits.find=Etsi
@@ -498,11 +499,11 @@ issues.create=Ilmoita ongelma
 issues.new_label=Uusi tunniste
 issues.new_label_placeholder=Tunnisteen nimi...
 issues.create_label=Luo tunniste
-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=Lataa ennaltamääritelty tarrajoukko
+issues.label_templates.info=Tarroja ei ole. Voit luoda uuden klikkaamalla "Uusi tarra" tai käyttää ennaltamääriteltyä tarrajoukkoa alta.
+issues.label_templates.helper=Valitse tarrajoukko
+issues.label_templates.use=Käytä tätä tarrajoukkoa
+issues.label_templates.fail_to_load_file=Tarramallin lataus epäonnistui tiedostosta '%s': %v
 issues.open_tab=%d avoinna
 issues.close_tab=%d suljettu
 issues.filter_label=Tunniste
@@ -530,8 +531,8 @@ issues.next=Seuraava
 issues.open_title=Avoinna
 issues.closed_title=Suljettu
 issues.num_comments=%d kommenttia
-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=`kommentoitu <a href="#%s">%s</a>`
+issues.delete_comment_confirm=Haluatko varmasti poistaa tämän kommentin?
 issues.no_content=Sisältöä ei vielä ole.
 issues.close_issue=Sulje
 issues.close_comment_issue=Kommentoi ja sulje
@@ -544,7 +545,7 @@ issues.commit_ref_at=`viittasi tähän ongelmaan commitissa <a id="%[1]s" href="
 issues.poster=Tekijä
 issues.collaborator=Yhteistyökumppani
 issues.owner=Omistaja
-issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
+issues.sign_in_require_desc=<a href="%s">Kirjaudu sisään</a> osallistuaksesi tähän keskusteluun.
 issues.edit=Muokkaa
 issues.cancel=Peruuta
 issues.save=Tallenna
@@ -559,8 +560,8 @@ issues.label_deletion=Tunnisteen poistaminen
 issues.label_deletion_desc=Tämän tunnisteen poistaminen poistaa sen tiedot kaikista siihen liittyvistä ongelmista. Haluatko jatkaa?
 issues.label_deletion_success=Tunniste on poistettu onnistuneesti!
 issues.num_participants=%d osallistujaa
-issues.attachment.open_tab=`Click to see "%s" in a new tab`
-issues.attachment.download=`Click to download "%s"`
+issues.attachment.open_tab=`Klikkaa nähdäksesi "%s" uudessa välilehdessä`
+issues.attachment.download=`Klikkaa ladataksesi "%s"`

 pulls.new=Uusi pull pyyntö
 pulls.compare_changes=Vertaa muutoksia
@@ -587,8 +588,8 @@ pulls.cannot_auto_merge_desc=Tätä pull-pyyntöä ei voi yhdistää automaattis
 pulls.cannot_auto_merge_helper=Ole hyvä ja yhdistä manuaalisesti konfliktien ratkaisemiseksi.
 pulls.merge_pull_request=Yhdistä Pull-pyyntö
 pulls.open_unmerged_pull_exists=`Et voi suorittaa uudelleenavaus toimintoa koska on jo olemassa pull-pyyntö (#%d) samasta reposta samoilla yhdistämistiedoilla ja odottaa yhdistämistä.`
-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=Poista haara
+pulls.delete_branch_has_new_commits=Haaraa ei voida poistaa koska siinä on uusia committeja mergen jälkeen.

 milestones.new=Uusi merkkipaalu
 milestones.open_tab=%d avoinna
@@ -635,37 +636,59 @@ wiki.last_updated=Viimeksi päivitetty: %s
 settings=Asetukset
 settings.options=Valinnaiset
 settings.collaboration=Yhteistyö
-settings.collaboration.admin=Admin
-settings.collaboration.write=Write
-settings.collaboration.read=Read
-settings.collaboration.undefined=Undefined
+settings.collaboration.admin=Ylläpitäjä
+settings.collaboration.write=Kirjoita
+settings.collaboration.read=Lue
+settings.collaboration.undefined=Määrittelemätön
+settings.branches=Haarat
+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_success=Repositoryn oletushaara päivitetty!
+settings.protected_branches=Suojatut haarat
+settings.protected_branches_desc=Suojaa haaroja pakotetulta push-operaatiolta, vahinkopoistamisilta ja sallitun listan committereilta.
+settings.choose_a_branch=Valitse haara...
+settings.branch_protection=Haaran suojaus
+settings.branch_protection_desc=Valitse suojausasetus haaralle <b>%s</b>.
+settings.protect_this_branch=Suojaa tämä haara
+settings.protect_this_branch_desc=Kiellä pakoteut push-operaatiot ja estä poistaminen.
+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.hooks=Webkoukut
 settings.githooks=Git koukut
 settings.basic_settings=Perusasetukset
-settings.mirror_settings=Mirror Settings
-settings.sync_mirror=Sync Now
-settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
+settings.mirror_settings=Peilauksen asetukset
+settings.sync_mirror=Synkronisoi nyt
+settings.mirror_sync_in_progress=Peilaus käynnissä. Päivitä sivu minuutin kuluttua uudelleen.
 settings.site=Virallinen sivusto
 settings.update_settings=Päivitä asetukset
 settings.change_reponame_prompt=Tämä muutos vaikuttaa siihen miten linkit liittyvät repoon.
 settings.advanced_settings=Lisäasetukset
-settings.wiki_desc=Enable wiki system
-settings.use_internal_wiki=Use builtin wiki
+settings.wiki_desc=Ota wiki käyttöön
+settings.use_internal_wiki=Käytä sisäänrakennettua wikiä
 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=Enable issue tracker
-settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.issues_desc=Ota virheenseuranta käyttöön
+settings.use_internal_issue_tracker=Käytä sisäänrakennettua kevyttä virheenseurantaa
 settings.use_external_issue_tracker=Käytä ulkoista vikaseurantaa
-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=Ulkoisen virheenseurannan URL
+settings.external_tracker_url_desc=Vierailijat ohjataan URL-osoitteeseen kun he klikkaavat välilehteä.
 settings.tracker_url_format=Ulkoisen vikaseurannan URL muoto
-settings.tracker_issue_style=External Issue Tracker Naming Style:
-settings.tracker_issue_style.numeric=Numeric
-settings.tracker_issue_style.alphanumeric=Alphanumeric
+settings.tracker_issue_style=Ulkoisen virheenseurannan nimeämistyyli:
+settings.tracker_issue_style.numeric=Numeerinen
+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.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.
@@ -685,7 +708,7 @@ settings.delete=Poista tämä repo
 settings.delete_desc=Huomio, kun kerran poistat repon, niin ei ole paluuta. Varmista että haluat todella tehdä tämän.
 settings.delete_notices_1=- Tätä toimintoa <strong>EI VOI</strong> peruuttaa myöhemmin.
 settings.delete_notices_2=- Tämä toiminto poistaa pysyvästi kaikki tästä reposta, mukaanlukien Git tiedot, ongelmat, kommentit ja yhteistyökumppanien pääsyoikeudet.
-settings.delete_notices_fork_1=- All forks will become independent after deletion.
+settings.delete_notices_fork_1=- Kaikki haarat muuttuvat itsenäisiksi poiston jälkeen.
 settings.deletion_success=Repo on poistettu onnistuneesti!
 settings.update_settings_success=Repom asetukset on päivitetty onnistuneesti.
 settings.transfer_owner=Uusi omistaja
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Tällä käyttäjällä ei tule enää olema
 settings.remove_collaborator_success=Yhteistyökumppani on poistettu.
 settings.search_user_placeholder=Etsi käyttäjä...
 settings.org_not_allowed_to_be_collaborator=Yhteistyökumppaniksi ei voi lisätä organisaatiota.
-settings.user_is_org_member=Käyttäjä on organisaation jäsen, jota ei voi lisätä yhteistyökumppaniksi.
 settings.add_webhook=Lisää webkoukku
 settings.hooks_desc=Webkoukut muistuttavat paljon perus HTTP POST tapahtuma laukaisimia. Aina kun jotain tapahtuu Gogsissa, käsittelemme ilmoituksen määrittäämääsi kohteeseen. Lisätietoja <a target="_blank" href="%s">webkoukku oppaassa</a>.
 settings.webhook_deletion=Poista webkoukku
@@ -723,6 +745,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.slack_username=Käyttäjätunnus
 settings.slack_icon_url=Kuvakkeen URL
 settings.slack_color=Väri
@@ -732,8 +755,8 @@ 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 Request
-settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
+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_push=Push
 settings.event_push_desc=Git push repoon
 settings.active=Aktiivinen
@@ -745,10 +768,12 @@ settings.delete_webhook=Poista webkoukku
 settings.recent_deliveries=Viimeisimmät toimitukset
 settings.hook_type=Koukkutyyppi
 settings.add_slack_hook_desc=Lisää <a href="%s">Slack</a> integraatio repoosi.
+settings.add_discord_hook_desc=Lisää <a href="%s">Discord</a> integraatio repositoryysi.
 settings.slack_token=Pääsymerkki
 settings.slack_domain=Verkkotunnus
 settings.slack_channel=Kanava
 settings.deploy_keys=Deploy avaimet
+settings.deploy_keys_helper=<b>Huomautus!</b> Voit lisätä julkiset avaimesi <a href="%s%s">tilisi asetuksissa</a>.
 settings.add_deploy_key=Lisää deploy avain
 settings.deploy_key_desc=Deploy avaimilla on vain luku-oikeudet. Ne eivät ole sama asia kuin henkilökohtaiset SSH avaimet.
 settings.no_deploy_keys=Et ole lisännyt yhtään deploy avainta.
@@ -771,8 +796,8 @@ diff.show_unified_view=Yhdistetty näkymä
 diff.stats_desc=<strong>%d muutettua tiedostoa</strong> jossa <strong>%d lisäystä</strong> ja <strong>%d poistoa</strong>
 diff.bin=BIN
 diff.view_file=Näytä tiedosto
-diff.file_suppressed=File diff suppressed because it is too large
-diff.too_many_files=Some files were not shown because too many files changed in this diff
+diff.file_suppressed=Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+diff.too_many_files=Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä

 release.releases=Julkaisut
 release.new_release=Uusi julkaisu
@@ -803,7 +828,7 @@ release.deletion=Version poisto
 release.deletion_desc=Tämän version poistaminen poistaa vastaavan Git tagin. Haluatko jatkaa?
 release.deletion_success=Versio on poistettu onnistuneesti!
 release.tag_name_already_exist=Versio tällä taginimellä on jo olemassa.
-release.tag_name_invalid=Tag name is not valid.
+release.tag_name_invalid=Tagin nimi ei kelpaa
 release.downloads=Lataukset

 [org]
@@ -827,6 +852,7 @@ team_permission_desc=Mikä käyttöoikeustaso tuliti tällä tiimillä olla?

 form.name_reserved=Organisaation nimi '%s' on varattu.
 form.name_pattern_not_allowed=Organisaation nimi mallia '%s' ei ole sallittu.
+form.team_name_reserved=Tiimin nimi '%s' on varattu.

 settings=Asetukset
 settings.options=Valinnaiset
@@ -881,7 +907,7 @@ teams.write_permission_desc=Tämä tiimi myöntää <strong>kirjoitusoikeuden</s
 teams.admin_permission_desc=Tämä tiimi myöntää <strong>ylläpito-oikeuden</strong>: jäsenet voivat lukea, pushata, ja lisätä yhteistyökumppaneita tiimin repoihin.
 teams.repositories=Tiimin repot
 teams.search_repo_placeholder=Etsi repo...
-teams.add_team_repository=Lisää tiimirepo
+teams.add_team_repository=Lisää tiimi-repository
 teams.remove_repo=Poista
 teams.add_nonexistent_repo=Repo jota yrität lisätä ei ole vielä olemassa, ole hyvä ja luo se ensin.

@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Suorita roskienkeruu repoille
 dashboard.git_gc_repos_success=Kaikki repot ovat tehneet roskienkeruun onnistuneesti.
 dashboard.resync_all_sshkeys=Uudelleenkirjoita '.ssh/authorized_keys' tiedosto (varoitus: ei-Gogs avaimet menetetään)
 dashboard.resync_all_sshkeys_success=Kaikki julkiset avaimet on uudelleenkirjoitettu onnistuneesti.
-dashboard.resync_all_update_hooks=Uudelleenkirjoita kaikki päivityskoukut repoista (tarvitaan mukautetun asetuspolun muuttuessa)
-dashboard.resync_all_update_hooks_success=Kaikki repojen päivityskoukut on uudelleenkirjoitettu onnistuneesti.
+dashboard.resync_all_hooks=Uudelleensynkronoi kaikkien repositoryjen "pre-receive, update ja post-receive" hookit.
+dashboard.resync_all_hooks_success=Kaikkien repositoryjen "pre-receive, update ja post-receive" hookit synkronoitu.
 dashboard.reinit_missing_repos=Resetoi kaikki repo tietueet jotka menettivät Git tiedostoja
 dashboard.reinit_missing_repos_success=Kaikki repo tietueet jotka menettivät Git tiedostoja on resetoitu onnistuneesti.

@@ -971,7 +997,7 @@ users.edit_account=Muokkaa tiliä
 users.max_repo_creation=Maksimi repojen määrä jonka voi luoda
 users.max_repo_creation_desc=(Aseta -1 käyttääksesi globaalia oletusrajaa)
 users.is_activated=Tämä tili on aktivoitu
-users.prohibit_login=This account is prohibited to login
+users.prohibit_login=Tämän käyttäjätilin sisäänkirjautuminen on estetty
 users.is_admin=Tällä tilillä on ylläpito-oikeudet
 users.allow_git_hook=Tällä tilillä on oikeudet luoda Git koukkuja
 users.allow_import_local=Tällä tilillä on oikeudet tuoda paikallisia repoja
@@ -1002,7 +1028,7 @@ auths.enabled=Käytössä
 auths.updated=Päivitetty
 auths.auth_type=Todennustyyppi
 auths.auth_name=Todennusnimi
-auths.security_protocol=Security Protocol
+auths.security_protocol=Suojausprotokolla
 auths.domain=Verkkotunnus
 auths.host=Isäntä
 auths.port=Portti
@@ -1040,7 +1066,7 @@ auths.delete_auth_title=Todennuksen poistaminen
 auths.delete_auth_desc=Tämä todennus poistetaan, haluatko jatkaa?
 auths.still_in_used=Tämä todennus on yhä joidenkin käyttäjien käytössä, ole hyvä ja poista tai muunna nämä käyttäjät toiselle kirjaututumistyypille ensin.
 auths.deletion_success=Todennus on poistettu onnistuneesti!
-auths.login_source_exist=Login source '%s' already exists.
+auths.login_source_exist=Kirjautumislähde '%s' on jo olemassa

 config.server_config=Palvelin asetukset
 config.app_name=Sovellus nimi
@@ -1051,11 +1077,9 @@ config.offline_mode=Offline-tila
 config.disable_router_log=Poista käytöstä reitittimen loki
 config.run_user=Suorita käyttäjänä
 config.run_mode=Suoritustila
-config.git_version=Git Version
-config.repo_root_path=Repon juuren polku
+config.git_version=Git versio
 config.static_file_root_path=Staattisen tiedoston juuren polku
 config.log_file_root_path=Lokitiedoston juuren polku
-config.script_type=Komentosarjan tyyppi
 config.reverse_auth_user=Käänteinen todennus käyttäjä

 config.ssh_config=SSH asetukset
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Keygen ('ssh-keygen') polku
 config.ssh_minimum_key_size_check=Avaimen vähimmäiskoko tarkistus
 config.ssh_minimum_key_sizes=Avaimen vähimmäiskoot

+config.repo_config=Repositoryn asetukset
+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.db_config=Tietokannan asetukset
 config.db_type=Tyyppi
 config.db_host=Isäntä
@@ -1127,19 +1161,19 @@ config.cookie_life_time=Evästeen elinikä
 config.picture_config=Kuva asetukset
 config.picture_service=Kuva palvelu
 config.disable_gravatar=Poista käytöstä Gravatar
-config.enable_federated_avatar=Enable Federated Avatars
+config.enable_federated_avatar=Käytä ulkopuolisia profiilikuvia

-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_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_config=Git asetukset
+config.git_disable_diff_highlight=Poista koodinväritys käytöstä diff-näkymässä
+config.git_max_diff_lines=Diff-rivien enimmäismäärä (yhdelle tiedostolle)
+config.git_max_diff_line_characters=Enimmäismäärä merkkejä (yhdellä diff-rivillä)
+config.git_max_diff_files=Enimmäismäärä tiedostoja (diff-näkymässä)
+config.git_gc_args=Roskienkeruun parametrit
+config.git_migrate_timeout=Migraatio aikakatkaistiin
+config.git_mirror_timeout=Peilauspäivitys aikakatkaistiin
+config.git_clone_timeout=Kloonaus aikakatkaistiin
+config.git_pull_timeout=Pull-operaatio aikakatkaistiin
+config.git_gc_timeout=Roskienkeruu aikakatkaistiin

 config.log_config=Loki asetukset
 config.log_mode=Loki tila
--- a/conf/locale/locale_fr-FR.ini
+++ b/conf/locale/locale_fr-FR.ini
@@ -48,7 +48,7 @@ cancel=Annuler
 install=Installation
 title=Instructions pour la première exécution
 docker_helper=Si vous exécutez Gogs grâce à Docker, merci de lire la <a target="_blank" href="%s">procédure</a> attentivement avant de modifier quoi que ce soit sur cette page !
-requite_db_desc=Gogs requiert MySQL, PostgreSQL, SQLite3 ou TiDB.
+requite_db_desc=Gogs requiert MySQL, PostgreSQL, SQLite3, MSSQL ou TiDB.
 db_title=Paramètres de la base de données
 db_type=Type de base de données
 host=Hôte
@@ -58,9 +58,8 @@ db_name=Nom de base de données
 db_helper=Veuillez utiliser le moteur INNODB avec le jeu de caractères utf8_general_ci pour MySQL.
 ssl_mode=Mode SSL
 path=Emplacement
-sqlite_helper=Le chemin du fichier de base de données SQLite3 ou TiDB. <br>Utilisez un chemin absolu lorsque vous démarrez en tant que service.
-err_empty_db_path=Le chemin de la base de données SQLite3 ou TiDB ne peut être vide.
-err_invalid_tidb_name=Le nom de la base de données TiDB ne peut contenir les caractères "." ou "-".
+sqlite_helper=Le chemin du fichier de base de données SQLite3. <br>Utilisez un chemin absolu lorsque vous démarrez en tant que service.
+err_empty_db_path=Le chemin de la base de données SQLite3 ne peut être vide.
 no_admin_and_disable_registration=Vous ne pouvez pas désactiver l'enregistrement sans créer un compte administrateur.
 err_empty_admin_password=Le mot de passe du compte administrateur ne peut être vide.

@@ -75,6 +74,8 @@ domain=Domaine
 domain_helper=Cela affecte les doublons d'URL SSH.
 ssh_port=Port SSH
 ssh_port_helper=Numéro de port utilisé par votre serveur SSH, le laisser vide pour désactiver la fonctionnalité.
+use_builtin_ssh_server=Utiliser le serveur SSH incorporé
+use_builtin_ssh_server_popup=Démarrer le serveur SSH incorporé pour les opérations Git afin de le distinguer du démon SSH système.
 http_port=Port HTTP
 http_port_helper=Numéro de port que l'application écoutera.
 app_url=URL de l'application
@@ -116,7 +117,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
-invalid_smtp_from=SMTP From field is not valid: %v
+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
 install_success=Bienvenue ! Nous sommes heureux que vous ayez choisi Gogs, amusez-vous et prenez soin de vous.
@@ -338,9 +339,9 @@ access_token_deletion=Suppression du jeton d'accès
 access_token_deletion_desc=Supprimer ce jeton d'accès supprimera tous les accès de l'application. Voulez-vous continuer ?
 delete_token_success=Le jeton d'accèsa été supprimé avec succès ! N'oubliez pas de mettre à jour vos applications.

-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=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 ?

 delete_account=Supprimer votre compte
 delete_prompt=Votre compte sera définitivement supprimé et cette opération est <strong>irréversible</strong> !
@@ -389,15 +390,14 @@ migrate_type=Type de migration
 migrate_type_helper=Ce dépôt sera un <span class="text blue"> miroir</span>
 migrate_repo=Migrer le dépôt
 migrate.clone_address=Adresse du clone
-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=Cela peut être une URL HTTP/HTTPS/GIT.
+migrate.clone_address_desc_import_local=Vous êtes aussi autorisé à migrer un dépôt via un chemin local du serveur.
 migrate.permission_denied=Vous n'êtes pas autorisé à importer des dépôts locaux.
 migrate.invalid_local_path=Chemin local non valide, non existant ou n'étant pas un dossier.
 migrate.failed=Echec de migration: %v

 mirror_from=miroir de
 forked_from=forké depuis
-fork_from_self=Vous ne pouvez pas forker un dépôt que vous possédez déja !
 copy_link=Copier
 copy_link_success=Copié!
 copy_link_error=Appuyez sur ⌘-C ou Ctrl-C pour copier
@@ -415,7 +415,7 @@ 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 !

-files=Files
+files=Fichiers
 branch=Branche
 tree=Aborescence
 filter_branch_and_tag=Filtrer une branche ou un tag
@@ -473,6 +473,7 @@ editor.add_subdir=Ajouter un sous-répertoire...
 editor.unable_to_upload_files=Échec lors de l'envoie du fichier '%s' avec l’erreur : %v
 editor.upload_files_to_dir=Transférer les fichiers vers '%s'

+commits.commit_history=Historique des commits
 commits.commits=Commits
 commits.search=Rechercher des commits
 commits.find=Trouver
@@ -588,7 +589,7 @@ pulls.cannot_auto_merge_helper=Fusionner manuellement afin de résoudre les conf
 pulls.merge_pull_request=Fusionner la Pull Request
 pulls.open_unmerged_pull_exists=`Vous ne pouvez effectuer une réouverture car il y a déjà une pull-request ouverte (#%d) depuis le même dépôt avec les mêmes informations de fusion et est en attente de fusion.`
 pulls.delete_branch=Supprimer la branche
-pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
+pulls.delete_branch_has_new_commits=La branche ne peut pas être supprimée car de nouveaux commits ont été effectuées après la fusion.

 milestones.new=Nouveau Jalon
 milestones.open_tab=%d Ouvert
@@ -639,6 +640,27 @@ settings.collaboration.admin=Administrateur
 settings.collaboration.write=Écrire
 settings.collaboration.read=Lire
 settings.collaboration.undefined=Indéfini
+settings.branches=Branches
+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_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.
+settings.choose_a_branch=Choisir une branche…
+settings.branch_protection=Protection de branche
+settings.branch_protection_desc=Sélectionnez les options de protection pour la branche <b>%s</b>.
+settings.protect_this_branch=Protéger cette branche
+settings.protect_this_branch_desc=Interdire les push forcés et empêcher la suppression.
+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_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
+settings.protect_whitelist_search_teams=Rechercher des équipes
+settings.update_protect_branch_success=Les options de protection de cette branches ont été mises à jour avec succès.
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Paramètres de base
@@ -657,8 +679,8 @@ settings.external_wiki_url_desc=Les visiteurs seront redirigés vers cette URL l
 settings.issues_desc=Activer le système de tickets
 settings.use_internal_issue_tracker=Utiliser le système simplifié de tickets interne
 settings.use_external_issue_tracker=Utiliser un bug-tracker externe
-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=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.
 settings.tracker_url_format=Format d'URL du bug tracker
 settings.tracker_issue_style=Style de nommage des bugs du tracker externe :
 settings.tracker_issue_style.numeric=Numérique
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Alphanumérique
 settings.tracker_url_format_desc=Vous pouvez utiliser l'espace réservé <code>{user} {repo} {index}</code> pour le nom d'utilisateur, le nom du dépôt et le numéro de bug.
 settings.pulls_desc=Activer les pull requests pour accepter les contributions publiques
 settings.danger_zone=Zone de danger
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Le nouveau propriétaire a déjà un dépôt nommé ainsi.
 settings.convert=Convertir en dépôt ordinaire
 settings.convert_desc=Vous pouvez convertir ce miroir en dépôt ordinaire. Cela ne peut pas être inversée.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Cet utilisateur n'aura plus accès pour coll
 settings.remove_collaborator_success=Collaborateur supprimé.
 settings.search_user_placeholder=Rechercher un utilisateur...
 settings.org_not_allowed_to_be_collaborator=Une organisation n'est pas autorisée à être ajoutée en tant que collaborateur.
-settings.user_is_org_member=Cet utilisateur ne peut pas être ajouté en tant que collaborateur car il fait partie d'une organisation.
 settings.add_webhook=Ajouter un Webhook
 settings.hooks_desc=Les Webhooks sont des déclencheurs de POST HTTP . Lorsque qu'un événement se produit dans Gogs, une notification sera envoyée vers l'hôte cible préalablement spécifié. Apprenez-en davantage dans le <a target="_blank" href="%s">Guide des Webhooks</a>.
 settings.webhook_deletion=Supprimer le Webhook
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Une requête <code>POST</code> sera transmise vers l'U
 settings.payload_url=URL des Données Utiles
 settings.content_type=Type de contenu
 settings.secret=Confidentiel
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Nom d'utilisateur
 settings.slack_icon_url=URL de l'icône
 settings.slack_color=Couleur
@@ -745,10 +768,12 @@ settings.delete_webhook=Supprimer le Webhook
 settings.recent_deliveries=Livraisons récentes
 settings.hook_type=Type de Hook
 settings.add_slack_hook_desc=Intégrer <a href="%s"> Slack</a> à votre dépôt.
+settings.add_discord_hook_desc=Ajouter l'intégration de <a href="%s">Discord</a> à votre dépôt.
 settings.slack_token=Jeton
 settings.slack_domain=Domaine
 settings.slack_channel=Canal
 settings.deploy_keys=Clés de déploiement
+settings.deploy_keys_helper=<b>Gotcha commun !</b> Si vous cherchez à ajouter des clés publiques personnelles, ajoutez-les dans vos <a href="%s%s">paramètres de compte</a>.
 settings.add_deploy_key=Ajouter une Clé de Déploiement
 settings.deploy_key_desc=Déployer une clé uniquement en lecture seule. Il ne s'agit pas des clés ssh de compte personnel.
 settings.no_deploy_keys=Vous n'avez ajouté aucune clé de déploiement.
@@ -827,6 +852,7 @@ team_permission_desc=Quel niveau d'accès cette équipe devrait-elle posséder ?

 form.name_reserved=Le nom d'organisation '%s' est réservé.
 form.name_pattern_not_allowed=Motif '%s' interdit pour les noms d'organisation.
+form.team_name_reserved=Le nom d'équipe « %s » est réservé.

 settings=Paramètres
 settings.options=Options
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Collecter les déchets des dépôts
 dashboard.git_gc_repos_success=Tous les dépôts ont effectué la collecte avec succès.
 dashboard.resync_all_sshkeys=Ré-écrire le fichier '.ssh/authorized_keys' (attention : les clés hors-Gogs vont être perdues)
 dashboard.resync_all_sshkeys_success=Toutes les clés publiques ont été ré-écrites avec succès.
-dashboard.resync_all_update_hooks=Ré-écrire tous les hooks de mises à jour des dépôts (requis quand le chemin de la configuration personnalisé est modifié)
-dashboard.resync_all_update_hooks_success=Tous les hooks de mises à jour des dépôts ont été ré-écris avec succès.
+dashboard.resync_all_hooks=Re-synchroniser les crochets pre-receive, update et post-receive de tous les dépôts.
+dashboard.resync_all_hooks_success=Tous les crochets pre-receive, update et post-receive ont bien été resynchronisés.
 dashboard.reinit_missing_repos=Réinitialiser tous les dépôts qui ont perdu des fichiers Git
 dashboard.reinit_missing_repos_success=Tous les enregistrements de dépôts qui ont perdu des fichiers Git ont été réinitialisés avec succès.

@@ -1051,11 +1077,9 @@ config.offline_mode=Mode hors-ligne
 config.disable_router_log=Désactiver la Journalisation du Routeur
 config.run_user=Utilisateur système
 config.run_mode=Mode d'Éxécution
-config.git_version=Git Version
-config.repo_root_path=Emplacement des Dépôts
+config.git_version=Version de Git
 config.static_file_root_path=Chemin statique des fichiers racines
 config.log_file_root_path=Emplacement Racine du Fichier Journal
-config.script_type=Type de Script
 config.reverse_auth_user=Annuler l'Authentification de l'Utilisateur

 config.ssh_config=Configuration SSH
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Chemin vers le générateur de clefs ("ssh-keygen")
 config.ssh_minimum_key_size_check=Vérification de la longueur de clé minimale
 config.ssh_minimum_key_sizes=Tailles de clé minimales

+config.repo_config=Configuration du dépôt
+config.repo_root_path=Emplacement des Dépôts
+config.script_type=Type de Script
+config.repo_force_private=Privé forcé
+config.max_creation_limit=Limite de création maximale
+config.preferred_licenses=Licences préférées
+config.disable_http_git=Désactiver Git HTTP
+config.enable_local_path_migration=Activer la migration de chemin locale
+config.commits_fetch_concurrency=Concurrence des récupérations de commits
+
 config.db_config=Configuration de la Base de Données
 config.db_type=Type
 config.db_host=Hôte
--- a/conf/locale/locale_gl-ES.ini
+++ b/conf/locale/locale_gl-ES.ini
@@ -48,7 +48,7 @@ cancel=Cancelar
 install=Instalación
 title=Pasos da instalación por primeira vez
 docker_helper=Se está executando Gogs usando Docker, por favor lea <a target="_blank" href="%s"> estas pautas</a> antes de cambiar nada nesta páxina!
-requite_db_desc=Gogs require unha base de datos MySQL, PostgreSQL, SQLite3 ou TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Configuración de base de datos
 db_type=Tipo de base de datos
 host=Host
@@ -58,9 +58,8 @@ db_name=Nome da base de datos
 db_helper=Por favor, empregue o motor INNODB coa configuración de caracteres utf8_general_ci para MySQL.
 ssl_mode=Modo SSL
 path=Ruta
-sqlite_helper=Ruta ao arquivo de base de datos SQLite3 ou TiDB. <br>Por favor, usa unha ruta absoluta cando inicies como servizo.
-err_empty_db_path=A ruta á base de datos SQLite3 ou TiDB non pode estar baleira.
-err_invalid_tidb_name=O nome da base de datos TiDB non pode conter os caracteres "." nin "-".
+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.
 no_admin_and_disable_registration=Non pode deshabilitar o rexistro sen crear unha conta de administrador.
 err_empty_admin_password=O contrasinal de administrador non pode estar baleiro.

@@ -75,6 +74,8 @@ domain=Dominio
 domain_helper=Isto afecta ás URLs para clonar por SSH.
 ssh_port=Porto SSH
 ssh_port_helper=Número de porto do seu servidor SSH, déixeo en branco para desactivar 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.
 http_port=Porto HTTP
 http_port_helper=Porto no que escoitará a aplicación.
 app_url=URL da aplicación
@@ -116,7 +117,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
-invalid_smtp_from=SMTP From field is not valid: %v
+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
 install_success=Benvido/a! Estamos encantados de que escolleses Gogs, divírtete e cóidate.
@@ -338,9 +339,9 @@ access_token_deletion=Borrado de Token de Acceso Persoal
 access_token_deletion_desc=Se elimina este token de acceso persoal a aplicación asociada perderá o permiso de acceso. Desexa continuar?
 delete_token_success=O token de acceso persoal foi eliminado con éxito! Non esqueza actualizar tamén as aplicacións asociadas.

-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=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?

 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!
@@ -389,15 +390,14 @@ migrate_type=Tipo de migración
 migrate_type_helper=Este repositorio será unha <span class="text blue">réplica</span>
 migrate_repo=Migrar repositorio
 migrate.clone_address=Clonar enderezo
-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=Pode ser unha URL HTTP/HTTPS/GIT.
+migrate.clone_address_desc_import_local=Tamén podes migrar un repositorio mediante a ruta do servidor local.
 migrate.permission_denied=Non che está permitido importar repositorios locais.
 migrate.invalid_local_path=Rutal local inválida, non existe ou non é un directorio.
 migrate.failed=Migración fallida: %v

 mirror_from=réplica de
 forked_from=Fork de
-fork_from_self=Non podes crear un fork dun repositorio que xa é teu!
 copy_link=Copiar
 copy_link_success=Copiado!
 copy_link_error=Presione ⌘ + C ou Ctrl-C para copiar
@@ -415,7 +415,7 @@ 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!

-files=Files
+files=Ficheiros
 branch=Rama
 tree=Árbore
 filter_branch_and_tag=Filtrar por rama ou etiqueta
@@ -473,6 +473,7 @@ editor.add_subdir=Engadir subdirectorio...
 editor.unable_to_upload_files=Fallou ao subir arquivos a '%s' co erro: %v
 editor.upload_files_to_dir=Subir arquivos a '%s'

+commits.commit_history=Commit History
 commits.commits=Achegas
 commits.search=Buscar achegas
 commits.find=Buscar
@@ -639,6 +640,27 @@ settings.collaboration.admin=Administrador
 settings.collaboration.write=Escritura
 settings.collaboration.read=Lectura
 settings.collaboration.undefined=Indefinido
+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.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Configuración básica
@@ -657,8 +679,8 @@ settings.external_wiki_url_desc=Os visitantes serán redireccionados á URL cand
 settings.issues_desc=Habilitar rastrexo de incidencias
 settings.use_internal_issue_tracker=Usar rastrexo de incidencias lixeiro incluído
 settings.use_external_issue_tracker=Usar tracker externo de incidencias
-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 de seguimento de problemas externos
+settings.external_tracker_url_desc=Os visitantes serán redireccionados á URL cando preman na barra.
 settings.tracker_url_format=Formato URL do tracker de incidencias externo
 settings.tracker_issue_style=Estilo de etiquetaxe do tracker externo de incidencias:
 settings.tracker_issue_style.numeric=Numérico
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Alfanumérico
 settings.tracker_url_format_desc=Podes usar os modelos <code>{user} {repo} {index}</code> para o nome de usuario, nome do repositorio e índice da incidencia.
 settings.pulls_desc=Habilitar Pull Requests para aceptar contribucións públicas
 settings.danger_zone=Zona de perigo
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=O novo propietario ten un repositorio co mesmo nome.
 settings.convert=Converter nun repositorio normal
 settings.convert_desc=Podes converter este repositorio nun repositorio normal. Este cambio non se pode desfacer.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Este usuario non poderá colaborar neste rep
 settings.remove_collaborator_success=O colaborador foi eliminado.
 settings.search_user_placeholder=Buscar usuario...
 settings.org_not_allowed_to_be_collaborator=As organizacións non teñen permitido ser engadidas como colaboradores.
-settings.user_is_org_member=O usuario é membro da organización, non pode ser engadido como colaborador.
 settings.add_webhook=Engadir Webhook
 settings.hooks_desc=Os Webhooks permiten a servizos externos recibir notificacións cando sucedan certos eventos en Gogs. Cando sucedan os eventos especificados, enviaremos unha petición POST a cada unha das URLs indicadas. Para obter máis información, consulta a nosa <a target="_blank" href="%s">Guía de Webhooks</a>.
 settings.webhook_deletion=Eliminar Webhook
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Enviaremos unha petición <code>POST</code> á seguint
 settings.payload_url=URL de Payload
 settings.content_type=Tipo de contido
 settings.secret=Secreto
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Nome da persoa usuaria
 settings.slack_icon_url=URL da icona
 settings.slack_color=Cor
@@ -745,10 +768,12 @@ settings.delete_webhook=Borrar Webhook
 settings.recent_deliveries=Envíos recentes
 settings.hook_type=Tipo de Hook
 settings.add_slack_hook_desc=Engade integración con <a href="%s">Slack</a> ao teu repositorio.
+settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
 settings.slack_token=Token
 settings.slack_domain=Dominio
 settings.slack_channel=Canle
 settings.deploy_keys=Claves de despregamento
+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=Engadir clave de despregamento
 settings.deploy_key_desc=A clave de desenvolvemento ten só acceso de lectura. Non é igual cás claves SSH das contas persoais.
 settings.no_deploy_keys=Non engadiches ningunha clave de despregamento.
@@ -827,6 +852,7 @@ team_permission_desc=Que nivel de permisos debería ter este equipo?

 form.name_reserved=O nome da organización '%s' está reservado.
 form.name_pattern_not_allowed=O patrón de nome da organización '%s' non está permitido.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Configuración
 settings.options=Opcións
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Executar a recolección de lixo nos repositorios
 dashboard.git_gc_repos_success=Todos os repositorios executaron correctamente o recolector de lixo.
 dashboard.resync_all_sshkeys=Reescribir o ficheiro '.ssh/authorized_keys'(atención: perderanse as claves que non pertenzan a Gogs)
 dashboard.resync_all_sshkeys_success=Todas as claves públicas reescribíronse correctamente.
-dashboard.resync_all_update_hooks=Reescribir todos os hooks de actualización dos repositorios (necesario cando se modifica a ruta de configuración personalizada)
-dashboard.resync_all_update_hooks_success=Todos os hooks de actualización dos repositorios reescribíronse correctamente.
+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.reinit_missing_repos=Reinicializar todos os rexistros do repositorio que teñen arquivos Git eliminados
 dashboard.reinit_missing_repos_success=Todos os rexistros do repositorio con arquivos Git eliminados foron reinicializados con éxito.

@@ -1051,11 +1077,9 @@ config.offline_mode=Modo sen conexión
 config.disable_router_log=Deshabilitar log do router
 config.run_user=Executada como usuario
 config.run_mode=Modo de execución
-config.git_version=Git Version
-config.repo_root_path=Ruta do repositorio
+config.git_version=Versión de Git
 config.static_file_root_path=Ruta dos ficheiros estáticos
 config.log_file_root_path=Ruta dos ficheiros de log
-config.script_type=Tipo de Script
 config.reverse_auth_user=Autenticación inversa de usuario

 config.ssh_config=Configuración SSH
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Ruta do xerador de claves ('ssh-keygen')
 config.ssh_minimum_key_size_check=Tamaño mínimo da clave de verificación
 config.ssh_minimum_key_sizes=Tamaños de clave mínimos

+config.repo_config=Repository Configuration
+config.repo_root_path=Ruta do repositorio
+config.script_type=Tipo de Script
+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.db_config=Configuración da base de datos
 config.db_type=Tipo
 config.db_host=Host
--- a/conf/locale/locale_it-IT.ini
+++ b/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 necessita MySQL, PostgreSQL, SQLite3 o TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Impostazioni Database
 db_type=Tipo di database
 host=Host
@@ -58,9 +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=Il path assoluto per il database SQLite3 o TiDB. <br>Per favore usa il path assoluto quando lo avvii come servizio.
-err_empty_db_path=Il percorso file del database SQLite3 o TiDB non può essere vuoto.
-err_invalid_tidb_name=Il nome del database TiDB non ammette caratteri "." e "-".
+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.
 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.

@@ -75,6 +74,8 @@ 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.
 http_port=Porta HTTP
 http_port_helper=Porta di ascolto dell'applicazione.
 app_url=URL Applicazione
@@ -96,8 +97,8 @@ offline_mode=Abilita Modalità Offline
 offline_mode_popup=Disabilita il CDN anche in modalità produttiva, tutte le risorse saranno servite localmente.
 disable_gravatar=Disattiva il servizio Gravatar
 disable_gravatar_popup=Disabilita Gravatar e sorgenti customizzate, tutti gli avatar vengono caricati dagli utenti o come predefinito.
-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=Abilita Federated Avatars
+federated_avatar_lookup_popup=Abilita ricerca dell'avatar nel servizio libravatar Federated Avatars.
 disable_registration=Disabilita Registrazione Manuale
 disable_registration_popup=Disabilita la registrazione manuale degli utenti, solo gli amministratori possono creare account.
 enable_captcha=Abilita Captcha
@@ -116,11 +117,11 @@ 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
-invalid_smtp_from=SMTP From field is not valid: %v
+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
 install_success=Benvenuto! Siamo felici che tu abbia scelto Gogs, buon divertimento.
-invalid_log_root_path=Log root path is invalid: %v
+invalid_log_root_path=Percorso deilog non valido: %v

 [home]
 uname_holder=Nome Utente o E-mail
@@ -138,7 +139,7 @@ issues.in_your_repos=Nei tuoi repository
 [explore]
 repos=Repository
 users=Utenti
-organizations=Organizations
+organizations=Organizzazioni
 search=Cerca

 [auth]
@@ -271,7 +272,7 @@ continue=Continua
 cancel=Annulla

 lookup_avatar_by_mail=Ricerca Avatar per mail
-federated_avatar_lookup=Federated Avatar Lookup
+federated_avatar_lookup=Ricerca Federated Avatars
 enable_custom_avatar=Abilita avatar personalizzato
 choose_new_avatar=Scegli un nuovo avatar
 update_avatar=Aggiorna le impostazioni avatar
@@ -338,9 +339,9 @@ access_token_deletion=Eliminazione Token di accesso personale
 access_token_deletion_desc=Eliminare questo token di accesso personale rimuoverà tutti i relativi accessi di applicazione. Si desidera continuare?
 delete_token_success=Il token di accesso personale è stato eliminato! Non dimenticare di aggiornare anche l'applicazione.

-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=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?

 delete_account=Elimina Account
 delete_prompt=L'operazione eliminerà permanentemente l'account e <strong>NON POTRÀ</strong> essere annullata!
@@ -375,7 +376,7 @@ mirror_prune_desc=Remove any remote-tracking references that no longer exist on
 mirror_interval=Intervallo Mirror (in ore)
 mirror_address=Indirizzo del mirror
 mirror_address_desc=Si prega di includere nell'indirizzo le credenziali utente necessarie.
-mirror_last_synced=Last Synced
+mirror_last_synced=Ultimo aggiornamento
 watchers=Osservatori
 stargazers=Fan
 forks=Fork
@@ -389,15 +390,14 @@ migrate_type=Tipo di migrazione
 migrate_type_helper=Questo repository sarà un <span class="text blue">mirror</span>
 migrate_repo=Migra Repository
 migrate.clone_address=Duplica Indirizzo
-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=Può essere un url HTTP/HTTPS/GIT.
+migrate.clone_address_desc_import_local=Puoi anche migrare un repository usando un path locale sul server.
 migrate.permission_denied=Non è consentito importare repository locali.
 migrate.invalid_local_path=Percorso locale non valido, non esiste o non è una cartella.
 migrate.failed=Migrazione non riuscita: %v

 mirror_from=mirror da
 forked_from=forkato da
-fork_from_self=Non puoi forkare il tuo stesso repository!
 copy_link=Copia
 copy_link_success=Copiato!
 copy_link_error=Premere ⌘-C o Ctrl-C per copiare
@@ -415,7 +415,7 @@ 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!

-files=Files
+files=File
 branch=Ramo (Branch)
 tree=Albero (Tree)
 filter_branch_and_tag=Filtra per branch o tag
@@ -432,7 +432,7 @@ file_history=Cronologia
 file_view_raw=Vedi originale
 file_permalink=Permalink
 file_too_large=Questo file è troppo grande per essere mostrato
-video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
+video_not_supported_in_browser=Il tuo browser non supporta i tag "video" di HTML5.

 editor.new_file=Nuovo file
 editor.upload_file=Carica File
@@ -440,39 +440,40 @@ editor.edit_file=Modifica file
 editor.preview_changes=Anteprima modifiche
 editor.cannot_edit_non_text_files=Non è possibile modificare i file non di testo
 editor.edit_this_file=Modifica questo 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.delete_this_file=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.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.cancel_lower=cancel
-editor.commit_changes=Commit Changes
-editor.add_tmpl=Add '%s/<filename>'
-editor.add=Add '%s'
-editor.update=Update '%s'
-editor.delete=Delete '%s'
-editor.commit_message_desc=Add an optional extended description...
-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.cancel=Cancel
-editor.filename_cannot_be_empty=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.must_be_on_a_branch=Devi essere su quel branch per eseguire o proporre modifiche su quel determinato branch
+editor.fork_before_edit=Forka il repository per modificare il file
+editor.delete_this_file=Elimina questo file
+editor.must_have_write_access=È necessario un accesso in scrittura per eseguire o proporre modifiche a questo file
+editor.file_delete_success=Il file '%s' è stato eliminato!
+editor.name_your_file=Dai un nome al file...
+editor.filename_help=Per aggiungere una cartella, scrivine il nome seguito da /. Per eliminare una cartella, spostati all'inizio del campo di testo e premi "backspace".
+editor.or=oppure
+editor.cancel_lower=annulla
+editor.commit_changes=Commit
+editor.add_tmpl=Aggiungi '%s/<filename>'
+editor.add=Aggiungi '%s'
+editor.update=Aggiorna '%s'
+editor.delete=Elimina '%s'
+editor.commit_message_desc=Aggiungi una descrizione (opzionale)...
+editor.commit_directly_to_this_branch=Commit direttamente nel branch <strong class="branch-name">%s</strong>.
+editor.create_new_branch=Crea un <strong>nuovo branch</strong> per questo commit e inizia una pull request.
+editor.new_branch_name_desc=Nome del nuovo branch...
+editor.cancel=Annulla
+editor.filename_cannot_be_empty=Il nome del file non può essere vuoto.
+editor.branch_already_exists=Il branch '%s' esiste già in questo repository.
+editor.directory_is_a_file='%s' nel percorso corrente è un file e non una cartella.
+editor.file_is_a_symlink=Il file '%s' è un link simbolico che non può essere modificato con l'editor web.
+editor.filename_is_a_directory=Il nome '%s' corrisponde a una cartella già presente in questo repository.
+editor.file_editing_no_longer_exists=Il file '%s' non esiste più nel repository.
+editor.file_changed_while_editing=Il file è stato cambiato in un'altra posizione. <a target="_blank" href="%s">Clicca qui</a> per vedere le modifiche o <strong>committa</strong> per sovrascrivere con la versione corrente.
+editor.file_already_exists=Un file di nome '%s' esiste già in questo repository.
+editor.no_changes_to_show=Nessuna modifica da mostrare.
+editor.fail_to_update_file=La creazione o la modifica del file '%s' è fallita: %v
+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.commits=Commits
 commits.search=Ricerca una versione
 commits.find=Cerca
@@ -498,10 +499,10 @@ issues.create=Crea Problema
 issues.new_label=Nuova etichetta
 issues.new_label_placeholder=Nome dell'etichetta...
 issues.create_label=Crea Etichetta
-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.title=Carica un set predefinito di etichette
+issues.label_templates.info=Non sono presenti etichette. Puoi cliccare sul pulsante "Nuova etichetta" per crearne una, oppure usare un set predefinito mostrato qui sotto.
+issues.label_templates.helper=Scegli un set di etichette
+issues.label_templates.use=Usa questo set di etichette
 issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d Aperti
 issues.close_tab=%d Chiusi
@@ -639,6 +640,27 @@ settings.collaboration.admin=Admin
 settings.collaboration.write=Write
 settings.collaboration.read=Read
 settings.collaboration.undefined=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.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Impostazioni di Base
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=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=Abilita le pull requests per accettare contributi pubblici
 settings.danger_zone=Zona Pericolosa
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Il nuovo proprietario ha già un repository con lo stesso nome. Per favore scegli un altro nome.
 settings.convert=Converti in Repository Regolare
 settings.convert_desc=Puoi convertire questo mirror in un repository regolare. Questa operazione non può essere annullata.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Questo utente non potrà più collaborare a
 settings.remove_collaborator_success=Il collaboratore è stato rimosso.
 settings.search_user_placeholder=Cerca utente...
 settings.org_not_allowed_to_be_collaborator=Un'organizzazione non può essere aggiunta come collaboratore.
-settings.user_is_org_member=L'utente è un membro dell'organizzazione che non può essere aggiunto come collaboratore.
 settings.add_webhook=Aggiungi Webhook
 settings.hooks_desc=I Webhooks sono molto simili a un basilare evento trigger HTTP POST. Ogni volta che qualcosa si verifica in Gogs, tratteremo la notifica all'host di destinazione specificato. Ulteriori informazioni in questa <a target="_blank" href="%s">Guida ai Webhooks</a>.
 settings.webhook_deletion=Elimina Webhook
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Gogs manderà una richiesta <code>POST</code> all'URL
 settings.payload_url=Payload URL
 settings.content_type=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.slack_username=Nome utente
 settings.slack_icon_url=URL icona
 settings.slack_color=Colore
@@ -732,8 +755,8 @@ 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 opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
+settings.event_pull_request=Pull request
+settings.event_pull_request_desc=Pull request aperta, chiusa, riaperta, modificata, assegnata, riassegnata, etichettata o sincronizzata.
 settings.event_push=Push
 settings.event_push_desc=Git push in un repository
 settings.active=Attivo
@@ -745,10 +768,12 @@ settings.delete_webhook=Eliminare Webhook
 settings.recent_deliveries=Recenti Deliveries
 settings.hook_type=Tipo di Hook
 settings.add_slack_hook_desc=Aggiungi <a href="%s"> Slack</a> integrazione al tuo repository.
+settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
 settings.slack_token=Token
 settings.slack_domain=Dominio
 settings.slack_channel=Canale
 settings.deploy_keys=Dispiega Chiavi
+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=Aggiungi Deploy Key
 settings.deploy_key_desc=Le deploy keys hanno accesso in sola lettura. Non equivalgono alle chiavi SSH personali.
 settings.no_deploy_keys=Non hai aggiunto alcuna deploy key.
@@ -827,6 +852,7 @@ team_permission_desc=Quale livello di autorizzazione dovrebbe avere questa squad

 form.name_reserved=Il nome organizzazione '%s' è riservato.
 form.name_pattern_not_allowed=La struttura del nome dell'organizzazione '%s' non è consentita.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Impostazioni
 settings.options=Opzioni
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Fare la procedura di garbage collection sui repository
 dashboard.git_gc_repos_success=Tutti i repository hanno fatto la procedura di garbage collection con successo.
 dashboard.resync_all_sshkeys=Riscrivi il file '.ssh/authorized_keys' (attenzione: le chiavi non appartenenti a Gogs saranno perse)
 dashboard.resync_all_sshkeys_success=Tutte le chiavi pubbliche riscritte con successo.
-dashboard.resync_all_update_hooks=Riscrivere tutti gli update hook dei repository (necessario quando il percorso di configurazione personalizzata viene modificato)
-dashboard.resync_all_update_hooks_success=Tutti gli update hook dei repository riscritti con successo.
+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.reinit_missing_repos=Reinitialize all repository records that lost Git files
 dashboard.reinit_missing_repos_success=All repository records that lost Git files have been reinitialized successfully.

@@ -962,16 +988,16 @@ users.created=Creato
 users.send_register_notify=Send Registration Notification To User
 users.new_success=Il nuovo account '%s' è stato creato correttamente.
 users.edit=Modifica
-users.auth_source=Authentication Source
+users.auth_source=Fonte di autenticazione
 users.local=Locale
-users.auth_login_name=Authentication Login Name
-users.password_helper=Leave it empty to remain unchanged.
+users.auth_login_name=Nome utente per l'autenticazione
+users.password_helper=Lascia vuoto per non modificare.
 users.update_profile_success=Profilo dell'account aggiornato con successo.
 users.edit_account=Modifica Account
 users.max_repo_creation=Limite massimo per la creazione di Repository
 users.max_repo_creation_desc=(Inserire -1 per usare il limite globale di default)
 users.is_activated=Questo account è attivato
-users.prohibit_login=This account is prohibited to login
+users.prohibit_login=Questo account non è abilitato al login
 users.is_admin=Questo account ha permessi di amministratore
 users.allow_git_hook=Questo account ha il permesso di creare hooks di Git
 users.allow_import_local=Questo account dispone delle autorizzazioni per importare repository locali
@@ -994,7 +1020,7 @@ repos.watches=Segue
 repos.stars=Voti
 repos.issues=Problemi

-auths.auth_manage_panel=Authentication Manage Panel
+auths.auth_manage_panel=Pannello di configurazione dei meccanismi di autenticazione
 auths.new=Aggiungi Nuova Origine
 auths.name=Nome
 auths.type=Tipo
@@ -1002,7 +1028,7 @@ auths.enabled=Attivo
 auths.updated=Aggiornato
 auths.auth_type=Tipo di autenticazione
 auths.auth_name=Nome di autenticazione
-auths.security_protocol=Security Protocol
+auths.security_protocol=Protocollo di sicurezza
 auths.domain=Dominio
 auths.host=Host
 auths.port=Porta
@@ -1012,7 +1038,7 @@ auths.bind_password_helper=Attenzione: Questa password è salvata in chiaro. Non
 auths.user_base=User Search Base
 auths.user_dn=DN dell'utente
 auths.attribute_username=Attributo username
-auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
+auths.attribute_username_placeholder=Se vuoto, verrà usato il nome di login dell'accesso.
 auths.attribute_name=Attributo Nome
 auths.attribute_surname=Attributo Cognome
 auths.attribute_mail=Attributo Email
@@ -1024,7 +1050,7 @@ auths.smtp_auth=Tipo di autenticazione SMTP
 auths.smtphost=Host SMTP
 auths.smtpport=Porta SMTP
 auths.allowed_domains=Domini consentiti
-auths.allowed_domains_helper=Leave it empty to not restrict any domains. Multiple domains should be separated by comma ','.
+auths.allowed_domains_helper=Lasciare vuoto per non imporre restrizioni di dominio. Domini separati da virgole ','.
 auths.enable_tls=Abilitare Crittografia TLS
 auths.skip_tls_verify=Salta verifica TLS
 auths.pam_service_name=Nome del Servizio PAM
@@ -1032,15 +1058,15 @@ auths.enable_auto_register=Abilitare Registrazione Automatica
 auths.tips=Consigli
 auths.edit=Modifica impostazioni di autenticazione
 auths.activated=Questa Autenticazione è stata attivata
-auths.new_success=New authentication '%s' has been added successfully.
-auths.update_success=Authentication setting has been updated successfully.
+auths.new_success=Nuovo meccanismo di autenticazione '%s' aggiunto.
+auths.update_success=Parametro di autenticazione aggiornato.
 auths.update=Aggiornare le impostazioni di autenticazione
 auths.delete=Elimina questa autenticazione
-auths.delete_auth_title=Authentication Deletion
-auths.delete_auth_desc=This authentication is going to be deleted, do you want to continue?
-auths.still_in_used=This authentication is still used by some users, please delete or convert these users to another login type first.
-auths.deletion_success=Authentication has been deleted successfully!
-auths.login_source_exist=Login source '%s' already exists.
+auths.delete_auth_title=Eliminazione del meccanismo di autenticazione
+auths.delete_auth_desc=Eliminazione del meccanismo di autenticazione. Continuare?
+auths.still_in_used=Questo meccanismo di autenticazione è ancora attivo per alcuni utenti. Eliminare gli utenti o cambiare il loro meccanismo di autenticazione prima di ritentare.
+auths.deletion_success=Il meccanismo di autenticazione è stato eliminato!
+auths.login_source_exist=La fonte di autenticazione '%s' esiste già.

 config.server_config=Configurazione Server
 config.app_name=Nome Applicazione
@@ -1051,11 +1077,9 @@ config.offline_mode=Modalità Offline
 config.disable_router_log=Disattivare Log del Router
 config.run_user=Utente Esecutore
 config.run_mode=Modalità Esecuzione
-config.git_version=Git Version
-config.repo_root_path=Percorso Root del Repository
+config.git_version=Versione Git
 config.static_file_root_path=Percorso Root del File Statico
 config.log_file_root_path=Percorso Root del File di Log
-config.script_type=Tipo di Script
 config.reverse_auth_user=Autenticazione Utente Inversa

 config.ssh_config=Configurazione SSH
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Percorso Keygen ('ssh-keygen')
 config.ssh_minimum_key_size_check=Verifica delle dimensioni minime della chiave
 config.ssh_minimum_key_sizes=Dimensioni minime della chiave

+config.repo_config=Repository Configuration
+config.repo_root_path=Percorso Root del Repository
+config.script_type=Tipo di Script
+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.db_config=Configurazione Database
 config.db_type=Tipo
 config.db_host=Host
@@ -1083,7 +1117,7 @@ config.db_path_helper=(per "sqlite3" e "tidb")
 config.service_config=Configurazione Servizio
 config.register_email_confirm=Richiedono Conferma dell'Email
 config.disable_register=Disabilita Registrazione
-config.show_registration_button=Mostra Pulsane Registrazione
+config.show_registration_button=Mostra Pulsante Registrazione
 config.require_sign_in_view=Richiesto Accesso per Vedere
 config.mail_notify=Email di Notifica
 config.disable_key_size_check=Disabilita controllo sulle dimensioni minime della chiave
@@ -1127,19 +1161,19 @@ config.cookie_life_time=Durata Cookie
 config.picture_config=Configurazione Foto
 config.picture_service=Servizio foto
 config.disable_gravatar=Disabilita Gravatar
-config.enable_federated_avatar=Enable Federated Avatars
+config.enable_federated_avatar=Attiva 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_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_config=Configurazione Git
+config.git_disable_diff_highlight=Disattiva evidenziazione delle differenze
+config.git_max_diff_lines=Numero massimo di righe di diff (per singolo file)
+config.git_max_diff_line_characters=Numero massimo di caratteri di diff (per singola riga)
+config.git_max_diff_files=Numero massimo di file diff mostrati
+config.git_gc_args=Parametri GC
+config.git_migrate_timeout=Timeout per la migrazione
+config.git_mirror_timeout=Timeoute per l'aggiornamento del mirror
+config.git_clone_timeout=Timeout per il clone
+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
--- a/conf/locale/locale_ja-JP.ini
+++ b/conf/locale/locale_ja-JP.ini
@@ -48,7 +48,7 @@ cancel=キャンセル
 install=インストール
 title=インストールをする前に必要な準備をしましょう
 docker_helper=DockerでGogsを稼動する場合は、このページに変更を加える前に、 <a target="_blank" href="%s">ガイドライン</a>をよく読んでください！
-requite_db_desc=Gogs は、MySQL、PostgreSQL、SQLite3 または TiDB が必要です。
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=データベース設定
 db_type=データベースの種類
 host=ホスト
@@ -58,9 +58,8 @@ db_name=データベース名
 db_helper=MySQLではエンジンがINNODB、文字セットがutf8_general_ciである必要があります。
 ssl_mode=SSL モード
 path=パス
-sqlite_helper=SQLite3かTiDBのデータベースのファイルパス。<br>サービスとして開始する際には絶対パスを利用してください。
-err_empty_db_path=SQLite3 または TiDB データベースのパスを空にすることはできません。
-err_invalid_tidb_name=TiDB データベース名は文字"."と"-"を許可しない。
+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.
 no_admin_and_disable_registration=管理者アカウントを作成せずに登録を無効にすることはできません。
 err_empty_admin_password=管理者パスワードは空白にできません。

@@ -75,6 +74,8 @@ 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.
 http_port=HTTP ポート
 http_port_helper=アプリケーションが待ち受けするポート番号。
 app_url=アプリケーションの URL
@@ -397,7 +398,6 @@ migrate.failed=移行に失敗しました: %v

 mirror_from=同期ミラー
 forked_from=フォーク元
-fork_from_self=すでにあなたの所有しているリポジトリはフォークできません
 copy_link=コピー
 copy_link_success=コピーされました！
 copy_link_error=⌘ C または Ctrl-C キーを押してコピー
@@ -473,6 +473,7 @@ 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'

+commits.commit_history=Commit History
 commits.commits=コミット
 commits.search=コミットの検索
 commits.find=検索
@@ -499,7 +500,7 @@ 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.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
@@ -639,6 +640,27 @@ settings.collaboration.admin=管理
 settings.collaboration.write=書込
 settings.collaboration.read=読込
 settings.collaboration.undefined=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.hooks=Webhooks
 settings.githooks=Git のフック
 settings.basic_settings=基本設定
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=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.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.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=This user will no longer have collaboration
 settings.remove_collaborator_success=共同編集者が削除されました。
 settings.search_user_placeholder=Search users
 settings.org_not_allowed_to_be_collaborator=組織を共同編集者として追加することはできません。
-settings.user_is_org_member=ユーザーは組織の一員なので、共同編集者として追加することはできません。
 settings.add_webhook=Webhook を追加
 settings.hooks_desc=Webhooksは、Gogsで特定のイベントの発生時に指定された外部サービスに通知を許可します。イベントが発生すると、それぞれ指定されたUrlに、POSTリクエストが送られます。詳細はこちらのの <a target="_blank"href="%s"> Webhooks ガイド</a>をご覧ください。
 settings.webhook_deletion=Webhook を削除
@@ -723,6 +745,7 @@ settings.add_webhook_desc=私たちは、指定されたURLに購読されたイ
 settings.payload_url=ペイロードの 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.slack_username=ユーザ名
 settings.slack_icon_url=アイコン URL
 settings.slack_color=カラー
@@ -745,10 +768,12 @@ 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.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.add_deploy_key=デプロイキーを追加
 settings.deploy_key_desc=個人アカウントのSSHキーとは異なり、デプロイキーは読み取り専用アクセスとなります。
 settings.no_deploy_keys=でプロキーは１つも追加されていません。
@@ -827,6 +852,7 @@ team_permission_desc=このチームに必要な権限レベルは？

 form.name_reserved=組織名 '%s' は予約されています。
 form.name_pattern_not_allowed=組織名のパターン '%s' は許可されていません。
+form.team_name_reserved=Team name '%s' is reserved.

 settings=設定
 settings.options=オプション
@@ -917,8 +943,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_update_hooks=リポジトリの update フックをすべて再更新する（カスタムの設定パスが変更されたときに必要）
-dashboard.resync_all_update_hooks_success=リポジトリの update フックがすべて正常に再更新されました。
+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.reinit_missing_repos=Reinitialize all repository records that lost Git files
 dashboard.reinit_missing_repos_success=All repository records that lost Git files have been reinitialized successfully.

@@ -1052,10 +1078,8 @@ config.disable_router_log=ルーターのログを無効にする
 config.run_user=実行ユーザ
 config.run_mode=実行モード
 config.git_version=Git Version
-config.repo_root_path=リポジトリのルートパス
 config.static_file_root_path=静的ファイルのルートパス
 config.log_file_root_path=ログ ファイルのルート パス
-config.script_type=スクリプトの種類
 config.reverse_auth_user=リバース認証ユーザ

 config.ssh_config=SSH Configuration
@@ -1070,6 +1094,16 @@ 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.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.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.db_config=データベースの構成
 config.db_type=タイプ
 config.db_host=ホスト
--- a/conf/locale/locale_ko-KR.ini
+++ b/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는 MySQL, PostgreSQL, SQLite3 또는 TiDB가 필요입니다.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=데이터베이스 설정
 db_type=데이터베이스 유형
 host=호스트
@@ -58,9 +58,8 @@ db_name=데이터베이스 이름
 db_helper=MySQL에서는 utf8_general_ci 캐릭터셋으로 INNODB엔진을 이용해 주세요
 ssl_mode=SSL 모드
 path=경로
-sqlite_helper=SQLite3 또는 TiDB 데이터베이스의 파일 경로. <br>서비스로 시작할 때 절대 경로를 사용하십시오.
-err_empty_db_path=SQLite3또는 TiDB의 DB파일 경로는 비어있을 수 없습니다.
-err_invalid_tidb_name=TiDB 파일 이름은 "."과 "-"를 허용하지 않습니다.
+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.
 no_admin_and_disable_registration=관리자 계정을 만들지 않고 등록을 비활성화할 수 없습니다.
 err_empty_admin_password=관리자 암호는 비워둘 수 없습니다.

@@ -75,6 +74,8 @@ 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.
 http_port=HTTP 포트
 http_port_helper=포트 번호는 애플리케이션에서 열고 있습니다.
 app_url=애플리케이션 URL
@@ -116,7 +117,7 @@ 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
+invalid_smtp_from=SMTP 보낸 사람 필드가 유효하지 않습니다: %v
 save_config_failed=설정을 저장할 수 없습니다: %v
 invalid_admin_setting=관리자 계정 설정이 잘못되었습니다: %v
 install_success=환영합니다! Gogs를 선택해 주셔서 감사합니다.
@@ -338,9 +339,9 @@ 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=조직을 떠난 후에는 모든 리포지토리와 팀에 액세스 할 수 없게 됩니다. 계속 하시겠습니까?

 delete_account=계정 삭제
 delete_prompt=당신의 계정을 삭제합니다.  완료된 후에는 <strong>취소할 수 없습니다</strong>.
@@ -389,15 +390,14 @@ 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 URL일 수 있습니다.
+migrate.clone_address_desc_import_local=로컬 서버 경로를 기준으로 저장소를 마이그레이션 할 수도 있습니다.
 migrate.permission_denied=로컬 저장소는 가져오기를 할 수 없습니다.
 migrate.invalid_local_path=잘못된 로컬 경로입니다. 존재하지 않는 경로거나 폴더가 아닙니다.
 migrate.failed=마이그레이션 실패: %v

 mirror_from=의 미러
 forked_from=원본 프로젝트 :
-fork_from_self=본인의 저장소는 포크할 수 없습니다!
 copy_link=복사
 copy_link_success=복사됨!
 copy_link_error=⌘-C 나 Ctrl-C를 눌러 복사
@@ -415,7 +415,7 @@ create_new_repo_command=커맨드 라인에서 새 저장소 만들기
 push_exist_repo=커맨드 라인에서 기존 저장소 푸시하기
 repo_is_empty=이 저장소는 비어 있습니다. 나중에 다시 와주세요!

-files=Files
+files=파일
 branch=브렌치
 tree=트리
 filter_branch_and_tag=브랜치나 태그로 필터
@@ -450,7 +450,7 @@ editor.filename_help=디렉토리를 추가하려면, 디렉토리명을 입력
 editor.or=혹은
 editor.cancel_lower=취소
 editor.commit_changes=변경 내용을 커밋
-editor.add_tmpl=추가 '%s/<filename>'
+editor.add_tmpl='%s/<filename>' 추가
 editor.add=추가 '%s'
 editor.update=업데이트 '%s'
 editor.delete=삭제 '%s'
@@ -473,6 +473,7 @@ editor.add_subdir=하위 디렉토리 추가...
 editor.unable_to_upload_files=파일 '%s'를 업로드하는데 실패하였습니다. 에러: %v
 editor.upload_files_to_dir=파일 업로드 '%s'

+commits.commit_history=Commit History
 commits.commits=커밋
 commits.search=커밋 검색
 commits.find=찾기
@@ -640,6 +641,27 @@ 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.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=기본 설정
@@ -658,8 +680,8 @@ settings.external_wiki_url_desc=탭을 클릭하면 URL로 리다이렉트됩니
 settings.issues_desc=이슈 추적기를 사용하도록 설정
 settings.use_internal_issue_tracker=내장된 경량 이슈 트레커를 사용
 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=외부 이슈 트래커 URL 형식
 settings.tracker_issue_style=외부 이슈 트래커 명명 스타일:
 settings.tracker_issue_style.numeric=숫자
@@ -667,6 +689,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.new_owner_has_same_repo=새로운 소유자가 같은 이름의 저장소를 이미 가지고 있습니다. 다른 이름을 선택해주세요.
 settings.convert=일반 리파지토리로 변환
 settings.convert_desc=이 미러를 일반 리파지토리로 변환할 수 없습니다. 반대로는 할 수 없습니다.
@@ -701,7 +724,6 @@ settings.collaborator_deletion_desc=이 사용자는 더 이상 이 저장소의
 settings.remove_collaborator_success=공동작업자가 삭제 되었습니다.
 settings.search_user_placeholder=사용자 검색...
 settings.org_not_allowed_to_be_collaborator=조직을 공동 작업자로 추가할 수 없습니다.
-settings.user_is_org_member=사용자가 조직 구성원이므로 공동 작업자로 추가할 수 없습니다.
 settings.add_webhook=Webhook 추가
 settings.hooks_desc=웹후크는 기본적인 HTTP POST 이벤트 트리거입니다. Gogs에서 무슨 일이 발생할 때마다, 지정한 대상 호스트에 알림을 보냅니다. <a target="_blank" href="%s">웹후크 안내서</a>에서 자세히 알아보십시오.
 settings.webhook_deletion=Webhook 삭제
@@ -724,6 +746,7 @@ settings.add_webhook_desc=Gogs는 발생한 이벤트와 관련하여 지정한
 settings.payload_url=페이로드 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.slack_username=사용자 이름
 settings.slack_icon_url=아이콘 URL
 settings.slack_color=색
@@ -746,10 +769,12 @@ settings.delete_webhook=Webhook 삭제
 settings.recent_deliveries=최근의 Deliveries
 settings.hook_type=훅 타입
 settings.add_slack_hook_desc=저장소에 <a href="%s">슬랙</a>연동을 추가
+settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
 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.add_deploy_key=배포 키 추가
 settings.deploy_key_desc=배포 키는 읽기 전용 입니다. 개인 계정 SSH 키와 동일하지 않습니다.
 settings.no_deploy_keys=배포 키를 추가하지 않았습니다.
@@ -828,6 +853,7 @@ team_permission_desc=이 팀이 가진 권한이 무엇입니까?

 form.name_reserved=조직이름 '%s'는 예약되어있습니다.
 form.name_pattern_not_allowed=조직이름 패턴 '%s'는 허용되지 않았습니다.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=설정
 settings.options=옵션
@@ -918,8 +944,8 @@ dashboard.git_gc_repos=저장소들의 가비지 콜렉션을 진행합니다.
 dashboard.git_gc_repos_success=모든 저장소의 가비지 콜렉션이 성공적으로 완료되었습니다.
 dashboard.resync_all_sshkeys='.ssh/authorized_keys' 파일을 다시 작성합니다. (주의: non-Gogs키는 손실됩니다)
 dashboard.resync_all_sshkeys_success=모든 공개키들이 성공적으로 재작성되었습니다.
-dashboard.resync_all_update_hooks=모든 저장소의 업데이트 훅들을 재작성합니다. (사용자 설정 경로가 변경될때 필요)
-dashboard.resync_all_update_hooks_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.reinit_missing_repos=깃 파일들을 잃어버린 모든 저장소를 다시 초기화합니다.
 dashboard.reinit_missing_repos_success=깃 파일을 잃은 모든 저장소를 다시 초기화 하는데 성공하였습니다.

@@ -1052,11 +1078,9 @@ config.offline_mode=오프라인 모드
 config.disable_router_log=라우터 로그 비활성화
 config.run_user=데몬 실행 계정
 config.run_mode=실행 모드
-config.git_version=Git Version
-config.repo_root_path=저장소 최상위 경로
+config.git_version=Git 버전
 config.static_file_root_path=정적 파일 최상위 경로
 config.log_file_root_path=로그 파일 최상위 경로
-config.script_type=스크립트 유형
 config.reverse_auth_user=역방향 사용자 인증

 config.ssh_config=SSH 설정
@@ -1071,6 +1095,16 @@ 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.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.db_config=데이터베이스 설정
 config.db_type=유형
 config.db_host=호스트
--- a/conf/locale/locale_lv-LV.ini
+++ b/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 nepieciešams MySQL, PostgreSQL, SQLite3 vai TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Datu bāzes iestatījumi
 db_type=Datu bāzes veids
 host=Resursdators
@@ -58,9 +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=SQLite3 vai TiDB datu bāzēs faila ceļš.<br>Izmantojiet absolūto ceļu, startējot kā servisu.
-err_empty_db_path=Nepieciešams norādīt SQLite3 vai TiDB datu bāzes atrašanās vietu.
-err_invalid_tidb_name=TiDB datu bāzes nosaukums nevar saturēt simbolus "." un "-".
+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.
 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.

@@ -75,6 +74,8 @@ 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.
 http_port=HTTP ports
 http_port_helper=Porta numurs pēc kura lietojumprogrammai būs iespējams pieslēgties.
 app_url=Lietotnes URL
@@ -397,7 +398,6 @@ migrate.failed=Migrācija neizdevās: %v

 mirror_from=spogulis no
 forked_from=atdalīts no
-fork_from_self=Nav iespējams atdalīt repozitoriju, kuram esat īpašnieks!
 copy_link=Kopēt
 copy_link_success=Nokopēts!
 copy_link_error=Nospiediet ⌘-C vai Ctrl-C, lai nokopētu
@@ -473,6 +473,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.commits=Revīzijas
 commits.search=Meklēt revīzijas
 commits.find=Meklēt
@@ -639,6 +640,27 @@ 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.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.hooks=Tīmekļa āķi
 settings.githooks=Git āķi
 settings.basic_settings=Pamatiestatījumi
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Burti un cipari
 settings.tracker_url_format_desc=Jūs varat izmantot <code>{user}{repo}{index}</code> lietotājvārdam, repozitorija nosaukumam un problēmas identifikātoram.
 settings.pulls_desc=Iespējot izmaiņu pieprasījumus lai saņemtu publiskus ieguldījumus
 settings.danger_zone=Bīstamā zona
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Jaunajam īpašniekam jau ir repozitorijs ar šādu nosaukumu.
 settings.convert=Konvertēt uz parastu repozitoriju
 settings.convert_desc=Šo spoguli ir iespējams konvertēt par parastu repozitoriju. Šī ir neatgriezeniska darbība.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Šim lietotājam pēc dzēšanas vairs nebū
 settings.remove_collaborator_success=Līdzstrādnieks tika noņemts.
 settings.search_user_placeholder=Meklēt lietotāju...
 settings.org_not_allowed_to_be_collaborator=Organizāciju nav atļauts pievienot kā līdzstrādnieku.
-settings.user_is_org_member=Lietotājs ir organizācijas biedrs, kas nevar tikt pievienots kā līdzstrādnieks.
 settings.add_webhook=Pievienot tīmekļa āķi
 settings.hooks_desc=Tīmekļa āķi ļauj paziņot ārējiem servisiem par noteiktiem notikomiem, kas notiek Git servisā. Kad iestāsies kāds notikums, katram ārējā servisa URL tiks nosūtīts POST pieprasījums. Lai uzzinātu sīkāk skatieties <a target="_blank" href="%s">Tīmekļa āķu rokasgrāmatā</a>.
 settings.webhook_deletion=Dzēst tīmekļa āķi
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Uz norādīto URL tiks nosūtīts <code>POST</code> pi
 settings.payload_url=Vērtuma URL
 settings.content_type=Satura tips
 settings.secret=Noslēpums
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Lietotājvārds
 settings.slack_icon_url=Ikonas URL
 settings.slack_color=Krāsa
@@ -745,10 +768,12 @@ settings.delete_webhook=Dzēst tīmekļa āķi
 settings.recent_deliveries=Pēdējās piegādes
 settings.hook_type=Āķa veids
 settings.add_slack_hook_desc=PIevienot <a href="%s">Slack</a> integrāciju Jūsu repozitorijā.
+settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
 settings.slack_token=Talons
 settings.slack_domain=Domēns
 settings.slack_channel=Kanāls
 settings.deploy_keys=Izvietot atslēgas
+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=Pievienot izvietošanas atslēgu
 settings.deploy_key_desc=Izvietošanas atslēgai ir tikai lasīšanas piekļuve. Tā nav tā pati kā Jūsu personīgā konta SSH atslēga.
 settings.no_deploy_keys=Nav pievienota neviena izvietošanas atslēga.
@@ -827,6 +852,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.

 settings=Iestatījumi
 settings.options=Opcijas
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Veikt repozitoriju datu sakārtošānu (git gc)
 dashboard.git_gc_repos_success=Datu sakārtošana visiem repozitorijiem veiksmīgi pabeigta.
 dashboard.resync_all_sshkeys=Pārrakstīt '.ssh/authorized_keys' failu (brīdinājums: ne-Git atslēgas tiks pazaudētas)
 dashboard.resync_all_sshkeys_success=Visas publiskās atslēgas tika veiksmīgi pārrakstītas.
-dashboard.resync_all_update_hooks=Pārrakstīt visu repozitoriju izmaiņu āķus (nepieciešams, ja tiek mainīta konfigurācijas faila atrašanās vieta)
-dashboard.resync_all_update_hooks_success=Visu repozitoriju izmaiņu āķi tika veiksmīgi pārrakstīti.
+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.reinit_missing_repos=Atkārtoti inicializēt visus repozitorija ierakstus, kam trūkst Git failu
 dashboard.reinit_missing_repos_success=Visi repozitorija ieraksti, kam trūkst Git faili, tika atkārtoti inicializēti.

@@ -1052,10 +1078,8 @@ 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.repo_root_path=Repozitoriju glabāšanas vieta
 config.static_file_root_path=Statisko failu atrašanās vieta
 config.log_file_root_path=Žurnalizēšanas failu glabāšanas vieta
-config.script_type=Skripta veids
 config.reverse_auth_user=Reversā lietotāja autentifikācija

 config.ssh_config=SSH konfigurācija
@@ -1070,6 +1094,16 @@ 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_root_path=Repozitoriju glabāšanas vieta
+config.script_type=Skripta veids
+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.db_config=Datu bāzes konfigurācija
 config.db_type=Veids
 config.db_host=Resursdators
--- a/conf/locale/locale_nl-NL.ini
+++ b/conf/locale/locale_nl-NL.ini
@@ -13,7 +13,7 @@ version=Versie
 page=Pagina
 template=Sjabloon
 language=Taal
-create_new=Creëren...
+create_new=Toevoegen...
 user_profile_and_more=Gebruikersprofiel en meer
 signed_in_as=Aangemeld als

@@ -48,19 +48,18 @@ 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 vereist MySQL, PostgreSQL, SQite3 of TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Database-instellingen
 db_type=Database-type
 host=Host
 user=Gebruikersnaam
 password=Wachtwoord
-db_name=Database naam
+db_name=Databasenaam
 db_helper=Gebruik InnoDB engine met utf8_general_ci karakterset voor MySQL.
 ssl_mode=SSL-modus
 path=Pad
-sqlite_helper=Het pad van de SQLite3- of TiDB-database.<br>Als u Gogs start als een service, geef dan een absoluut pad op.
-err_empty_db_path=SQLite3 of TiDB databankpad mag niet leeg.
-err_invalid_tidb_name=TiDB databank naam niet tekens kunnen "." en "-".
+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.
 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.

@@ -75,6 +74,8 @@ 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.
 http_port=HTTP-poort
 http_port_helper=Poortnummer waar het programma naar luistert.
 app_url=Applicatie URL
@@ -138,7 +139,7 @@ issues.in_your_repos=In uw repositories
 [explore]
 repos=Repositories
 users=Gebruikers
-organizations=Organizations
+organizations=Organisaties
 search=Zoeken

 [auth]
@@ -153,8 +154,8 @@ forget_password=Wachtwoord vergeten?
 sign_up_now=Een account nodig? Meld u nu aan.
 confirmation_mail_sent_prompt=Een bevestigingsemail is gestuurd naar <b>%s</b>, Bevestig u aanvraag binnen %d uren om uw registratie te voltooien.
 active_your_account=Activeer uw account
-prohibit_login=Login Prohibited
-prohibit_login_desc=Your account is prohibited to login, please contact site admin.
+prohibit_login=Inloggen niet toegestaan
+prohibit_login_desc=U mag met dit account niet inloggen, neem contact op met de websitebeheerder.
 resent_limit_prompt=Sorry, u heeft te snel na elkaar een aanvraag gedaan voor een activatie mail. Wacht drie minuten voor uw volgende aanvraag.
 has_unconfirmed_mail=Beste %s, u heeft een onbevestigd e-mailadres (<b>%s</b>). Als u nog geen bevestiging heeft ontvangen, of u een nieuwe aanvraag wilt doen, klik dan op de onderstaande knop.
 resend_mail=Klik hier om uw activatie mail nog een keer te verzenden
@@ -338,9 +339,9 @@ access_token_deletion=Persoonlijke toegang token verwijderen
 access_token_deletion_desc=Verwijderen van deze persoonlijke toegang token zal alle verwante toegang verwijderen. Wilt u doorgaan?
 delete_token_success=Persoonlijke toegangstoken is met succes verwijderd! Vergeet niet uw toepassingen ook bij te werken.

-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=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?

 delete_account=Verwijder uw account
 delete_prompt=Deze handeling zal uw account definitief verwijderen, u kunt dit <strong> NIET </strong> terug draaien!
@@ -389,7 +390,7 @@ migrate_type=Migratie type
 migrate_type_helper=Deze repositorie zal een <span class="text blue">mirror</span> zijn
 migrate_repo=Migreer repositorie
 migrate.clone_address=Clone adres
-migrate.clone_address_desc=This can be a HTTP/HTTPS/GIT URL.
+migrate.clone_address_desc=Dit kan een HTTP/HTTPS/GIT URL zijn.
 migrate.clone_address_desc_import_local=You're also allowed to migrate a repository by local server path.
 migrate.permission_denied=U bent niet toegestaan om deze lokale repositories te importeren.
 migrate.invalid_local_path=Ongeldig lokaal pad, het pad bestaat niet of het is geen map.
@@ -397,7 +398,6 @@ migrate.failed=Migratie is mislukt: %v

 mirror_from=spiegel van
 forked_from=geforked van
-fork_from_self=U kunt geen repository forken die u al beheert!
 copy_link=Kopieer
 copy_link_success=Gekopieerd!
 copy_link_error=Druk op ⌘-C of Ctrl-C om te kopiëren
@@ -415,7 +415,7 @@ 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!

-files=Files
+files=Bestanden
 branch=Aftakking
 tree=Boom
 filter_branch_and_tag=Filter branch of tag
@@ -432,7 +432,7 @@ file_history=Geschiedenis
 file_view_raw=Weergave ruwe
 file_permalink=Permalink
 file_too_large=Dit bestand is te groot om te worden getoond
-video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
+video_not_supported_in_browser=Uw browser ondersteunt geen HTML5 video label.

 editor.new_file=Nieuw bestand
 editor.upload_file=Bestand uploaden
@@ -445,34 +445,35 @@ editor.fork_before_edit=Je moet deze repository eerst vorken om dit bestand aan
 editor.delete_this_file=Verwijder dit bestand
 editor.must_have_write_access=You must have write access to make or propose changes to this file
 editor.file_delete_success=Bestand '%s' is succesvol verwijderd!
-editor.name_your_file=Name your file...
+editor.name_your_file=Bestandsnaam...
 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=of
 editor.cancel_lower=annuleren
 editor.commit_changes=Commit Changes
-editor.add_tmpl=Add '%s/<filename>'
-editor.add=Add '%s'
-editor.update=Update '%s'
-editor.delete=Delete '%s'
+editor.add_tmpl='%s/<filename>' toevoegen
+editor.add='%s' toevoegen
+editor.update='%s' updaten
+editor.delete='%s' verwijderen
 editor.commit_message_desc=Add an optional extended description...
 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.cancel=Cancel
-editor.filename_cannot_be_empty=Filename cannot be empty.
-editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.new_branch_name_desc=Naam nieuwe aftakking...
+editor.cancel=Annuleren
+editor.filename_cannot_be_empty=Bestandsnaam mag niet leeg zijn.
+editor.branch_already_exists=Aftakking '%s' bestaat al in deze 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.no_changes_to_show=Er zijn geen wijzigingen om weer te geven.
 editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
-editor.add_subdir=Add subdirectory...
+editor.add_subdir=Submap toevoegen...
 editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
-editor.upload_files_to_dir=Upload files to '%s'
+editor.upload_files_to_dir=Bestanden uploaden naar '%s'

+commits.commit_history=Commit History
 commits.commits=Commits
 commits.search=Zoeken
 commits.find=zoek
@@ -499,9 +500,9 @@ issues.new_label=Nieuw Label
 issues.new_label_placeholder=Tekst label...
 issues.create_label=Maak 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.info=Er zijn nog geen labels. U kunt op de 'Nieuw label'-knop drukken om een nieuwe toe te voegen of een voorgedefinieerde set hieronder gebruiken.
+issues.label_templates.helper=Selecteer een labelset
+issues.label_templates.use=Deze labelset gebruiken
 issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d Open
 issues.close_tab=%d gesloten
@@ -530,8 +531,8 @@ issues.next=Volgende
 issues.open_title=Open
 issues.closed_title=Gesloten
 issues.num_comments=%d opmerkingen
-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=`reageerde <a href="#%s">%s</a>`
+issues.delete_comment_confirm=Weet u zeker dat u deze reactie wilt verwijderen?
 issues.no_content=Er is nog geen inhoud.
 issues.close_issue=Sluit
 issues.close_comment_issue=Sluit en geef commentaar
@@ -559,8 +560,8 @@ issues.label_deletion=Verwijder label
 issues.label_deletion_desc=Het verwijderen van dit label zal alle informatie in de gerelateerde problemen verwijderen. Wilt u doorgaan?
 issues.label_deletion_success=Label werd met succes verwijderd!
 issues.num_participants=%d deelnemers
-issues.attachment.open_tab=`Click to see "%s" in a new tab`
-issues.attachment.download=`Click to download "%s"`
+issues.attachment.open_tab=`Klik om "%s" in een nieuw tabblad te bekijken`
+issues.attachment.download=`Klik om te downloaden "%s"`

 pulls.new=Nieuwe Pull aanvraag
 pulls.compare_changes=Vergelijk veranderingen
@@ -587,7 +588,7 @@ pulls.cannot_auto_merge_desc=Dit pull-request kan niet worden gemerged omdat er
 pulls.cannot_auto_merge_helper=Gelieve beide versies manueel samen te voegen om de conflicten op te lossen.
 pulls.merge_pull_request=Samenvoegen van pull verzoek
 pulls.open_unmerged_pull_exists=U kan de bewerking 'heropenen' niet uitvoeren omdat er al een pull-aanvraag (#%d) is van dezelfde repository met dezelfde informatie. Voeg deze eerst samen. 
-pulls.delete_branch=Delete Branch
+pulls.delete_branch=Aftakking verwijderen
 pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.

 milestones.new=Nieuwe mijlpaal
@@ -635,37 +636,59 @@ wiki.last_updated=Laatst bijgewerkt: %s
 settings=Instellingen
 settings.options=Opties
 settings.collaboration=Samenwerking
-settings.collaboration.admin=Admin
-settings.collaboration.write=Write
-settings.collaboration.read=Read
-settings.collaboration.undefined=Undefined
+settings.collaboration.admin=Beheer
+settings.collaboration.write=Schrijven
+settings.collaboration.read=Lezen
+settings.collaboration.undefined=Niet gedefinieerd
+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.hooks=Webhooks
 settings.githooks=Git-hooks
 settings.basic_settings=Basis instellingen
 settings.mirror_settings=Mirror Settings
-settings.sync_mirror=Sync Now
+settings.sync_mirror=Nu synchroniseren
 settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Officiële site
 settings.update_settings=Instellingen bewerken
 settings.change_reponame_prompt=Deze verandering zal gevolgen hebben voor hoe links zich verhouden tot de repository.
 settings.advanced_settings=Geavanceerde opties
-settings.wiki_desc=Enable wiki system
-settings.use_internal_wiki=Use builtin wiki
+settings.wiki_desc=Wiki-systeem inschakelen
+settings.use_internal_wiki=Ingebouwde wiki gebruiken
 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=Enable issue tracker
-settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.issues_desc=Kwestietracker inschakelen
+settings.use_internal_issue_tracker=Gebruik ingebouwde eenvoudige kwestietracker
 settings.use_external_issue_tracker=Externe issuetracker gebruiken
-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 externe kwestietracker
+settings.external_tracker_url_desc=Bezoekers worden doorgestuurd naar de URL als ze op het tabblad klikken.
 settings.tracker_url_format=URL-formaat externe issuetracker
-settings.tracker_issue_style=External Issue Tracker Naming Style:
-settings.tracker_issue_style.numeric=Numeric
-settings.tracker_issue_style.alphanumeric=Alphanumeric
+settings.tracker_issue_style=Naamgevingstijl externe kwestietracker:
+settings.tracker_issue_style.numeric=Nummeriek
+settings.tracker_issue_style.alphanumeric=Alfanummeriek
 settings.tracker_url_format_desc=U kan de aanduidingen <code>{user} {repo} {index}</code> gebruiken voor de gebruikersnaam, de naam van de repository en de lijst van open tickets.
 settings.pulls_desc=Schakel 'pull request' in om publieke bijdragen te mogelijk te maken
 settings.danger_zone=Gevaren zone
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=De nieuwe eigenaar heeft al een repositorie met deze naam
 settings.convert=Converteren naar gewone repository
 settings.convert_desc=U kunt deze mirror converteren naar een gewone repository. Dit kan niet ongedaan worden gemaakt.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Deze gebruiker zal niet langer toegang hebbe
 settings.remove_collaborator_success=medewerker is verwijderd.
 settings.search_user_placeholder=Zoek gebruiker...
 settings.org_not_allowed_to_be_collaborator=De organisatie kan niet toegevoegd worden als medewerker.
-settings.user_is_org_member=Gebruiker is lid van de organisatie die als een medewerker kan niet worden toegevoegd.
 settings.add_webhook=Webhook toevoegen
 settings.hooks_desc=Webhooks dat de externe diensten om kennisgevingen te ontvangen wanneer bepaalde gebeurtenissen op Gogs plaatsvinden. Wanneer de opgegeven gebeurtenissen plaatsvinden, sturen we een POST-aanvraag naar elk van de URL's die u opgeeft. Meer informatie vindt u in onze <a target="_blank" href="%s"> Webhooks gids</a>.
 settings.webhook_deletion=Webhook verwijderen
@@ -723,6 +745,7 @@ settings.add_webhook_desc=We sturen een <code>POST</code>-aanvraag naar de onder
 settings.payload_url=Nettolading URL
 settings.content_type=Content type
 settings.secret=Geheim
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Gebruikersnaam
 settings.slack_icon_url=Icoon URL
 settings.slack_color=Kleur
@@ -732,8 +755,8 @@ 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 opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
+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_push=Push
 settings.event_push_desc=Git push naar een repository
 settings.active=Actief
@@ -745,10 +768,12 @@ settings.delete_webhook=Webhook verwijderen
 settings.recent_deliveries=Recente bezorgingen
 settings.hook_type=Type hook
 settings.add_slack_hook_desc=<a href="%s"> toegestane vertraging</a> integratie toevoegen aan uw repository.
+settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
 settings.slack_token=Slack token
 settings.slack_domain=Slack domein
 settings.slack_channel=Slack kanaal
 settings.deploy_keys=Installeer sleutels
+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=Toevoegen deploy sleutel
 settings.deploy_key_desc=Sleutels voor uitrol hebben enkel leesrechten. Ze zijn niet dezelfde als de SSH sleutels van persoonlijke accounts.
 settings.no_deploy_keys=U hebt nog geen deploy sleutels toegevoegd.
@@ -803,7 +828,7 @@ release.deletion=Release verwijderen
 release.deletion_desc=Als deze release verwijdert, worden de bijbehorende Git tag ook gewist. Wilt u doorgaan?
 release.deletion_success=Release is verwijderd!
 release.tag_name_already_exist=Versie met deze naam bestaat al.
-release.tag_name_invalid=Tag name is not valid.
+release.tag_name_invalid=Labelnaam is niet geldig.
 release.downloads=Downloads

 [org]
@@ -827,6 +852,7 @@ team_permission_desc=Welke privileges zou dit team moeten hebben?

 form.name_reserved=Organisatienaam '%s' is gereserveerd.
 form.name_pattern_not_allowed=Organisatie naampatroon '%s' is niet toegestaan.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Instellingen
 settings.options=Opties
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Garbage collectie uitvoeren
 dashboard.git_gc_repos_success=Garbage collectie met succes uitgevoerd.
 dashboard.resync_all_sshkeys=Herschrijf '.ssh/authorized_keys' (Let op: alle sleutels die niet van Gogs zijn zullen verloren gaan!)
 dashboard.resync_all_sshkeys_success=Alle publieke sleutels zijn herschreven.
-dashboard.resync_all_update_hooks=Herschrijf alle repositorie-hooks (nodig als de configuratie bestandslocatie is gewijzigd)
-dashboard.resync_all_update_hooks_success=Alle repositorie-hooks zijn herschreven.
+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.reinit_missing_repos=Alle repositories zonder Git files opnieuw initialiseren
 dashboard.reinit_missing_repos_success=Alle repositories zonder Git files zijn succesvol opnieuw geinitializeerd.

@@ -971,7 +997,7 @@ users.edit_account=Bewerk account
 users.max_repo_creation=Maximum-limiet voor aanmaken van repositories
 users.max_repo_creation_desc=(Zet op -1 om de globale limiet te gebruiken)
 users.is_activated=Dit account is geactiveerd
-users.prohibit_login=This account is prohibited to login
+users.prohibit_login=Dit account is verboden om in te loggen
 users.is_admin=Dit account heeft beheerdersrechten
 users.allow_git_hook=Deze account beschikt over machtigingen voor het maken van Git haken
 users.allow_import_local=Dit account mag lokale repositories importeren
@@ -1002,7 +1028,7 @@ auths.enabled=Ingeschakeld
 auths.updated=Bijgewerkt
 auths.auth_type=Authenticatietype
 auths.auth_name=Authenticatienaam
-auths.security_protocol=Security Protocol
+auths.security_protocol=Beveiligingsprotocol
 auths.domain=Domein
 auths.host=Host
 auths.port=Poort
@@ -1039,7 +1065,7 @@ auths.delete=Deze authenticatiewijze verwijderen
 auths.delete_auth_title=Authenticatie verwijderd
 auths.delete_auth_desc=Deze authenticatie zal verwijderd worden, wil je verdergaan?
 auths.still_in_used=This authentication is still used by some users, please delete or convert these users to another login type first.
-auths.deletion_success=Authentication has been deleted successfully!
+auths.deletion_success=Authenticatie is met succes verwijderd!
 auths.login_source_exist=Login source '%s' already exists.

 config.server_config=Serverconfiguratie
@@ -1051,11 +1077,9 @@ config.offline_mode=Offline-modus
 config.disable_router_log=Router-log uitschakelen
 config.run_user=Uitvoerende gebruiker
 config.run_mode=Uitvoer modus
-config.git_version=Git Version
-config.repo_root_path=Repositorie basis pad
+config.git_version=Gitversie
 config.static_file_root_path=Statische bestanden basis pad
 config.log_file_root_path=Log bestand basis pad
-config.script_type=Script type
 config.reverse_auth_user=Omgekeerde verificatie gebruiker

 config.ssh_config=SSH-configuratie
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Pad van keygen ('ssh-keygen')
 config.ssh_minimum_key_size_check=Controleer minimale key-lengte
 config.ssh_minimum_key_sizes=Minimale key-lengtes

+config.repo_config=Repository Configuration
+config.repo_root_path=Repositorie basis pad
+config.script_type=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.db_config=Databaseconfiguratie
 config.db_type=Type
 config.db_host=Host
@@ -1127,9 +1161,9 @@ config.cookie_life_time=Cookie duur leeftijd
 config.picture_config=Foto configuratie
 config.picture_service=Foto service
 config.disable_gravatar=Gravatar uitschakelen
-config.enable_federated_avatar=Enable Federated Avatars
+config.enable_federated_avatar=Federated Avatars toestaan

-config.git_config=Git Configuration
+config.git_config=Gitconfiguratie
 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)
@@ -1171,16 +1205,16 @@ notices.delete_success=System notices have been deleted successfully.

 [action]
 create_repo=repositorie aangemaakt in <a href="%s">%s</a>
-rename_repo=renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]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>
 create_issue=`opende issue in <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=`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>`
+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>`
+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=`merged pull request <a href="%s/pulls/%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>
 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
--- a/conf/locale/locale_pl-PL.ini
+++ b/conf/locale/locale_pl-PL.ini
@@ -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 wymaga MySQL, PostgreSQL, SQLite3 lub TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Ustawienia bazy danych
 db_type=Typ bazy danych
 host=Host
@@ -58,9 +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=Ścieżka do pliku bazy danych SQLite3 lub TiDB. <br>Proszę użyć ścieżki bezwzględnej podczas uruchamiania usługi.
-err_empty_db_path=Ścieżka do bazy danych SQLite3 lub TiDB nie może być pusta.
-err_invalid_tidb_name=Nazwa bazy danych TiDB nie może zawierać znaków „.” i „-”.
+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.
 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.

@@ -75,6 +74,8 @@ 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.
 http_port=Port HTTP
 http_port_helper=Numer portu na którym aplikacja jest dostępna.
 app_url=Adres URL aplikacji
@@ -397,7 +398,6 @@ migrate.failed=Migracja nie powiodła się: %v

 mirror_from=kopia lustrzana
 forked_from=sklonowany z
-fork_from_self=Nie możesz forkować swojego własnego repozytorium!
 copy_link=Kopiuj
 copy_link_success=Skopiowane!
 copy_link_error=Naciśnij klawisze ⌘-C i Ctrl-C, aby skopiować
@@ -473,6 +473,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.commits=Commity
 commits.search=Przeszukaj commity
 commits.find=Szukaj
@@ -639,6 +640,27 @@ 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.hooks=Webhooki
 settings.githooks=Hooki Git
 settings.basic_settings=Ustawienia podstawowe
@@ -666,6 +688,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.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.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Ten użytkownik nie będzie miał dostępu w
 settings.remove_collaborator_success=Współpracownik został usunięty.
 settings.search_user_placeholder=Szukaj użytkownika...
 settings.org_not_allowed_to_be_collaborator=Organizacji nie można dodać jako współpracownika.
-settings.user_is_org_member=Użytkownik jest członkiem organizacji, który nie może być dodany jako współpracownik.
 settings.add_webhook=Dodaj webhooka
 settings.hooks_desc=Webooki działają tak jak proste wywołania HTTP POST. Jeśli cokolwiek zdarzy się w Gogs, wyślemy powiadomienie do wybranego hosta. Więcej informacji można znaleźć w <a target="_blank" href="%s">przewodniku webhooków</a>.
 settings.webhook_deletion=Usuń webhooka
@@ -723,6 +745,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.slack_username=Użytkownik
 settings.slack_icon_url=Adres URL ikony
 settings.slack_color=Kolor
@@ -745,10 +768,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.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.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.
@@ -827,6 +852,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.

 settings=Ustawienia
 settings.options=Opcje
@@ -917,8 +943,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_update_hooks=Przepisz pliki update hook repozytoriów (wymagane przy zmianie ścieżki do pliku konfiguracji)
-dashboard.resync_all_update_hooks_success=Wszystkie pliki update hook repozytoriów zostały pomyślnie przepisane.
+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.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.

@@ -1052,10 +1078,8 @@ 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.repo_root_path=Ścieżka repozytoriów
 config.static_file_root_path=Ścieżka plików statycznych
 config.log_file_root_path=Ścieżka plików dziennika
-config.script_type=Typ skryptu
 config.reverse_auth_user=Użytkownik dostarczony przez odwrotne proxy

 config.ssh_config=Konfiguracja SSH
@@ -1070,6 +1094,16 @@ 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_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.db_config=Konfiguracja bazy danych
 config.db_type=Typ
 config.db_host=Host
--- a/conf/locale/locale_pt-BR.ini
+++ b/conf/locale/locale_pt-BR.ini
@@ -1,7 +1,7 @@
 app_desc=Um serviço de Git hospedável e amigável escrito em Go

 home=Página inicial
-dashboard=Painel
+dashboard=Página Inicial
 explore=Explorar
 help=Ajuda
 sign_in=Entrar
@@ -48,7 +48,7 @@ cancel=Cancelar
 install=Instalação
 title=Etapas de instalação para primeira execução
 docker_helper=Se você está rodando o Gogs dentro do Docker, por favor leia os <a target="_blank" href="%s">Guias</a> cuidadosamente antes de mudar qualquer coisa nesta página!
-requite_db_desc=Gogs requer MySQL, PostgreSQL, SQLite3 ou TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Configurações de banco de dados
 db_type=Tipo de banco de dados
 host=Host
@@ -58,9 +58,8 @@ db_name=Nome do banco de dados
 db_helper=Por favor, use o mecanismo INNODB com o conjunto de caracteres utf8_general_ci para MySQL.
 ssl_mode=Modo SSL
 path=Caminho
-sqlite_helper=O caminho do arquivo de banco de dados SQLite3 ou TiDB. <br>Por favor use o caminho absoluto quando você iniciar como serviço.
-err_empty_db_path=O Caminho do banco de dados SQLite3 ou TiDB não pode ser vazio.
-err_invalid_tidb_name=Nome do banco de dados TiDB não permite os caracteres "." e "-".
+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.
 no_admin_and_disable_registration=Você não pode desabilitar o registro sem criar uma conta de administrador.
 err_empty_admin_password=A senha de administrador não pode ser vazia.

@@ -75,6 +74,8 @@ domain=Domínio
 domain_helper=Isto afeta URLs para o clone via SSH.
 ssh_port=Porta SSH
 ssh_port_helper=Número da porta que seu servidor SSH está usando, deixe vazio para desativar o recurso 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.
 http_port=Porta HTTP
 http_port_helper=Número da porta em que a aplicação irá executar.
 app_url=URL do aplicativo
@@ -116,7 +117,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
-invalid_smtp_from=SMTP From field is not valid: %v
+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
 install_success=Bem-vindo! Estamos contentes que você escolheu o Gogs, divirta-se e tenha cuidado.
@@ -138,7 +139,7 @@ issues.in_your_repos=Em seus repositórios
 [explore]
 repos=Repositórios
 users=Usuários
-organizations=Organizations
+organizations=Organizações
 search=Pesquisar

 [auth]
@@ -338,9 +339,9 @@ access_token_deletion=Exclusão do token de acesso pessoal
 access_token_deletion_desc=Ao Excluir este token de acesso pessoal será removido todos os acessos do aplicativo. Você deseja continuar?
 delete_token_success=O Token de acesso pessoal foi removido com sucesso! Não se esqueça de atualizar seus aplicativos também.

-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=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?

 delete_account=Deletar sua conta
 delete_prompt=A operação deletará sua conta permanentemente, e <strong>NÃO PODERÁ</strong> ser desfeita!
@@ -389,15 +390,14 @@ migrate_type=Tipo de migração
 migrate_type_helper=Este repositório será um <span class="text blue">mirror</span>
 migrate_repo=Migrar repositório
 migrate.clone_address=Endereço de clone
-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=Pode ser um URL HTTP/HTTPS/GIT.
+migrate.clone_address_desc_import_local=Você também pode migrar um repositório pelo path do servidor local.
 migrate.permission_denied=Você não pode importar repositórios locais.
 migrate.invalid_local_path=Caminho local inválido, não existe ou não é um diretório.
 migrate.failed=Migração falhou: %v

 mirror_from=mirror de
 forked_from=fork de
-fork_from_self=Você não pode criar fork de um repositório que já é seu!
 copy_link=Copiar
 copy_link_success=Copiado!
 copy_link_error=Pressione ⌘-C ou Ctrl-C para copiar
@@ -415,7 +415,7 @@ 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!

-files=Files
+files=Arquivos
 branch=Branch
 tree=Tree
 filter_branch_and_tag=Filtrar branch ou tag
@@ -432,7 +432,7 @@ file_history=Histórico
 file_view_raw=Ver raw
 file_permalink=Link permanente
 file_too_large=Este arquivo é muito grande para ser exibido
-video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
+video_not_supported_in_browser=Seu navegador não suporta a tag de vídeo do HTML5.

 editor.new_file=Novo arquivo
 editor.upload_file=Enviar arquivo
@@ -462,7 +462,7 @@ editor.cancel=Cancelar
 editor.filename_cannot_be_empty=Nome do arquivo não pode ser vazio.
 editor.branch_already_exists=Branch '%s' já existe neste repositório.
 editor.directory_is_a_file=Entrada '%s' no caminho pai é um arquivo e não uma pasta neste repositório.
-editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
+editor.file_is_a_symlink=O arquivo '%s' é um link simbólico que não pode ser modificado a partir do editor da web.
 editor.filename_is_a_directory=O arquivo '%s' é uma pasta existente neste repositório.
 editor.file_editing_no_longer_exists=O arquivo '%s' que você está editando não existe mais neste repositório.
 editor.file_changed_while_editing=O conteúdo do arquivo mudou desde que você começou a editar. <a target="_blank" href="%s">Clique aqui</a> para ver o que mudou ou <strong>pressione efetivar novamente</strong> para sobrescrever esses mudanças.
@@ -473,6 +473,7 @@ editor.add_subdir=Adicionar o subdiretório...
 editor.unable_to_upload_files=Houve erro ao fazer upload de arquivos para '%s': %v
 editor.upload_files_to_dir=Enviar arquivos para '%s'

+commits.commit_history=Commit History
 commits.commits=Commits
 commits.search=Pesquisar commits
 commits.find=Buscar
@@ -587,8 +588,8 @@ pulls.cannot_auto_merge_desc=O merge deste Pull Request não pode ser aplicado a
 pulls.cannot_auto_merge_helper=Por favor, aplique o merge manualmente para resolver os conflitos.
 pulls.merge_pull_request=Solicitação de merge de Pull Request
 pulls.open_unmerged_pull_exists=`Você não pode executar a operação de reabrir porque já existe um Pull request aberto (#%d) do mesmo repositório com as mesmas informações de merge e está esperando pelo merge.`
-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=Excluir Branch
+pulls.delete_branch_has_new_commits=O branch não pode ser excluído por possuir novos commits após o merge.

 milestones.new=Novo milestone
 milestones.open_tab=%d abertos
@@ -639,6 +640,27 @@ settings.collaboration.admin=Administrador
 settings.collaboration.write=Escrita
 settings.collaboration.read=Leitura
 settings.collaboration.undefined=Indefinido
+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=Selecione um branch...
+settings.branch_protection=Proteção de Branch
+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.hooks=Webhooks
 settings.githooks=Hooks do Git
 settings.basic_settings=Configurações básicas
@@ -657,8 +679,8 @@ settings.external_wiki_url_desc=Os visitantes serão redirecionados para a URL a
 settings.issues_desc=Habilitar issue tracker
 settings.use_internal_issue_tracker=Usar o issue tracker nativo
 settings.use_external_issue_tracker=Usar issue tracker externo
-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 do Issue Tracker Externo
+settings.external_tracker_url_desc=Visitantes serão redirecionados ao URL quando clicarem na aba.
 settings.tracker_url_format=Formato de URL do issue tracker externo
 settings.tracker_issue_style=Estilo de nome de issue tracker externo:
 settings.tracker_issue_style.numeric=Numérico
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Alfanumérico
 settings.tracker_url_format_desc=Você pode usar o espaço reservado <code>{user} {repo} {index}</code> para o nome do usuário, índice de nome e a questão do repositório.
 settings.pulls_desc=Habilitar Pull Requests para aceitar contribuições públicas
 settings.danger_zone=Zona de perigo
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=O novo dono já tem um repositório com o mesmo nome. Por favor, escolha outro nome.
 settings.convert=Converter para repositório tradicional
 settings.convert_desc=Você pode converter este espelho em um repositório tradicional. Esta ação não pode ser revertida.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Este usuário não terá mais acesso de cola
 settings.remove_collaborator_success=O colaborador foi removido.
 settings.search_user_placeholder=Pesquisar usuário...
 settings.org_not_allowed_to_be_collaborator=Organização não tem permissão para ser adicionada como um colaborador.
-settings.user_is_org_member=O usuário é um membro da organização que não pode ser adicionado como um colaborador.
 settings.add_webhook=Adicionar Webhook
 settings.hooks_desc=Hooks da web ou Webhooks permitem serviços externos serem notificados quando certos eventos acontecem no Gogs. Quando acontecem os eventos especificados, enviaremos uma solicitação POST para cada uma das URLs que você fornecer. Saiba mais no nosso <a target="_blank" href="%s"> Guia de Webhooks</a>.
 settings.webhook_deletion=Deletar Webhook
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Enviaremos uma solicitação <code>POST</code> para o
 settings.payload_url=URL de Payload
 settings.content_type=Tipo de conteúdo
 settings.secret=Secreto
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Nome de usuário
 settings.slack_icon_url=URL do ícone
 settings.slack_color=Cor
@@ -745,10 +768,12 @@ settings.delete_webhook=Excluir Webhook
 settings.recent_deliveries=Entregas Recentes
 settings.hook_type=Tipo de Hook
 settings.add_slack_hook_desc=Adicionar <a href="%s">Slack</a> de integração para o seu repositório.
+settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
 settings.slack_token=Token
 settings.slack_domain=Domínio
 settings.slack_channel=Canal
 settings.deploy_keys=Chaves de Deploy
+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=Nova chave
 settings.deploy_key_desc=Chave de Deploy só tem acesso somente leitura. Não é igual as chaves SSH de conta pessoal.
 settings.no_deploy_keys=Você ainda não adicionou nenhuma chave de Deploy.
@@ -827,6 +852,7 @@ team_permission_desc=Que nível de permissão esta equipe deve ter?

 form.name_reserved=O nome de organização '%s' não pode ser usado.
 form.name_pattern_not_allowed=Não é permitido usar o padrão '%s' para o nome de organização.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Configurações
 settings.options=Opções
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Fazer coleta de lixo nos repositórios
 dashboard.git_gc_repos_success=Em todos repositórios, a coleta de lixo foi realizada com sucesso.
 dashboard.resync_all_sshkeys=Reescrever o arquivo '.ssh/authorized_keys' (atenção: chaves que não sejam do Gogs serão perdidas)
 dashboard.resync_all_sshkeys_success=Todas as chaves públicas foram reescritas com sucesso.
-dashboard.resync_all_update_hooks=Reescrever todos os hooks de atualização dos repositórios (necessário quando o caminho de configuração customizado é alterado)
-dashboard.resync_all_update_hooks_success=Os hooks de atualização de todos os repositórios foram reescritos com sucesso.
+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.reinit_missing_repos=Reinicializar todos os registros de repositório que perderam os arquivos do Git
 dashboard.reinit_missing_repos_success=Todos os repositórios que perderam arquivos do Git foram reinicializados com sucesso.

@@ -1040,7 +1066,7 @@ auths.delete_auth_title=Exclusão da autenticação
 auths.delete_auth_desc=Esta autenticação esta prestes a ser excluída, deseja continuar?
 auths.still_in_used=Esta autenticação ainda é usada por alguns usuários. Por favor remova ou converta esses usuários para outro tipo de login primeiro.
 auths.deletion_success=Autenticação excluída com sucesso!
-auths.login_source_exist=Login source '%s' already exists.
+auths.login_source_exist=A fonte de login '%s" já existe.

 config.server_config=Configuração do servidor
 config.app_name=Nome do aplicativo
@@ -1051,11 +1077,9 @@ config.offline_mode=Modo Offline
 config.disable_router_log=Desabilitar o Log do router
 config.run_user=Usuário de execução
 config.run_mode=Modo de execução
-config.git_version=Git Version
-config.repo_root_path=Caminho raiz do repositório
+config.git_version=Versão do Git
 config.static_file_root_path=Caminho raiz para arquivo estático
 config.log_file_root_path=Caminho raiz para arquivo de log
-config.script_type=Tipo de script
 config.reverse_auth_user=Usuário de autenticação reversa

 config.ssh_config=Configuração de SSH
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Caminho do keygen ('ssh-keygen')
 config.ssh_minimum_key_size_check=Verificar tamanho mínimo da chave
 config.ssh_minimum_key_sizes=Tamanhos mínimos da chave

+config.repo_config=Repository Configuration
+config.repo_root_path=Caminho raiz do repositório
+config.script_type=Tipo de script
+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.db_config=Configuração do banco de dados
 config.db_type=Tipo
 config.db_host=Host
--- a/conf/locale/locale_ru-RU.ini
+++ b/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 требует MySQL, PostgreSQL, SQLite3 или TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Настройки базы данных
 db_type=Тип базы данных
 host=Хост
@@ -58,9 +58,8 @@ db_name=Имя базы данных
 db_helper=Для MySQL используйте тип таблиц InnoDB с кодировкой utf8_general_ci.
 ssl_mode=Режим SSL
 path=Путь
-sqlite_helper=Путь к файлу базы данных SQLite3 или TiDB. <br>Укажите абсолютный путь при запуске в качестве службы.
-err_empty_db_path=Путь к базе данных SQLite3 или TiDB не может быть пустым.
-err_invalid_tidb_name=Имя базы данных TiDB не может содержать символы "." и "-".
+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.
 no_admin_and_disable_registration=Вы не можете отключить регистрацию до создания учетной записи администратора.
 err_empty_admin_password=Пароль администратора не может быть пустым.

@@ -75,6 +74,8 @@ 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.
 http_port=Порт HTTP
 http_port_helper=Номер порта, который приложение будет слушать.
 app_url=URL приложения
@@ -397,7 +398,6 @@ migrate.failed=Миграция не удалась: %v

 mirror_from=зеркало из
 forked_from=ответвлено от
-fork_from_self=Вы не можете ответвить репозиторий, так как Вы уже его владелец!
 copy_link=Скопировать
 copy_link_success=Скопировано!
 copy_link_error=Нажмите ⌘-C или Ctrl-C для копирования
@@ -473,6 +473,7 @@ editor.add_subdir=Добавьте подкаталог...
 editor.unable_to_upload_files=Не удалось загрузить файлы в «%s» из-за ошибки: %v
 editor.upload_files_to_dir=Загрузить файлы '%s'

+commits.commit_history=Commit History
 commits.commits=Коммиты
 commits.search=Поиск коммитов
 commits.find=Найти
@@ -639,6 +640,27 @@ 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.hooks=Автоматическое обновление
 settings.githooks=Git хуки
 settings.basic_settings=Основные параметры
@@ -666,6 +688,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.new_owner_has_same_repo=У нового владельца уже есть хранилище с таким названием.
 settings.convert=Преобразовать в обычный репозиторий
 settings.convert_desc=Это зеркало можно преобразовать в обычный репозиторий. Это не может быть отменено.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Этот пользователь больш
 settings.remove_collaborator_success=Соавтор был удален.
 settings.search_user_placeholder=Поиск пользователя...
 settings.org_not_allowed_to_be_collaborator=Организации не могут быть добавлены как соавторы.
-settings.user_is_org_member=Пользователь является членом организации,  члены которой не могут быть добавлены в качестве соавтора.
 settings.add_webhook=Добавить Webhook
 settings.hooks_desc=Webhooks позволяют внешним службам получать уведомления при возникновении определенных событий на Gogs. При возникновении указанных событий мы отправим запрос POST на каждый заданный вами URL. Узнать больше можно в нашем <a target="_blank" href="%s">Руководстве по Webhooks</a>.
 settings.webhook_deletion=Удалить веб-хук
@@ -723,6 +745,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.slack_username=Имя пользователя
 settings.slack_icon_url=URL иконки
 settings.slack_color=Цвет
@@ -745,10 +768,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.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.add_deploy_key=Добавить ключ развертывания
 settings.deploy_key_desc=Ключи развёртывания доступны только для чтения. Это не то же самое что и SSH-ключи аккаунта.
 settings.no_deploy_keys=Вы не добавляли ключи развертывания.
@@ -827,6 +852,7 @@ team_permission_desc=Какой уровень разрешений должен

 form.name_reserved=Наименование организации  '%s' зарезервированно.
 form.name_pattern_not_allowed=Шаблон организации  '%s' не допускается.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Настройки
 settings.options=Опции
@@ -917,8 +943,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_update_hooks=Перезаписать все апдейт-хуки этого репозитория (необходимо, когда изменен путь до папки конфигураций)
-dashboard.resync_all_update_hooks_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.reinit_missing_repos=Реинициализировать все репозитории с утерянными Git файлами
 dashboard.reinit_missing_repos_success=Все репозитории с утерянными Git файлами успешно реинициализированы.

@@ -1052,10 +1078,8 @@ config.disable_router_log=Отключение журнала маршрутиз
 config.run_user=Запуск пользователем
 config.run_mode=Режим выполнения
 config.git_version=Git Version
-config.repo_root_path=Путь до корня репозитория
 config.static_file_root_path=Статичный путь до файла
 config.log_file_root_path=Путь до папки с логами
-config.script_type=Тип сценария
 config.reverse_auth_user=Заголовок с именем пользователя для авторизации на reverse proxy

 config.ssh_config=Конфигурация SSH
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Путь к генератору ключей ('ssh-keyge
 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.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.db_config=Конфигурация базы данных
 config.db_type=Тип
 config.db_host=Хост
--- a/conf/locale/locale_sr-SP.ini
+++ b/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-у је потребно MySQL, PostgreSQL, SQLite3 или TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Подешавања базе
 db_type=Тип базе података
 host=Хост
@@ -58,9 +58,8 @@ db_name=Име базе података
 db_helper=За MySQL користите тип табела InnoDB са кодирањем utf8_general_ci.
 ssl_mode=Режим SSL
 path=Пут
-sqlite_helper=Пут датотеке за базу података врсте SQLite3 или TiDB. <br>Унесите апсолутни пут када покренете као сервис.
-err_empty_db_path=Пут ка бази података SQLite3 или TiDB не може бити празно.
-err_invalid_tidb_name=Име базе података TiDB не може садржати симболе "." и "-".
+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.
 no_admin_and_disable_registration=Ви не можете онемогућити регистрацију до стварања налог администратора.
 err_empty_admin_password=Лозинка администратора не може бити празна.

@@ -75,6 +74,8 @@ 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.
 http_port=Порт HTTP
 http_port_helper=Број порта преко којој ће апликација слушати.
 app_url=URL адреса апликације
@@ -397,7 +398,6 @@ migrate.failed=Миграција није успела: %v

 mirror_from=огледало од
 forked_from=изданак од
-fork_from_self=Ви не можете да креирате огранак спремишта ако сте већ његов власник!
 copy_link=Копирај
 copy_link_success=Ископирано!
 copy_link_error=Кликните ⌘-C или Ctrl-C да копирате
@@ -473,6 +473,7 @@ editor.add_subdir=Додај поддиректоријуми...
 editor.unable_to_upload_files=Учитање датотеке '%s' није успело са грешкном: %v
 editor.upload_files_to_dir=Пошаљи датотеке на '%s'

+commits.commit_history=Commit History
 commits.commits=Комити
 commits.search=Претражи комите
 commits.find=Претражи
@@ -639,6 +640,27 @@ 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.hooks=Webhooks
 settings.githooks=Git хуки
 settings.basic_settings=Основна подешавања
@@ -666,6 +688,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.new_owner_has_same_repo=Нови власник већ има спремиште по истим називом. Молимо вас изаберите друго име.
 settings.convert=Претворити у обично спремиште
 settings.convert_desc=Можете претворити огледало у обично спремиште, али та операција не може се укинути.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Овај корисник неће имат
 settings.remove_collaborator_success=Сарадник је уклоњен.
 settings.search_user_placeholder=Претрага корисника...
 settings.org_not_allowed_to_be_collaborator=Неможе се додати организација као сарадник.
-settings.user_is_org_member=Корисник је члан организације и потом неможе бити додат као сарадник.
 settings.add_webhook=Додај Webhook
 settings.hooks_desc=Webhooks омогућавају спољашњим услугама да приме обавештења када се нешто одређено догоди на Gogs. Сазнајте више у овом <a target="_blank" href="%s">водичу за Webhooks</a>.
 settings.webhook_deletion=Уклони Webhook
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Послаћемо захтев <code>POST</code> на
 settings.payload_url=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.slack_username=Корисничко име
 settings.slack_icon_url=URL адреса иконице
 settings.slack_color=Боја
@@ -745,10 +768,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.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.add_deploy_key=Додај кључ за распоређивање
 settings.deploy_key_desc=Кључеви за распоређивање имају само приступ за читање. То није исто што и SSH кључеви.
 settings.no_deploy_keys=Нисте додали ниједан кључ за распоређивање.
@@ -827,6 +852,7 @@ team_permission_desc=Који ниво приступа треба имати о

 form.name_reserved=Име организације '%s' је резервирано.
 form.name_pattern_not_allowed=Шаблон имена '%s' није дозвољено.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Подешавања
 settings.options=Опције
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Изврши cакупљање смећа на спрем
 dashboard.git_gc_repos_success=Сва спремишта су успешно извршили cакупљање смећа.
 dashboard.resync_all_sshkeys=Препиши '.ssh/authorized_keys' (опрез: не Gogs тастери ће бити изгубљени)
 dashboard.resync_all_sshkeys_success=Сви јавни кључеви су успешно преписани.
-dashboard.resync_all_update_hooks=Препиши сва hook-а за ажурирање спремишта (потребно кад пут конфигурације је промењен)
-dashboard.resync_all_update_hooks_success=Сва hook-а за ажурирање спремишта су успешно промењена.
+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.reinit_missing_repos=Поново постави све податке са изгубљеним Git датотекама
 dashboard.reinit_missing_repos_success=Сви подаци са изгубљеним Git датотекама су успешно поново постављени.

@@ -1052,10 +1078,8 @@ config.disable_router_log=Онемогући журнал рутера
 config.run_user=Покретни корисник
 config.run_mode=Режим извршавања
 config.git_version=Git Version
-config.repo_root_path=Пут до корена спремишта
 config.static_file_root_path=Пут до статичке датотеке
 config.log_file_root_path=Пут до журнала
-config.script_type=Врста скрипта
 config.reverse_auth_user=Корисничко име при обрнуту аутентикацију

 config.ssh_config=SSH конфигурација
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Пут до генератор кључева ('ssh-keyge
 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.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.db_config=Конфигурација базе података
 config.db_type=Тип
 config.db_host=Хост
--- a/conf/locale/locale_sv-SE.ini
+++ b/conf/locale/locale_sv-SE.ini
@@ -48,7 +48,7 @@ cancel=Avbryt
 install=Installation
 title=Steg för att installera för första gången
 docker_helper=Om du kör Gogs inuti Docker, vänligen läs <a target="_blank" href="%s">Riktninjerna</a> nogrant innan du ändrar någonting på denna sida!
-requite_db_desc=Gogs kräver MySQL, PostgreSQL, SQLite3 eller TiDB.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Databasinställningar
 db_type=Databastyp
 host=Server
@@ -58,9 +58,8 @@ db_name=Databasens namn
 db_helper=Se till att i MySQL använda INNODB med teckenuppsättningen utf8_general_ci.
 ssl_mode=SSL-läge
 path=Filväg
-sqlite_helper=Sökvägen för SQLite3 eller TiDB databas. <br>Vänligen använd den absoluta sökvägen när du kör som en tjänst.
-err_empty_db_path=SQLite3 eller TiDB databassökvägen får inte vara tom.
-err_invalid_tidb_name=TiDB databasnamn tillåter inte tecknen "." och "-".
+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.
 no_admin_and_disable_registration=Du kan inte inaktivera registrering utan att skapa ett administratörskonto.
 err_empty_admin_password=Administratörslösenordet får ej vara tomt.

@@ -75,6 +74,8 @@ domain=Domän
 domain_helper=Detta påverkar SSH klonings webbadresser.
 ssh_port=SSH-port
 ssh_port_helper=Portnumret som din SSH-server brukar, lämna tomt för att inaktivera SSH-funktionaliteten.
+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.
 http_port=HTTP Port
 http_port_helper=Portnumret vilket applikationen kommer lyssnar på.
 app_url=Applikationsadressen
@@ -138,7 +139,7 @@ issues.in_your_repos=I dina utvecklingskataloger
 [explore]
 repos=Utvecklingskataloger
 users=Användare
-organizations=Organizations
+organizations=Organisationer
 search=Sök

 [auth]
@@ -338,8 +339,8 @@ access_token_deletion=Borttagning Av Personlig Åtkomsttoken
 access_token_deletion_desc=Borttagning av denna personliga åtkomsttoken kommer att ta bort all relaterad åtkomst för applikationer. Vill du fortsätta?
 delete_token_success=Personlig åtkomsttoken har tagits bort! Glöm inte bort att uppdatera din applikation också.

-orgs.none=You are not a member of any organizations.
-orgs.leave_title=Leave an organization
+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?

 delete_account=Radera ditt konto
@@ -397,7 +398,6 @@ migrate.failed=Migrering misslyckades: %v

 mirror_from=spegling av
 forked_from=forkad från
-fork_from_self=Du kan inte forka ett repo som du redan äger!
 copy_link=Kopiera
 copy_link_success=Kopierad!
 copy_link_error=Tryck på ⌘-C eller Ctrl-C för att kopiera
@@ -415,7 +415,7 @@ 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!

-files=Files
+files=Filer
 branch=Gren
 tree=Träd
 filter_branch_and_tag=Filtrera gren eller tagg
@@ -473,6 +473,7 @@ editor.add_subdir=Lägg till underkatalog...
 editor.unable_to_upload_files=Uppladdning av filen '%s' misslyckades med felet: %v
 editor.upload_files_to_dir=Ladda upp filer till '%s'

+commits.commit_history=Commit History
 commits.commits=Incheckningar
 commits.search=Sök bland incheckningar
 commits.find=Sök
@@ -587,7 +588,7 @@ pulls.cannot_auto_merge_desc=Denna pull-förfrågan kan inte sammanfogas automat
 pulls.cannot_auto_merge_helper=Vänligen sammanfoga manuellt för att lösa konflikter.
 pulls.merge_pull_request=Sammanfoga Pull-förfrågan
 pulls.open_unmerged_pull_exists=`Du kan inte utföra återöppningsoperationen eftersom det finns redan en öppen pull-förfrågan (#%d) från samma repo med samma sammanfogningsinformation som väntar på sammanfogning.`
-pulls.delete_branch=Delete Branch
+pulls.delete_branch=Ta bort gren
 pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.

 milestones.new=Ny milstolpe
@@ -639,6 +640,27 @@ settings.collaboration.admin=Adminstrera
 settings.collaboration.write=Skriva
 settings.collaboration.read=Läsa
 settings.collaboration.undefined=Odefinierad
+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.hooks=Webbhookar
 settings.githooks=Githookar
 settings.basic_settings=Basinställningar
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Alfanumerisk
 settings.tracker_url_format_desc=Du kan använda platshållaren <code>{user} {repo} {index}</code> för användarnamn, reponamn, och ärendenummer.
 settings.pulls_desc=Aktivera pullförfrågningar för att ta emot publika bidrag
 settings.danger_zone=Högrisksområde
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Den nya ägaren har redan ett repo med det namnet. Vänligen välj ett annat namn.
 settings.convert=Konvertera Till Vanligt Repo
 settings.convert_desc=Du kan konvertera denna spegling till ett vanligt förråd. Detta kan inte ångras.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Denna användare kommer förlora sin åtkoms
 settings.remove_collaborator_success=Deltagare har tagits bort.
 settings.search_user_placeholder=Sök användare...
 settings.org_not_allowed_to_be_collaborator=Organisationen kan inte läggas till som en deltagare.
-settings.user_is_org_member=Änvändaren är en organisationsmedlem som inte kan bli tillagd som deltagare.
 settings.add_webhook=Lägg Till Webbhook
 settings.hooks_desc=Webbhookar påminner mycket om vanliga HTTP POST-händelseutlösare. När något inträffar i Gogs, kommer vi att meddela måldatorn som du anger. Läs mera i <a target="_blank" href="%s">Webbhook Guide</a>.
 settings.webhook_deletion=Ta Bort Webbhook
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Gogs kommer skicka <code>POST</code>-anrop till webbad
 settings.payload_url=Adress till innehåll
 settings.content_type=Typ av innehåll
 settings.secret=Hemlighet
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Användarnamn
 settings.slack_icon_url=URL för ikon
 settings.slack_color=Färg
@@ -745,10 +768,12 @@ settings.delete_webhook=Tag bort webbkrok
 settings.recent_deliveries=Färska leveranser
 settings.hook_type=Kroktyp
 settings.add_slack_hook_desc=Lägg till <a href="%s">Slack</a>-integration till ditt förråd.
+settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
 settings.slack_token=Pollett
 settings.slack_domain=Domän
 settings.slack_channel=Kanal
 settings.deploy_keys=Driftsättningsnycklar
+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=Lägg till driftsättningsnyckel
 settings.deploy_key_desc=Driftsättningsnycklar har endast läsrättigheter. De är inte desamma som personliga SSH-kontonycklar.
 settings.no_deploy_keys=Du har inte lagt till några driftsättningsnycklar.
@@ -827,6 +852,7 @@ team_permission_desc=Vilka behörigheter ska denna grupp ha?

 form.name_reserved=Organisationsnamnet "%s" är reserverat.
 form.name_pattern_not_allowed=Organisationsnamnet '%s' är inte tillåtet.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Inställningar
 settings.options=Alternativ
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Do garbage collection on repositories
 dashboard.git_gc_repos_success=All repositories have done garbage collection successfully.
 dashboard.resync_all_sshkeys=Rewrite '.ssh/authorized_keys' file (caution: non-Gogs keys will be lost)
 dashboard.resync_all_sshkeys_success=All public keys have been rewritten successfully.
-dashboard.resync_all_update_hooks=Rewrite all update hook of repositories (needed when custom config path is changed)
-dashboard.resync_all_update_hooks_success=All repositories' update hook have been rewritten successfully.
+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.reinit_missing_repos=Reinitialize all repository records that lost Git files
 dashboard.reinit_missing_repos_success=All repository records that lost Git files have been reinitialized successfully.

@@ -1007,25 +1033,25 @@ auths.domain=Domän
 auths.host=Värd
 auths.port=Port
 auths.bind_dn=Bind DN
-auths.bind_password=Bind Password
+auths.bind_password=Bind lösenord
 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=Användarnamnsattribut
 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=Förnamnsattribut
+auths.attribute_surname=Efternamnsattribut
+auths.attribute_mail=E-postattribut
 auths.attributes_in_bind=Fetch attributes in Bind DN context
-auths.filter=User Filter
-auths.admin_filter=Admin Filter
+auths.filter=Användarfilter
+auths.admin_filter=Adminfilter
 auths.ms_ad_sa=Ms Ad SA
-auths.smtp_auth=SMTP Authentication Type
-auths.smtphost=SMTP Host
-auths.smtpport=SMTP Port
-auths.allowed_domains=Allowed Domains
+auths.smtp_auth=SMTP-autentiseringstyp
+auths.smtphost=SMTP-värd
+auths.smtpport=SMTP-port
+auths.allowed_domains=Tillåtna domäner
 auths.allowed_domains_helper=Leave it empty to not restrict any domains. Multiple domains should be separated by comma ','.
-auths.enable_tls=Enable TLS Encryption
+auths.enable_tls=Aktivera TLS-kryptering
 auths.skip_tls_verify=Skip TLS Verify
 auths.pam_service_name=PAM Service Name
 auths.enable_auto_register=Enable Auto Registration
@@ -1042,24 +1068,22 @@ auths.still_in_used=This authentication is still used by some users, please dele
 auths.deletion_success=Authentication has been deleted successfully!
 auths.login_source_exist=Login source '%s' already exists.

-config.server_config=Server Configuration
-config.app_name=Application Name
-config.app_ver=Application Version
-config.app_url=Application URL
-config.domain=Domain
-config.offline_mode=Offline Mode
+config.server_config=Server-konfiguration
+config.app_name=Applikationsnamn
+config.app_ver=Applikationsversion
+config.app_url=Applikations-URL
+config.domain=Domän
+config.offline_mode=Offline-läge
 config.disable_router_log=Disable Router Log
 config.run_user=Run User
 config.run_mode=Run Mode
 config.git_version=Git Version
-config.repo_root_path=Rotsökväg för utvecklingskatalog
 config.static_file_root_path=Static File Root Path
 config.log_file_root_path=Log File Root Path
-config.script_type=Script Type
 config.reverse_auth_user=Reverse Authentication User

-config.ssh_config=SSH Configuration
-config.ssh_enabled=Enabled
+config.ssh_config=SSH-konfiguration
+config.ssh_enabled=Aktiverad
 config.ssh_start_builtin_server=Start Builtin Server
 config.ssh_domain=Domän
 config.ssh_port=Port
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Sökväg för nyckelgenerator ('ssh-keygen')
 config.ssh_minimum_key_size_check=Kontroll av minsta tillåtna nyckelstorlek
 config.ssh_minimum_key_sizes=Minsta tillåtna nyckelstorlek

+config.repo_config=Repository Configuration
+config.repo_root_path=Rotsökväg för utvecklingskatalog
+config.script_type=Script-typ
+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.db_config=Databaskonfiguration
 config.db_type=Typ
 config.db_host=Värd
@@ -1126,22 +1160,22 @@ config.cookie_life_time=Livstid för kaka

 config.picture_config=Bildkonfiguration
 config.picture_service=Bildtjänst
-config.disable_gravatar=Disable Gravatar
+config.disable_gravatar=Inaktivera gravatar
 config.enable_federated_avatar=Enable Federated Avatars

-config.git_config=Git Configuration
+config.git_config=Git-konfiguration
 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_gc_args=GC-argument
 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.log_config=Log Configuration
+config.log_config=Logg-konfiguration
 config.log_mode=Loggningsläge

 monitor.cron=Cron-jobb
@@ -1158,10 +1192,10 @@ monitor.execute_time=Execution Time
 notices.system_notice_list=System Notices
 notices.view_detail_header=View Notice Detail
 notices.actions=Actions
-notices.select_all=Select All
-notices.deselect_all=Deselect All
+notices.select_all=Markera alla
+notices.deselect_all=Avmarkera alla
 notices.inverse_selection=Inverse Selection
-notices.delete_selected=Delete Selected
+notices.delete_selected=Ta bort markerade
 notices.delete_all=Delete All Notices
 notices.type=Typ
 notices.type_1=Repository
@@ -1210,5 +1244,5 @@ raw_minutes=minuter
 default_message=Drop files here or click to upload.
 invalid_input_type=You can't upload files of this type.
 file_too_big=File size ({{filesize}} MB) exceeds maximum size ({{maxFilesize}} MB).
-remove_file=Remove file
+remove_file=Ta bort fil

--- a/conf/locale/locale_tr-TR.ini
+++ b/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 MySQL, PostgreSQL, SQLite3 veya TiDB gerektirir.
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=Veritabanı Ayarları
 db_type=Veritabanı Türü
 host=Sunucu
@@ -58,9 +58,8 @@ db_name=Veritabanı Adı
 db_helper=Lütfen MySQL için INNODB motorunu utf8_general_ci karakter setiyle kullanın.
 ssl_mode=SSL Biçimi
 path=Yol
-sqlite_helper=SQLite3 veya TiDB veritabanının dosya yolu. <br>Lütfen servis olarak başlatırken mutlak yolu kullanın.
-err_empty_db_path=SQLite3 veya TiDB veritabanı yolu boş olamaz.
-err_invalid_tidb_name=TiDB veritabanı adında "." ve "-" karakterlerine izin verilmez.
+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.
 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.

@@ -75,6 +74,8 @@ 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_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.
 app_url=Uygulama Bağlantısı
@@ -397,7 +398,6 @@ migrate.failed=Göç başarısız: %v

 mirror_from=şunun yansıması
 forked_from=şundan çatallanmış
-fork_from_self=Sahibi olduğunuz bir depoyu çatallayamazsınız!
 copy_link=Kopyala
 copy_link_success=Kopyalandı!
 copy_link_error=Kopyalamak için ⌘-C veya Ctrl-C tuşlarına basın
@@ -473,6 +473,7 @@ 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'

+commits.commit_history=Commit History
 commits.commits=İşlemeler
 commits.search=İşleme Arama
 commits.find=Bul
@@ -499,7 +500,7 @@ issues.new_label=Yeni Etiket
 issues.new_label_placeholder=Etiket adı...
 issues.create_label=Etiket Oluştur
 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.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
@@ -639,6 +640,27 @@ settings.collaboration.admin=Yönetici
 settings.collaboration.write=Yaz
 settings.collaboration.read=Oku
 settings.collaboration.undefined=Belirsiz
+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.hooks=Web İstekleri
 settings.githooks=Git İstekleri
 settings.basic_settings=Temel Ayarlar
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Alfanumerik
 settings.tracker_url_format_desc=Kullanıcı adı, depo ismi ve hata indeksi için <code>{kullanıcı} {depo} {indeks}</code> tutucusunu kullanabilirsiniz.
 settings.pulls_desc=Herkese açık katkıları kabul etmek için değişiklik isteklerini etkinleştirin
 settings.danger_zone=Tehlike Alanı
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Yeni sahibin aynı isimde başka bir deposu var. Lütfen farklı bir isim seçin.
 settings.convert=Düzenli Depoya Dönüştür
 settings.convert_desc=Bu yansıyı düzenli bir depoya dönüştürebilirsiniz. Bu işlem geri alınamaz.
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=Kullanıcı, silme işleminden sonra bu depo
 settings.remove_collaborator_success=Katkıcı silindi.
 settings.search_user_placeholder=Kullanıcı ara...
 settings.org_not_allowed_to_be_collaborator=Organizasyon, bir katkıcı olarak eklenemez.
-settings.user_is_org_member=Kullanıcı organizasyon üyesi olduğu için katkıcı olarak eklenemez.
 settings.add_webhook=Web İsteği Ekle
 settings.hooks_desc=Web istekleri, HTTP POST olay tetikleyicileri gibidirler. Gogs'ta ne zaman bir şey olsa, hedef belirttiğiniz sunuculara bildirim yapabilecek duruma geliriz. Daha fazla bilgiyi <a target="_blank" href="%s">Web İstekleri Kılavuzu</a>'nda bulabilirsiniz.
 settings.webhook_deletion=Web İsteğini Sil
@@ -723,6 +745,7 @@ settings.add_webhook_desc=Gogs, meydana gelen olay ile birlikte belirttiğiniz b
 settings.payload_url=Yük Bağlantısı
 settings.content_type=İçerik Türü
 settings.secret=Gizli
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Kullanıcı Adı
 settings.slack_icon_url=Simge Bağlantısı
 settings.slack_color=Renk
@@ -745,10 +768,12 @@ settings.delete_webhook=Web İsteğini Sil
 settings.recent_deliveries=Son Dağıtımlar
 settings.hook_type=İstek Türü
 settings.add_slack_hook_desc=Deponuza <a href="%s">Slack</a> entegrasyonunu ekleyin.
+settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
 settings.slack_token=Erişim Anahtarı
 settings.slack_domain=Alan Adı
 settings.slack_channel=Kanal
 settings.deploy_keys=Dağıtım Anahtarları
+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=Dağıtım Anahtarı Ekle
 settings.deploy_key_desc=Dağıtım anahtarlarının yalnızca okuma izni vardır. Kişisel hesapların SSH anahtarlarıyla aynı değillerdir.
 settings.no_deploy_keys=Herhangi bir dağıtım anahtarı eklemediniz.
@@ -827,6 +852,7 @@ team_permission_desc=Bu takım, ne gibi bir izin seviyesine sahiptir?

 form.name_reserved=Organizasyon adı '%s' başka birisine ayrılmış.
 form.name_pattern_not_allowed=Organizasyon adı modeli '%s' geçersiz.
+form.team_name_reserved=Team name '%s' is reserved.

 settings=Ayarlar
 settings.options=Seçenekler
@@ -917,8 +943,8 @@ dashboard.git_gc_repos=Depolarda çöp toplama işlemini gerçekleştir
 dashboard.git_gc_repos_success=Tüm depolarda çöp toplama işlemi başarıyla gerçekleştirildi.
 dashboard.resync_all_sshkeys='.ssh/authorized_keys' dosyasını yeniden yaz (dikkat: Gogs'un olmayan anahtarlar silinecektir)
 dashboard.resync_all_sshkeys_success=Tüm genel anahtarlar başarıyla yeniden yazıldı.
-dashboard.resync_all_update_hooks=Tüm depoların güncel web isteklerini yeniden yaz (özel yapılandırma yolu değiştiğinde gerekir)
-dashboard.resync_all_update_hooks_success=Tüm depoların güncel web istekleri başarıyla yeniden yazıldı.
+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.reinit_missing_repos=Git dosyalarını kaybetmiş tüm depoları yeniden oluştur
 dashboard.reinit_missing_repos_success=Git dosyalarını kaybetmiş tüm depolar başarıyla yeniden oluşturuldu.

@@ -1052,10 +1078,8 @@ config.disable_router_log=Yönlendirici Log'larını Devre Dışı Bırak
 config.run_user=Çalıştırma Kullanıcısı
 config.run_mode=Çalıştırma Modu
 config.git_version=Git Version
-config.repo_root_path=Depo Kök Yolu
 config.static_file_root_path=Sabit Dosya Kök Yolu
 config.log_file_root_path=Log Dosyası Kök Yolu
-config.script_type=Betik Türü
 config.reverse_auth_user=Tersine Yetkilendirme Kullanıcısı

 config.ssh_config=SSH Yapılandırması
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=Keygen ('ssh-keygen') Yolu
 config.ssh_minimum_key_size_check=Minimum Anahtar Uzunluğu Kontrolü
 config.ssh_minimum_key_sizes=Minimum Anahtar Uzunlukları

+config.repo_config=Repository Configuration
+config.repo_root_path=Depo Kök Yolu
+config.script_type=Betik Türü
+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.db_config=Veritabanı Yapılandırması
 config.db_type=Türü
 config.db_host=Sunucu
--- a/conf/locale/locale_uk-UA.ini
+++ b/conf/locale/locale_uk-UA.ini
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -48,7 +48,7 @@ cancel=取消
 install=安装页面
 title=首次运行安装程序
 docker_helper=如果您正在使用 Docker 容器运行 Gogs，请务必先仔细阅读 <a target="_blank" href="%s">官方文档</a> 后再对本页面进行填写。
-requite_db_desc=Gogs 要求安装 MySQL、PostgreSQL、SQLite3 或 TiDB。
+requite_db_desc=Gogs 要求安装 MySQL、PostgreSQL、SQLite3、MSSQL 或 TiDB。
 db_title=数据库设置
 db_type=数据库类型
 host=数据库主机
@@ -58,9 +58,8 @@ db_name=数据库名称
 db_helper=如果您使用 MySQL，请使用 INNODB 引擎以及 utf8_general_ci 字符集。
 ssl_mode=SSL 模式
 path=数据库文件路径
-sqlite_helper=SQLite3 或 TiDB 数据库文件路径。<br>作为服务启动时，请使用绝对路径。
-err_empty_db_path=SQLite3 或 TiDB 的数据库路径不能为空。
-err_invalid_tidb_name=TiDB 数据库名称不允许包含字符 "." 或 "-" 。
+sqlite_helper=SQLite3 数据库文件路径。<br>作为服务启动时，请使用绝对路径。
+err_empty_db_path=SQLite 数据库文件路径不能为空。
 no_admin_and_disable_registration=您不能够在未创建管理员用户的情况下禁止注册。
 err_empty_admin_password=管理员密码不能为空。

@@ -75,6 +74,8 @@ domain=域名
 domain_helper=该设置影响 SSH 克隆地址。
 ssh_port=SSH 端口号
 ssh_port_helper=SSH 服务器的监听端口号，留空表示禁用 SSH 功能。
+use_builtin_ssh_server=使用内置 SSH 服务器
+use_builtin_ssh_server_popup=启动内置 SSH 服务器专门用于 Git 操作可以和系统 SSH 守护程序进行隔离。
 http_port=HTTP 端口号
 http_port_helper=应用监听的端口号
 app_url=应用 URL
@@ -397,7 +398,6 @@ migrate.failed=迁移失败：%v

 mirror_from=镜像自地址
 forked_from=派生自
-fork_from_self=无法派生已经拥有的仓库！
 copy_link=复制链接
 copy_link_success=复制成功！
 copy_link_error=请按下 ⌘-C 或 Ctrl-C 复制
@@ -473,6 +473,7 @@ editor.add_subdir=添加子目录...
 editor.unable_to_upload_files=上传文件至 '%s' 时发生错误：%v
 editor.upload_files_to_dir=上传文件至 '%s'

+commits.commit_history=提交历史
 commits.commits=次代码提交
 commits.search=搜索提交历史
 commits.find=查找
@@ -639,6 +640,27 @@ settings.collaboration.admin=管理权限
 settings.collaboration.write=可写权限
 settings.collaboration.read=可读权限
 settings.collaboration.undefined=未定义
+settings.branches=管理分支
+settings.default_branch=默认分支
+settings.default_branch_desc=默认分支是被用于代码提交、合并请求和在线编辑的基准分支。
+settings.update=更新
+settings.update_default_branch_success=仓库默认分支更新成功！
+settings.protected_branches=保护分支
+settings.protected_branches_desc=保护分支不被强制推送、意外删除和限制代码提交白名单。
+settings.choose_a_branch=选择一个分支...
+settings.branch_protection=分支保护
+settings.branch_protection_desc=请选择应用于 <b>%s</b> 分支的保护选项。
+settings.protect_this_branch=启用分支保护
+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_users=允许推送到此分支的用户
+settings.protect_whitelist_search_users=搜索用户
+settings.protect_whitelist_teams=允许其成员推送到此分支的团队
+settings.protect_whitelist_search_teams=搜索团队
+settings.update_protect_branch_success=此分支的保护选项更新成功！
 settings.hooks=管理 Web 钩子
 settings.githooks=管理 Git 钩子
 settings.basic_settings=基本设置
@@ -646,7 +668,7 @@ settings.mirror_settings=镜像设置
 settings.sync_mirror=立即同步
 settings.mirror_sync_in_progress=镜像同步请求已经生效，请稍后刷新页面。
 settings.site=官方网站
-settings.update_settings=更新仓库设置
+settings.update_settings=更新设置
 settings.change_reponame_prompt=该操作将会影响到所有与该仓库有关的链接
 settings.advanced_settings=高级设置
 settings.wiki_desc=启用 Wiki 系统
@@ -666,6 +688,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=您不能派生仓库到其当前的所有者。
 settings.new_owner_has_same_repo=新的仓库拥有者已经存在同名仓库！
 settings.convert=转换为普通仓库
 settings.convert_desc=您可以将该镜像仓库转换为普通仓库，且此操作不可逆。
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=此用户被删除后将不再拥有相关
 settings.remove_collaborator_success=被操作的协作者已经被收回权限！
 settings.search_user_placeholder=搜索用户...
 settings.org_not_allowed_to_be_collaborator=组织不允许被添加为仓库协作者！
-settings.user_is_org_member=被操作的用户是组织成员，因此无法添加为协作者！
 settings.add_webhook=添加 Web 钩子
 settings.hooks_desc=Web 钩子允许您设定在 Gogs 上发生指定事件时对指定 URL 发送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文档</a> 获取更多信息。
 settings.webhook_deletion=删除 Web 钩子
@@ -723,6 +745,7 @@ settings.add_webhook_desc=我们会通过 <code>POST</code> 请求将订阅事
 settings.payload_url=推送地址
 settings.content_type=数据格式
 settings.secret=密钥文本
+settings.secret_desc=密钥文本将被用于计算推送内容的 SHA256 HMAC 哈希值，并设置为 <code>X-Gogs-Signature</code> 请求头的值。
 settings.slack_username=服务名称
 settings.slack_icon_url=图标 URL
 settings.slack_color=颜色代码
@@ -745,10 +768,12 @@ settings.delete_webhook=删除 Web 钩子
 settings.recent_deliveries=最近推送记录
 settings.hook_type=钩子类型
 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=频道
 settings.deploy_keys=管理部署密钥
+settings.deploy_keys_helper=<b>常识错误！</b>如果您想要添加的是个人公钥，请将它们添加到您的 <a href="%s%s"> 用户设置</a>。
 settings.add_deploy_key=添加部署密钥
 settings.deploy_key_desc=部署密钥仅具有只读权限，它在功能上和个人用户的公开密钥有本质区别。
 settings.no_deploy_keys=您还没有添加任何部署密钥。
@@ -827,6 +852,7 @@ team_permission_desc=请选择该团队所具有的权限等级：

 form.name_reserved=组织名称 '%s' 是被保留的。
 form.name_pattern_not_allowed=组织名称不允许 '%s' 的格式。
+form.team_name_reserved=团队名称 '%s' 是被保留的。

 settings=组织设置
 settings.options=基本设置
@@ -917,8 +943,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_update_hooks=重新生成所有仓库的 Update 钩子（用于自定义配置文件被修改）
-dashboard.resync_all_update_hooks_success=所有仓库的 Update 钩子重新生成成功！
+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 文件的仓库重新初始化成功！

@@ -1052,10 +1078,8 @@ config.disable_router_log=关闭路由日志
 config.run_user=运行用户
 config.run_mode=运行模式
 config.git_version=Git 版本
-config.repo_root_path=仓库根目录
 config.static_file_root_path=静态文件根目录
 config.log_file_root_path=日志文件根目录
-config.script_type=脚本类型
 config.reverse_auth_user=反向代理认证

 config.ssh_config=SSH 配置
@@ -1070,6 +1094,16 @@ config.ssh_keygen_path=密钥生成器（'ssh-keygen'）路径
 config.ssh_minimum_key_size_check=密钥最小长度检查
 config.ssh_minimum_key_sizes=密钥最小长度限制

+config.repo_config=仓库配置
+config.repo_root_path=仓库根目录
+config.script_type=脚本类型
+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=数据库类型
 config.db_host=主机地址
--- a/conf/locale/locale_zh-HK.ini
+++ b/conf/locale/locale_zh-HK.ini
@@ -48,7 +48,7 @@ cancel=取消
 install=安裝頁面
 title=首次安裝步驟
 docker_helper=如果您正在使用 Docker 容器運行 Gogs，請務必先仔細閱讀 <a target="_blank" href="%s">官方文檔</a> 後再對本頁面進行填寫。
-requite_db_desc=Gogs 要求安裝 MySQL、PostgreSQL、SQLite3 或 TiDB。
+requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
 db_title=數據庫設置
 db_type=資料庫類型
 host=主機
@@ -58,9 +58,8 @@ db_name=資料庫名稱
 db_helper=如果您使用 MySQL，請使用 INNODB 引擎以及 utf8_general_ci 字符集。
 ssl_mode=SSL 模式
 path=數據庫文件路徑
-sqlite_helper=SQLite3 或 TiDB 資料庫檔案路徑。<br>作為以服務執行時，請使用絕對路徑。
-err_empty_db_path=SQLite3 或 TiDB 的數據庫路徑不能為空。
-err_invalid_tidb_name=TiDB 數據庫名稱不允許包含字符 "." 或 "-" 。
+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.
 no_admin_and_disable_registration=您不能夠在未創建管理員用戶的情況下禁止註冊。
 err_empty_admin_password=管理員密碼不能為空。

@@ -75,6 +74,8 @@ domain=域名
 domain_helper=該設置影響 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.
 http_port=HTTP 端口號
 http_port_helper=應用監聽的端口號
 app_url=應用程式網址
@@ -397,7 +398,6 @@ migrate.failed=遷移失敗：%v

 mirror_from=镜像来自
 forked_from=派生自
-fork_from_self=無法派生已經擁有的倉庫！
 copy_link=複製連結
 copy_link_success=複製成功！
 copy_link_error=請按下 ⌘-C 或 Ctrl-C 複製
@@ -473,6 +473,7 @@ 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'

+commits.commit_history=Commit History
 commits.commits=次代碼提交
 commits.search=搜索提交歷史
 commits.find=查找
@@ -499,7 +500,7 @@ 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.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
@@ -639,6 +640,27 @@ settings.collaboration.admin=Admin
 settings.collaboration.write=Write
 settings.collaboration.read=Read
 settings.collaboration.undefined=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.hooks=管理 Web 鉤子
 settings.githooks=管理 Git 鉤子
 settings.basic_settings=基本設置
@@ -666,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=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.new_owner_has_same_repo=新的倉庫擁有者已經存在同名倉庫！
 settings.convert=轉換為正規倉庫
 settings.convert_desc=您可以將此鏡像轉成正規倉庫。此動做不可逆。
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=This user will no longer have collaboration
 settings.remove_collaborator_success=被操作的協作者已經被收回權限！
 settings.search_user_placeholder=搜索用戶...
 settings.org_not_allowed_to_be_collaborator=Organization is not allowed to be added as a collaborator.
-settings.user_is_org_member=被操作的用戶是組織成員，因此無法添加為協作者！
 settings.add_webhook=添加 Web 鉤子
 settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文檔</a> 獲取更多信息。
 settings.webhook_deletion=刪除 Web 鉤子
@@ -723,6 +745,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.slack_username=服務名稱
 settings.slack_icon_url=圖標 URL
 settings.slack_color=顏色代碼
@@ -745,10 +768,12 @@ settings.delete_webhook=刪除 Web 鉤子
 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.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.add_deploy_key=添加部署密鑰
 settings.deploy_key_desc=部署密鑰僅具有隻讀權限，它在功能上和個人用戶的公開密鑰有本質區別。
 settings.no_deploy_keys=您還沒有添加任何部署密鑰。
@@ -827,6 +852,7 @@ team_permission_desc=請選擇該團隊所具有的權限等級：

 form.name_reserved=組織名稱 '%s' 是被保留的。
 form.name_pattern_not_allowed=組織名稱不允許 '%s' 的格式。
+form.team_name_reserved=Team name '%s' is reserved.

 settings=組織設置
 settings.options=基本設置
@@ -917,8 +943,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_update_hooks=重新生成所有倉庫的 Update 鈎子（用於被修改的自定義配置文件）
-dashboard.resync_all_update_hooks_success=已成功重新生成所有倉庫的 Update 鈎子！
+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.reinit_missing_repos=Reinitialize all repository records that lost Git files
 dashboard.reinit_missing_repos_success=All repository records that lost Git files have been reinitialized successfully.

@@ -1052,10 +1078,8 @@ config.disable_router_log=關閉路由日志
 config.run_user=執行用戶
 config.run_mode=執行模式
 config.git_version=Git Version
-config.repo_root_path=倉庫根目錄
 config.static_file_root_path=靜態文件根目錄
 config.log_file_root_path=日志文件根目錄
-config.script_type=腳本類型
 config.reverse_auth_user=反向代理認證

 config.ssh_config=SSH 配置
@@ -1070,6 +1094,16 @@ 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.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.db_config=數據庫配置
 config.db_type=數據庫類型
 config.db_host=主機地址
--- a/conf/locale/locale_zh-TW.ini
+++ b/conf/locale/locale_zh-TW.ini
@@ -48,8 +48,8 @@ cancel=取消
 install=安裝頁面
 title=首次安裝步驟
 docker_helper=如果您正在使用 Docker 容器運行 Gogs，請務必先仔細閱讀 <a target="_blank" href="%s">官方文檔</a> 後再對本頁面進行填寫。
-requite_db_desc=Gogs 要求安裝 MySQL、PostgreSQL、SQLite3 或 TiDB。
-db_title=數據庫設置
+requite_db_desc=Gogs 需要安裝 MySQL、PostgreSQL、SQLite3、MSSQL 或 TiDB 其中一項。
+db_title=資料庫設定
 db_type=資料庫類型
 host=主機
 user=帳號
@@ -57,10 +57,9 @@ password=密碼
 db_name=資料庫名稱
 db_helper=如果您使用 MySQL，請使用 INNODB 引擎以及 utf8_general_ci 字符集。
 ssl_mode=SSL 模式
-path=數據庫文件路徑
-sqlite_helper=SQLite3 或 TiDB 資料庫檔案路徑。<br>作為以服務執行時，請使用絕對路徑。
-err_empty_db_path=SQLite3 或 TiDB 的數據庫路徑不能為空。
-err_invalid_tidb_name=TiDB 數據庫名稱不允許包含字符 "." 或 "-" 。
+path=路徑
+sqlite_helper=SQLite3 資料庫的檔案路徑。<br>請務必在啟動服務時使用絕對路徑。
+err_empty_db_path=SQLite3 資料庫路徑不可以為空。
 no_admin_and_disable_registration=您不能夠在未創建管理員用戶的情況下禁止註冊。
 err_empty_admin_password=管理員密碼不能為空。

@@ -75,6 +74,8 @@ domain=域名
 domain_helper=該設置影響 SSH 複製地址。
 ssh_port=SSH 埠
 ssh_port_helper=您的 SSH 服務正在使用此埠號，若要禁用SSH 功能請保持欄位空白。
+use_builtin_ssh_server=使用內建的 SSH 伺服器
+use_builtin_ssh_server_popup=啟用內建的 SSH 伺服器作為 Git 操作，使其與系統的 SSH 守護行程隔離 。
 http_port=HTTP 端口號
 http_port_helper=應用監聽的端口號
 app_url=應用程式網址
@@ -99,7 +100,7 @@ disable_gravatar_popup=禁用 Gravatar 和自定義源，僅使用由用戶上
 federated_avatar_lookup=開啟聯合頭像查詢
 federated_avatar_lookup_popup=開啟聯合頭像查詢並使用基於開放源碼的 libravatar 服務
 disable_registration=禁止用戶自主註冊
-disable_registration_popup=禁止用戶自主註冊功能，只有管理員可以添加帳號。
+disable_registration_popup=禁止用戶註冊功能，只有管理員可以添加帳號。
 enable_captcha=啟用驗證碼服務
 enable_captcha_popup=要求在用戶註冊時輸入驗證碼
 require_sign_in_view=啓用登錄訪問限制
@@ -113,11 +114,11 @@ admin_email=管理員郵箱
 install_gogs=立即安裝
 test_git_failed=無法識別 'git' 命令：%v
 sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s 下載官方構建版，而不是 gobuild 版本。
-invalid_db_setting=數據庫設置不正確：%v
+invalid_db_setting=資料庫設定不正確: %v
 invalid_repo_path=倉庫根目錄設置不正確：%v
 run_user_not_match=執行系統用戶非當前用戶：%s -> %s
-invalid_smtp_from=SMTP From field is not valid: %v
-save_config_failed=應用配置保存失敗：%v
+invalid_smtp_from=SMTP 寄件者欄位無效﹔%v
+save_config_failed=設定儲存失敗：%v
 invalid_admin_setting=管理員帳戶設置不正確：%v
 install_success=您好！我們很高興您選擇使用 Gogs，祝您使用愉快，代碼從此無 BUG！
 invalid_log_root_path=日誌根目錄無效: %v
@@ -397,7 +398,6 @@ migrate.failed=遷移失敗：%v

 mirror_from=镜像来自
 forked_from=派生自
-fork_from_self=無法派生已經擁有的倉庫！
 copy_link=複製連結
 copy_link_success=複製成功！
 copy_link_error=請按下 ⌘-C 或 Ctrl-C 複製
@@ -473,6 +473,7 @@ editor.add_subdir=新增子目錄...
 editor.unable_to_upload_files=上傳檔案失敗到 '%s', 錯誤訊息: %v
 editor.upload_files_to_dir=上傳檔案到 '%s'

+commits.commit_history=提交歷史
 commits.commits=次代碼提交
 commits.search=搜索提交歷史
 commits.find=查找
@@ -639,6 +640,27 @@ settings.collaboration.admin=管理權限
 settings.collaboration.write=可寫權限
 settings.collaboration.read=可讀權限
 settings.collaboration.undefined=未定義
+settings.branches=分支列表
+settings.default_branch=預設分支
+settings.default_branch_desc=預設分支是程式碼 commit、pull requests 及線上編輯的基準分支。
+settings.update=更新
+settings.update_default_branch_success=這個 repository 的預設分支更新成功！
+settings.protected_branches=保護分支
+settings.protected_branches_desc=保護分支不被強制 Push、意外刪除以及限制 Commit 者白名單
+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=請使用 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_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=此分支設置保護已更新成功!
 settings.hooks=管理 Web 鉤子
 settings.githooks=管理 Git 鉤子
 settings.basic_settings=基本設置
@@ -657,8 +679,8 @@ settings.external_wiki_url_desc=當分頁上按一下，訪客將會重新導到
 settings.issues_desc=啟用問題追蹤
 settings.use_internal_issue_tracker=使用內建輕量級問題追蹤
 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=外部Issue Tracker網址
+settings.external_tracker_url_desc=當訪客在分頁上按一下，他們將會重新導向到 URL。
 settings.tracker_url_format=外部問題管理系統的 URL 格式
 settings.tracker_issue_style=外部公單管理系統命名風格：
 settings.tracker_issue_style.numeric=數字
@@ -666,6 +688,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.new_owner_has_same_repo=新的倉庫擁有者已經存在同名倉庫！
 settings.convert=轉換為正規倉庫
 settings.convert_desc=您可以將此鏡像轉成正規倉庫。此動做不可逆。
@@ -700,7 +723,6 @@ settings.collaborator_deletion_desc=刪除後此使用者將不再有協同者
 settings.remove_collaborator_success=被操作的協作者已經被收回權限！
 settings.search_user_placeholder=搜索用戶...
 settings.org_not_allowed_to_be_collaborator=組織不允許被加為協同者。
-settings.user_is_org_member=被操作的用戶是組織成員，因此無法添加為協作者！
 settings.add_webhook=添加 Web 鉤子
 settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文檔</a> 獲取更多信息。
 settings.webhook_deletion=刪除 Web 鉤子
@@ -723,6 +745,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.slack_username=服務名稱
 settings.slack_icon_url=圖標 URL
 settings.slack_color=顏色代碼
@@ -745,10 +768,12 @@ settings.delete_webhook=刪除 Web 鉤子
 settings.recent_deliveries=最近推送記錄
 settings.hook_type=鉤子類型
 settings.add_slack_hook_desc=為您的倉庫增加 <a href="%s">Slack</a> 集成。
+settings.add_discord_hook_desc=Hook <a href="%s">Discord</a> 到你的 repository。
 settings.slack_token=令牌
 settings.slack_domain=域名
 settings.slack_channel=頻道
 settings.deploy_keys=管理部署密鑰
+settings.deploy_keys_helper=<b>噢不！</b> 如果要新增個人的公開金要，請到 <a href="%s%s">用戶設定</a> 新增。
 settings.add_deploy_key=添加部署密鑰
 settings.deploy_key_desc=部署密鑰僅具有隻讀權限，它在功能上和個人用戶的公開密鑰有本質區別。
 settings.no_deploy_keys=您還沒有添加任何部署密鑰。
@@ -827,6 +852,7 @@ team_permission_desc=請選擇該團隊所具有的權限等級：

 form.name_reserved=組織名稱 '%s' 是被保留的。
 form.name_pattern_not_allowed=組織名稱不允許 '%s' 的格式。
+form.team_name_reserved=團隊名稱 '%s' 已被保留。

 settings=組織設置
 settings.options=基本設置
@@ -901,7 +927,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> 個 Web 鉤子，<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> 個 Web 鉤子，<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=執行
@@ -917,8 +943,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_update_hooks=重新生成所有倉庫的 Update 鈎子（用於被修改的自定義配置文件）
-dashboard.resync_all_update_hooks_success=已成功重新生成所有倉庫的 Update 鈎子！
+dashboard.resync_all_hooks=重新同步所有 repository 的 pre-receive、update、post-receive hooks。
+dashboard.resync_all_hooks_success=所有 repository 的  pre-receive、update、post-receive hooks 皆已重新同步成功。
 dashboard.reinit_missing_repos=重新初始化所有遺失 Git 檔案的儲存庫記錄
 dashboard.reinit_missing_repos_success=所有遺失 Git 檔案的儲存庫已成功重新初始化。

@@ -1051,11 +1077,9 @@ config.offline_mode=離線模式
 config.disable_router_log=關閉路由日志
 config.run_user=執行用戶
 config.run_mode=執行模式
-config.git_version=Git Version
-config.repo_root_path=倉庫根目錄
+config.git_version=Git 版本
 config.static_file_root_path=靜態文件根目錄
 config.log_file_root_path=日志文件根目錄
-config.script_type=腳本類型
 config.reverse_auth_user=反向代理認證

 config.ssh_config=SSH 配置
@@ -1070,7 +1094,17 @@ config.ssh_keygen_path=金鑰產生 (' ssh-keygen ') 路徑
 config.ssh_minimum_key_size_check=金鑰最小大小檢查
 config.ssh_minimum_key_sizes=金鑰最小大小

-config.db_config=數據庫配置
+config.repo_config=Repository 設定
+config.repo_root_path=倉庫根目錄
+config.script_type=腳本類型
+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=同時Fetch Commit數量
+
+config.db_config=資料庫設定
 config.db_type=數據庫類型
 config.db_host=主機地址
 config.db_name=數據庫名稱
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,12 +1,12 @@
 # Docker for Gogs

-Visit [Docker Hub](https://hub.docker.com/r/gogs/) see all available images and tags.
+Visit [Docker Hub](https://hub.docker.com/r/gogs/) / [Docker Store](https://store.docker.com/community/images/gogs/gogs) see all available images and tags.

 ## Usage

 To keep your data out of Docker container, we do a volume (`/var/gogs` -> `/data`) here, and you can change it based on your situation.

-```
+```sh
 # Pull image from Docker Hub.
 $ docker pull gogs/gogs

@@ -36,11 +36,11 @@ Directory `/var/gogs` keeps Git repositories and Gogs data:
        |-- data
        |-- log

-### Volume with data container
+### Volume With Data Container

 If you're more comfortable with mounting data to a data container, the commands you execute at the first time will look like as follows:

-```
+```sh
 # Create data container
 docker run --name=gogs-data --entrypoint /bin/true gogs/gogs

@@ -48,9 +48,9 @@ docker run --name=gogs-data --entrypoint /bin/true gogs/gogs
 docker run --name=gogs --volumes-from gogs-data -p 10022:22 -p 10080:3000 gogs/gogs
 ```

-#### Using Docker 1.9 Volume command
+#### Using Docker 1.9 Volume Command

-```
+```sh
 # Create docker volume.
 $ docker volume create --name gogs-data

@@ -67,13 +67,13 @@ Most of settings are obvious and easy to understand, but there are some settings
 - **Repository Root Path**: keep it as default value `/home/git/gogs-repositories` because `start.sh` already made a symbolic link for you.
 - **Run User**: keep it as default value `git` because `start.sh` already setup a user with name `git`.
 - **Domain**: fill in with Docker container IP (e.g. `192.168.99.100`). But if you want to access your Gogs instance from a different physical machine, please fill in with the hostname or IP address of the Docker host machine.
- **SSH Port**: Use the exposed port from Docker container. For example, your SSH server listens on `22` inside Docker, but you expose it by `10022:22`, then use `10022` for this value. **Builtin SSH server is not recommended inside Docker Container**
- **HTTP Port**: Use port you want Gogs to listen on inside Docker container. For example, your Gogs listens on `3000` inside Docker, and you expose it by `10080:3000`, but you still use `3000` for this value.
+- **SSH Port**: Use the exposed port from Docker container. For example, your SSH server listens on `22` inside Docker, **but** you expose it by `10022:22`, then use `10022` for this value. **Builtin SSH server is not recommended inside Docker Container**
+- **HTTP Port**: Use port you want Gogs to listen on inside Docker container. For example, your Gogs listens on `3000` inside Docker, **and** you expose it by `10080:3000`, but you still use `3000` for this value.
 - **Application URL**: Use combination of **Domain** and **exposed HTTP Port** values (e.g. `http://192.168.99.100:10080/`).

 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:

@@ -109,3 +109,7 @@ Steps to upgrade Gogs with Docker:
 ## Known Issues

 - The docker container can not currently be build on Raspberry 1 (armv6l) as our base image `alpine` does not have a `go` package available for this platform.
+
+## Useful Links
+
+- [Share port 22 between Gogs inside Docker & the local system](http://www.ateijelo.com/blog/2016/07/09/share-port-22-between-docker-gogs-ssh-and-local-system)
--- a/docker/build-go.sh
+++ b/docker/build-go.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+# Build GO version as specified in Dockerfile
+
+set -x
+set -e
+
+# Components versions
+export GOLANG_VERSION="1.8"
+export GOLANG_SRC_URL="https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"
+export GOLANG_SRC_SHA256="406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596"
+
+
+# Install build tools
+apk add --no-cache --no-progress --virtual build-deps-go gcc musl-dev openssl go
+
+export GOROOT_BOOTSTRAP="$(go env GOROOT)"
+
+# Download Go
+wget -q "$GOLANG_SRC_URL" -O golang.tar.gz
+echo "$GOLANG_SRC_SHA256  golang.tar.gz" | sha256sum -c -
+tar -C /usr/local -xzf golang.tar.gz
+rm golang.tar.gz
+
+# Build
+cd /usr/local/go/src
+# see https://golang.org/issue/14851
+patch -p2 -i /app/gogs/build/docker/no-pic.patch
+./make.bash
+
+# Clean
+rm /app/gogs/build/docker/*.patch
+apk del build-deps-go
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -4,16 +4,18 @@ set -e

 # Set temp environment vars
 export GOPATH=/tmp/go
-export PATH=${PATH}:${GOPATH}/bin
+export PATH=/usr/local/go/bin:${PATH}:${GOPATH}/bin
 export GO15VENDOREXPERIMENT=1

 # Install build deps
-apk --no-cache --no-progress add --virtual build-deps build-base linux-pam-dev go
+apk --no-cache --no-progress add --virtual build-deps build-base linux-pam-dev

 # Build Gogs
 mkdir -p ${GOPATH}/src/github.com/gogits/
-ln -s /app/gogs/ ${GOPATH}/src/github.com/gogits/gogs
+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"

--- a/docker/finalize.sh
+++ b/docker/finalize.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Finalize the build
+
+set -x
+set -e
+
+# Move to final place
+mv /app/gogs/build/gogs /app/gogs/
+mv /app/gogs/build/templates /app/gogs/
+mv /app/gogs/build/public /app/gogs/
+mv /app/gogs/build/docker /app/gogs/
+
+# Final cleaning
+rm -rf /app/gogs/build
+rm /app/gogs/docker/build.sh
+rm /app/gogs/docker/build-go.sh
+rm /app/gogs/docker/finalize.sh
+rm /app/gogs/docker/nsswitch.conf
+rm /app/gogs/docker/README.md
+
+rm -rf /tmp/go
+rm -rf /usr/local/go
--- a/docker/no-pic.patch
+++ b/docker/no-pic.patch
@@ -0,0 +1,16 @@
+diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
+index 14f4fa9..5599307 100644
+--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
+@@ -1272,6 +1272,11 @@ func hostlink() {
+ 		argv = append(argv, peimporteddlls()...)
+ 	}
+ 
+	// The Go linker does not currently support building PIE
+	// executables when using the external linker. See:
+	// https://github.com/golang/go/issues/6940
+	argv = append(argv, "-fno-PIC")
+
+ 	if l.Debugvlog != 0 {
+ 		l.Logf("%5.2f host link:", obj.Cputime())
+ 		for _, v := range argv {
--- a/gogs.go
+++ b/gogs.go
@@ -4,7 +4,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.

-// Gogs (Go Git Service) is a painless self-hosted Git Service.
+// Gogs is a painless self-hosted Git Service.
 package main

 import (
@@ -16,7 +16,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )

-const APP_VER = "0.9.141.0211"
+const APP_VER = "0.10.1.0228"

 func init() {
 	setting.AppVer = APP_VER
@@ -25,12 +25,12 @@ func init() {
 func main() {
 	app := cli.NewApp()
 	app.Name = "Gogs"
-	app.Usage = "Go Git Service: a painless self-hosted Git service"
+	app.Usage = "A painless self-hosted Git service"
 	app.Version = APP_VER
 	app.Commands = []cli.Command{
 		cmd.CmdWeb,
-		cmd.CmdServ,
-		cmd.CmdUpdate,
+		cmd.Serv,
+		cmd.CmdHook,
 		cmd.CmdDump,
 		cmd.CmdCert,
 		cmd.CmdAdmin,
--- a/models/access.go
+++ b/models/access.go
@@ -57,41 +57,45 @@ type Access struct {
 	Mode   AccessMode
 }

-func accessLevel(e Engine, u *User, repo *Repository) (AccessMode, error) {
+func accessLevel(e Engine, userID int64, repo *Repository) (AccessMode, error) {
 	mode := ACCESS_MODE_NONE
+	// Everyone has read access to public repository
 	if !repo.IsPrivate {
 		mode = ACCESS_MODE_READ
 	}

-	if u == nil {
+	if userID <= 0 {
 		return mode, nil
 	}

-	if u.ID == repo.OwnerID {
+	if userID == repo.OwnerID {
 		return ACCESS_MODE_OWNER, nil
 	}

-	a := &Access{UserID: u.ID, RepoID: repo.ID}
-	if has, err := e.Get(a); !has || err != nil {
+	access := &Access{
+		UserID: userID,
+		RepoID: repo.ID,
+	}
+	if has, err := e.Get(access); !has || err != nil {
 		return mode, err
 	}
-	return a.Mode, nil
+	return access.Mode, nil
 }

 // AccessLevel returns the Access a user has to a repository. Will return NoneAccess if the
-// user does not have access. User can be nil!
-func AccessLevel(u *User, repo *Repository) (AccessMode, error) {
-	return accessLevel(x, u, repo)
+// user does not have access.
+func AccessLevel(userID int64, repo *Repository) (AccessMode, error) {
+	return accessLevel(x, userID, repo)
 }

-func hasAccess(e Engine, u *User, repo *Repository, testMode AccessMode) (bool, error) {
-	mode, err := accessLevel(e, u, repo)
-	return testMode <= mode, err
+func hasAccess(e Engine, userID int64, repo *Repository, testMode AccessMode) (bool, error) {
+	mode, err := accessLevel(e, userID, repo)
+	return mode >= testMode, err
 }

 // HasAccess returns true if someone has the request access level. User can be nil!
-func HasAccess(u *User, repo *Repository, testMode AccessMode) (bool, error) {
-	return hasAccess(x, u, repo, testMode)
+func HasAccess(userID int64, repo *Repository, testMode AccessMode) (bool, error) {
+	return hasAccess(x, userID, repo, testMode)
 }

 // GetRepositoryAccesses finds all repositories with their access mode where a user has access but does not own.
@@ -146,16 +150,8 @@ func maxAccessMode(modes ...AccessMode) AccessMode {

 // FIXME: do corss-comparison so reduce deletions and additions to the minimum?
 func (repo *Repository) refreshAccesses(e Engine, accessMap map[int64]AccessMode) (err error) {
-	minMode := ACCESS_MODE_READ
-	if !repo.IsPrivate {
-		minMode = ACCESS_MODE_WRITE
-	}
-
 	newAccesses := make([]Access, 0, len(accessMap))
 	for userID, mode := range accessMap {
-		if mode < minMode {
-			continue
-		}
 		newAccesses = append(newAccesses, Access{
 			UserID: userID,
 			RepoID: repo.ID,
@@ -233,7 +229,7 @@ func (repo *Repository) recalculateAccesses(e Engine) error {
 		return repo.recalculateTeamAccesses(e, 0)
 	}

-	accessMap := make(map[int64]AccessMode, 20)
+	accessMap := make(map[int64]AccessMode, 10)
 	if err := repo.refreshCollaboratorAccesses(e, accessMap); err != nil {
 		return fmt.Errorf("refreshCollaboratorAccesses: %v", err)
 	}
--- a/models/action.go
+++ b/models/action.go
@@ -335,7 +335,12 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
 			}
 			refMarked[issue.ID] = true

-			message := fmt.Sprintf(`<a href="%s/commit/%s">%s</a>`, repo.Link(), c.Sha1, c.Message)
+			msgLines := strings.Split(c.Message, "\n")
+			shortMsg := msgLines[0]
+			if len(msgLines) > 2 {
+				shortMsg += "..."
+			}
+			message := fmt.Sprintf(`<a href="%s/commit/%s">%s</a>`, repo.Link(), c.Sha1, shortMsg)
 			if err = CreateRefComment(doer, repo, issue, message, c.Sha1); err != nil {
 				return err
 			}
@@ -460,6 +465,7 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
 		opType = ACTION_PUSH_TAG
 		opts.Commits = &PushCommits{}
 	} else {
+		// TODO: detect branch deletion
 		// if not the first commit, set the compare URL.
 		if opts.OldCommitID == git.EMPTY_SHA {
 			isNewBranch = true
@@ -468,7 +474,7 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
 		}

 		if err = UpdateIssuesCommit(pusher, repo, opts.Commits.Commits); err != nil {
-			log.Error(4, "updateIssuesCommit: %v", err)
+			log.Error(2, "UpdateIssuesCommit: %v", err)
 		}
 	}

@@ -504,26 +510,30 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
 	apiRepo := repo.APIFormat(nil)
 	switch opType {
 	case ACTION_COMMIT_REPO: // Push
+		compareURL := setting.AppUrl + opts.Commits.CompareURL
+		if isNewBranch {
+			compareURL = ""
+			if err = PrepareWebhooks(repo, HOOK_EVENT_CREATE, &api.CreatePayload{
+				Ref:     refName,
+				RefType: "branch",
+				Repo:    apiRepo,
+				Sender:  apiPusher,
+			}); err != nil {
+				return fmt.Errorf("PrepareWebhooks (new branch): %v", err)
+			}
+		}
+
 		if err = PrepareWebhooks(repo, HOOK_EVENT_PUSH, &api.PushPayload{
 			Ref:        opts.RefFullName,
 			Before:     opts.OldCommitID,
 			After:      opts.NewCommitID,
-			CompareURL: setting.AppUrl + opts.Commits.CompareURL,
+			CompareURL: compareURL,
 			Commits:    opts.Commits.ToApiPayloadCommits(repo.HTMLURL()),
 			Repo:       apiRepo,
 			Pusher:     apiPusher,
 			Sender:     apiPusher,
 		}); err != nil {
-			return fmt.Errorf("PrepareWebhooks: %v", err)
-		}
-
-		if isNewBranch {
-			return PrepareWebhooks(repo, HOOK_EVENT_CREATE, &api.CreatePayload{
-				Ref:     refName,
-				RefType: "branch",
-				Repo:    apiRepo,
-				Sender:  apiPusher,
-			})
+			return fmt.Errorf("PrepareWebhooks (new commit): %v", err)
 		}

 	case ACTION_PUSH_TAG: // Create
--- a/models/admin.go
+++ b/models/admin.go
@@ -74,7 +74,7 @@ func CreateRepositoryNotice(desc string) error {
 // creates a system notice when error occurs.
 func RemoveAllWithNotice(title, path string) {
 	var err error
-	// workaround for Go not being able to remove read-only files/folders: https://github.com/golang/go/issues/9606
+	// LEGACY [Go 1.7]: workaround for Go not being able to remove read-only files/folders: https://github.com/golang/go/issues/9606
 	// this bug should be fixed on Go 1.7, so the workaround should be removed when Gogs don't support Go 1.6 anymore:
 	// https://github.com/golang/go/commit/2ffb3e5d905b5622204d199128dec06cefd57790
 	// Note: Windows complains when delete target does not exist, therefore we can skip deletion in such cases.
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -188,7 +188,7 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) tem
 type DiffFile struct {
 	Name               string
 	OldName            string
-	Index              int
+	Index              string // 40-byte SHA, Changed/New: new SHA; Deleted: old SHA
 	Addition, Deletion int
 	Type               DiffFileType
 	IsCreated          bool
@@ -331,7 +331,6 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*

 			curFile = &DiffFile{
 				Name:     a,
-				Index:    len(diff.Files) + 1,
 				Type:     DIFF_FILE_CHANGE,
 				Sections: make([]*DiffSection, 0, 10),
 			}
@@ -343,7 +342,8 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*
 			}
 			curFileLinesCount = 0

-			// Check file diff type and is submodule.
+			// Check file diff type and submodule.
+		CHECK_TYPE:
 			for {
 				line, err := input.ReadString('\n')
 				if err != nil {
@@ -358,22 +358,27 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*
 				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"):
-					curFile.Type = DIFF_FILE_CHANGE
+					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
-				}
-				if curFile.Type > 0 {
-					if strings.HasSuffix(line, " 160000\n") {
-						curFile.IsSubmodule = true
-					}
-					break
+					curFile.Index = b
+					break CHECK_TYPE
 				}
 			}
 		}
@@ -423,13 +428,13 @@ func GetDiffRange(repoPath, beforeCommitID, afterCommitID string, maxLines, maxL
 	if len(beforeCommitID) == 0 {
 		// First commit of repository.
 		if commit.ParentCount() == 0 {
-			cmd = exec.Command("git", "show", afterCommitID)
+			cmd = exec.Command("git", "show", "--full-index", afterCommitID)
 		} else {
 			c, _ := commit.Parent(0)
-			cmd = exec.Command("git", "diff", "-M", c.ID.String(), afterCommitID)
+			cmd = exec.Command("git", "diff", "--full-index", "-M", c.ID.String(), afterCommitID)
 		}
 	} else {
-		cmd = exec.Command("git", "diff", "-M", beforeCommitID, afterCommitID)
+		cmd = exec.Command("git", "diff", "--full-index", "-M", beforeCommitID, afterCommitID)
 	}
 	cmd.Dir = repoPath
 	cmd.Stderr = os.Stderr
--- a/models/issue.go
+++ b/models/issue.go
@@ -618,7 +618,7 @@ func newIssue(e *xorm.Session, opts NewIssueOptions) (err error) {
 		// Assume assignee is invalid and drop silently.
 		opts.Issue.AssigneeID = 0
 		if assignee != nil {
-			valid, err := hasAccess(e, assignee, opts.Repo, ACCESS_MODE_WRITE)
+			valid, err := hasAccess(e, assignee.ID, opts.Repo, ACCESS_MODE_READ)
 			if err != nil {
 				return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assignee.ID, opts.Repo.ID, err)
 			}
@@ -813,20 +813,20 @@ type IssuesOptions struct {
 	SortType    string
 }

-// Issues returns a list of issues by given conditions.
-func Issues(opts *IssuesOptions) ([]*Issue, error) {
+// buildIssuesQuery returns nil if it foresees there won't be any value returned.
+func buildIssuesQuery(opts *IssuesOptions) *xorm.Session {
+	sess := x.NewSession()
+
 	if opts.Page <= 0 {
 		opts.Page = 1
 	}

-	sess := x.Limit(setting.UI.IssuePagingNum, (opts.Page-1)*setting.UI.IssuePagingNum)
-
 	if opts.RepoID > 0 {
 		sess.Where("issue.repo_id=?", opts.RepoID).And("issue.is_closed=?", opts.IsClosed)
 	} else if opts.RepoIDs != nil {
 		// In case repository IDs are provided but actually no repository has issue.
 		if len(opts.RepoIDs) == 0 {
-			return make([]*Issue, 0), nil
+			return nil
 		}
 		sess.In("issue.repo_id", base.Int64sToStrings(opts.RepoIDs)).And("issue.is_closed=?", opts.IsClosed)
 	} else {
@@ -877,6 +877,28 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
 		}
 	}

+	return sess
+}
+
+// IssuesCount returns the number of issues by given conditions.
+func IssuesCount(opts *IssuesOptions) (int64, error) {
+	sess := buildIssuesQuery(opts)
+	if sess == nil {
+		return 0, nil
+	}
+
+	return sess.Count(&Issue{})
+}
+
+// Issues returns a list of issues by given conditions.
+func Issues(opts *IssuesOptions) ([]*Issue, error) {
+	sess := buildIssuesQuery(opts)
+	if sess == nil {
+		return make([]*Issue, 0), nil
+	}
+
+	sess.Limit(setting.UI.IssuePagingNum, (opts.Page-1)*setting.UI.IssuePagingNum)
+
 	issues := make([]*Issue, 0, setting.UI.IssuePagingNum)
 	if err := sess.Find(&issues); err != nil {
 		return nil, fmt.Errorf("Find: %v", err)
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -5,27 +5,18 @@
 package migrations

 import (
-	"bytes"
-	"encoding/json"
 	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
 	"strings"
 	"time"

 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
-	gouuid "github.com/satori/go.uuid"
 	log "gopkg.in/clog.v1"
-	"gopkg.in/ini.v1"

 	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/setting"
 )

-const _MIN_DB_VER = 4
+const _MIN_DB_VER = 10

 type Migration interface {
 	Description() string
@@ -59,19 +50,16 @@ type Version struct {
 // If you want to "retire" a migration, remove it from the top of the list and
 // update _MIN_VER_DB accordingly
 var migrations = []Migration{
-	// v0 -> v4: before 0.6.0 -> 0.7.33
-	NewMigration("fix locale file load panic", fixLocaleFileLoadPanic),                           // V4 -> V5:v0.6.0
-	NewMigration("trim action compare URL prefix", trimCommitActionAppUrlPrefix),                 // V5 -> V6:v0.6.3
-	NewMigration("generate issue-label from issue", issueToIssueLabel),                           // V6 -> V7:v0.6.4
-	NewMigration("refactor attachment table", attachmentRefactor),                                // V7 -> V8:v0.6.4
-	NewMigration("rename pull request fields", renamePullRequestFields),                          // V8 -> V9:v0.6.16
-	NewMigration("clean up migrate repo info", cleanUpMigrateRepoInfo),                           // V9 -> V10:v0.6.20
+	// v0 -> v4 : before 0.6.0 -> last support 0.7.33
+	// v4 -> v10: before 0.7.0 -> last support 0.9.141
 	NewMigration("generate rands and salt for organizations", generateOrgRandsAndSalt),           // V10 -> V11:v0.8.5
 	NewMigration("convert date to unix timestamp", convertDateToUnix),                            // V11 -> V12:v0.9.2
 	NewMigration("convert LDAP UseSSL option to SecurityProtocol", ldapUseSSLToSecurityProtocol), // V12 -> V13:v0.9.37

 	// v13 -> v14:v0.9.87
 	NewMigration("set comment updated with created", setCommentUpdatedWithCreated),
+	// v14 -> v15:v0.9.147
+	NewMigration("generate and migrate Git hooks", generateAndMigrateGitHooks),
 }

 // Migrate database to current version
@@ -87,6 +75,7 @@ func Migrate(x *xorm.Engine) error {
 	} else if !has {
 		// If the version record does not exist we think
 		// it is a fresh installation and we can skip all migrations.
+		currentVersion.ID = 0
 		currentVersion.Version = int64(_MIN_DB_VER + len(migrations))

 		if _, err = x.InsertOne(currentVersion); err != nil {
@@ -96,8 +85,28 @@ func Migrate(x *xorm.Engine) error {

 	v := currentVersion.Version
 	if _MIN_DB_VER > v {
-		log.Fatal(4, `Gogs no longer supports auto-migration from your previously installed version. 
-Please try to upgrade to a lower version (>= v0.6.0) first, then upgrade to current version.`)
+		log.Fatal(0, `
+Hi there, thank you for using Gogs for so long!
+However, Gogs has stopped supporting auto-migration from your previously installed version.
+But the good news is, it's very easy to fix this problem!
+You can migrate your older database using a previous release, then you can upgrade to the newest version.
+
+Please save following instructions to somewhere and start working:
+
+- If you were using below 0.6.0 (e.g. 0.5.x), download last supported archive from following link:
+	https://github.com/gogits/gogs/releases/tag/v0.7.33
+- If you were using below 0.7.0 (e.g. 0.6.x), download last supported archive from following link:
+	https://github.com/gogits/gogs/releases/tag/v0.9.141
+
+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. 
+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!
+
+In case you're stilling getting this notice, go through instructions again until it disappears.`)
 		return nil
 	}

@@ -127,311 +136,6 @@ func sessionRelease(sess *xorm.Session) {
 	sess.Close()
 }

-func fixLocaleFileLoadPanic(_ *xorm.Engine) error {
-	cfg, err := ini.Load(setting.CustomConf)
-	if err != nil {
-		return fmt.Errorf("load custom config: %v", err)
-	}
-
-	cfg.DeleteSection("i18n")
-	if err = cfg.SaveTo(setting.CustomConf); err != nil {
-		return fmt.Errorf("save custom config: %v", err)
-	}
-
-	setting.Langs = strings.Split(strings.Replace(strings.Join(setting.Langs, ","), "fr-CA", "fr-FR", 1), ",")
-	return nil
-}
-
-func trimCommitActionAppUrlPrefix(x *xorm.Engine) error {
-	type PushCommit struct {
-		Sha1        string
-		Message     string
-		AuthorEmail string
-		AuthorName  string
-	}
-
-	type PushCommits struct {
-		Len        int
-		Commits    []*PushCommit
-		CompareUrl string
-	}
-
-	type Action struct {
-		ID      int64  `xorm:"pk autoincr"`
-		Content string `xorm:"TEXT"`
-	}
-
-	results, err := x.Query("SELECT `id`,`content` FROM `action` WHERE `op_type`=?", 5)
-	if err != nil {
-		return fmt.Errorf("select commit actions: %v", err)
-	}
-
-	sess := x.NewSession()
-	defer sessionRelease(sess)
-	if err = sess.Begin(); err != nil {
-		return err
-	}
-
-	var pushCommits *PushCommits
-	for _, action := range results {
-		actID := com.StrTo(string(action["id"])).MustInt64()
-		if actID == 0 {
-			continue
-		}
-
-		pushCommits = new(PushCommits)
-		if err = json.Unmarshal(action["content"], pushCommits); err != nil {
-			return fmt.Errorf("unmarshal action content[%d]: %v", actID, err)
-		}
-
-		infos := strings.Split(pushCommits.CompareUrl, "/")
-		if len(infos) <= 4 {
-			continue
-		}
-		pushCommits.CompareUrl = strings.Join(infos[len(infos)-4:], "/")
-
-		p, err := json.Marshal(pushCommits)
-		if err != nil {
-			return fmt.Errorf("marshal action content[%d]: %v", actID, err)
-		}
-
-		if _, err = sess.Id(actID).Update(&Action{
-			Content: string(p),
-		}); err != nil {
-			return fmt.Errorf("update action[%d]: %v", actID, err)
-		}
-	}
-	return sess.Commit()
-}
-
-func issueToIssueLabel(x *xorm.Engine) error {
-	type IssueLabel struct {
-		ID      int64 `xorm:"pk autoincr"`
-		IssueID int64 `xorm:"UNIQUE(s)"`
-		LabelID int64 `xorm:"UNIQUE(s)"`
-	}
-
-	issueLabels := make([]*IssueLabel, 0, 50)
-	results, err := x.Query("SELECT `id`,`label_ids` FROM `issue`")
-	if err != nil {
-		if strings.Contains(err.Error(), "no such column") ||
-			strings.Contains(err.Error(), "Unknown column") {
-			return nil
-		}
-		return fmt.Errorf("select issues: %v", err)
-	}
-	for _, issue := range results {
-		issueID := com.StrTo(issue["id"]).MustInt64()
-
-		// Just in case legacy code can have duplicated IDs for same label.
-		mark := make(map[int64]bool)
-		for _, idStr := range strings.Split(string(issue["label_ids"]), "|") {
-			labelID := com.StrTo(strings.TrimPrefix(idStr, "$")).MustInt64()
-			if labelID == 0 || mark[labelID] {
-				continue
-			}
-
-			mark[labelID] = true
-			issueLabels = append(issueLabels, &IssueLabel{
-				IssueID: issueID,
-				LabelID: labelID,
-			})
-		}
-	}
-
-	sess := x.NewSession()
-	defer sessionRelease(sess)
-	if err = sess.Begin(); err != nil {
-		return err
-	}
-
-	if err = sess.Sync2(new(IssueLabel)); err != nil {
-		return fmt.Errorf("Sync2: %v", err)
-	} else if _, err = sess.Insert(issueLabels); err != nil {
-		return fmt.Errorf("insert issue-labels: %v", err)
-	}
-
-	return sess.Commit()
-}
-
-func attachmentRefactor(x *xorm.Engine) error {
-	type Attachment struct {
-		ID   int64  `xorm:"pk autoincr"`
-		UUID string `xorm:"uuid INDEX"`
-
-		// For rename purpose.
-		Path    string `xorm:"-"`
-		NewPath string `xorm:"-"`
-	}
-
-	results, err := x.Query("SELECT * FROM `attachment`")
-	if err != nil {
-		return fmt.Errorf("select attachments: %v", err)
-	}
-
-	attachments := make([]*Attachment, 0, len(results))
-	for _, attach := range results {
-		if !com.IsExist(string(attach["path"])) {
-			// If the attachment is already missing, there is no point to update it.
-			continue
-		}
-		attachments = append(attachments, &Attachment{
-			ID:   com.StrTo(attach["id"]).MustInt64(),
-			UUID: gouuid.NewV4().String(),
-			Path: string(attach["path"]),
-		})
-	}
-
-	sess := x.NewSession()
-	defer sessionRelease(sess)
-	if err = sess.Begin(); err != nil {
-		return err
-	}
-
-	if err = sess.Sync2(new(Attachment)); err != nil {
-		return fmt.Errorf("Sync2: %v", err)
-	}
-
-	// Note: Roll back for rename can be a dead loop,
-	// 	so produces a backup file.
-	var buf bytes.Buffer
-	buf.WriteString("# old path -> new path\n")
-
-	// Update database first because this is where error happens the most often.
-	for _, attach := range attachments {
-		if _, err = sess.Id(attach.ID).Update(attach); err != nil {
-			return err
-		}
-
-		attach.NewPath = path.Join(setting.AttachmentPath, attach.UUID[0:1], attach.UUID[1:2], attach.UUID)
-		buf.WriteString(attach.Path)
-		buf.WriteString("\t")
-		buf.WriteString(attach.NewPath)
-		buf.WriteString("\n")
-	}
-
-	// Then rename attachments.
-	isSucceed := true
-	defer func() {
-		if isSucceed {
-			return
-		}
-
-		dumpPath := path.Join(setting.LogRootPath, "attachment_path.dump")
-		ioutil.WriteFile(dumpPath, buf.Bytes(), 0666)
-		fmt.Println("Fail to rename some attachments, old and new paths are saved into:", dumpPath)
-	}()
-	for _, attach := range attachments {
-		if err = os.MkdirAll(path.Dir(attach.NewPath), os.ModePerm); err != nil {
-			isSucceed = false
-			return err
-		}
-
-		if err = os.Rename(attach.Path, attach.NewPath); err != nil {
-			isSucceed = false
-			return err
-		}
-	}
-
-	return sess.Commit()
-}
-
-func renamePullRequestFields(x *xorm.Engine) (err error) {
-	type PullRequest struct {
-		ID         int64 `xorm:"pk autoincr"`
-		PullID     int64 `xorm:"INDEX"`
-		PullIndex  int64
-		HeadBarcnh string
-
-		IssueID    int64 `xorm:"INDEX"`
-		Index      int64
-		HeadBranch string
-	}
-
-	if err = x.Sync(new(PullRequest)); err != nil {
-		return fmt.Errorf("sync: %v", err)
-	}
-
-	results, err := x.Query("SELECT `id`,`pull_id`,`pull_index`,`head_barcnh` FROM `pull_request`")
-	if err != nil {
-		if strings.Contains(err.Error(), "no such column") {
-			return nil
-		}
-		return fmt.Errorf("select pull requests: %v", err)
-	}
-
-	sess := x.NewSession()
-	defer sessionRelease(sess)
-	if err = sess.Begin(); err != nil {
-		return err
-	}
-
-	var pull *PullRequest
-	for _, pr := range results {
-		pull = &PullRequest{
-			ID:         com.StrTo(pr["id"]).MustInt64(),
-			IssueID:    com.StrTo(pr["pull_id"]).MustInt64(),
-			Index:      com.StrTo(pr["pull_index"]).MustInt64(),
-			HeadBranch: string(pr["head_barcnh"]),
-		}
-		if pull.Index == 0 {
-			continue
-		}
-		if _, err = sess.Id(pull.ID).Update(pull); err != nil {
-			return err
-		}
-	}
-
-	return sess.Commit()
-}
-
-func cleanUpMigrateRepoInfo(x *xorm.Engine) (err error) {
-	type (
-		User struct {
-			ID        int64 `xorm:"pk autoincr"`
-			LowerName string
-		}
-		Repository struct {
-			ID        int64 `xorm:"pk autoincr"`
-			OwnerID   int64
-			LowerName string
-		}
-	)
-
-	repos := make([]*Repository, 0, 25)
-	if err = x.Where("is_mirror=?", false).Find(&repos); err != nil {
-		return fmt.Errorf("select all non-mirror repositories: %v", err)
-	}
-	var user *User
-	for _, repo := range repos {
-		user = &User{ID: repo.OwnerID}
-		has, err := x.Get(user)
-		if err != nil {
-			return fmt.Errorf("get owner of repository[%d - %d]: %v", repo.ID, repo.OwnerID, err)
-		} else if !has {
-			continue
-		}
-
-		configPath := filepath.Join(setting.RepoRootPath, user.LowerName, repo.LowerName+".git/config")
-
-		// In case repository file is somehow missing.
-		if !com.IsFile(configPath) {
-			continue
-		}
-
-		cfg, err := ini.Load(configPath)
-		if err != nil {
-			return fmt.Errorf("open config file: %v", err)
-		}
-		cfg.DeleteSection("remote \"origin\"")
-		if err = cfg.SaveToIndent(configPath, "\t"); err != nil {
-			return fmt.Errorf("save config file: %v", err)
-		}
-	}
-
-	return nil
-}
-
 func generateOrgRandsAndSalt(x *xorm.Engine) (err error) {
 	type User struct {
 		ID    int64  `xorm:"pk autoincr"`
--- a/models/migrations/v15.go
+++ b/models/migrations/v15.go
@@ -0,0 +1,102 @@
+// 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"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/Unknwon/com"
+	"github.com/go-xorm/xorm"
+	log "gopkg.in/clog.v1"
+
+	"github.com/gogits/gogs/modules/setting"
+)
+
+func generateAndMigrateGitHooks(x *xorm.Engine) (err error) {
+	type Repository struct {
+		ID      int64
+		OwnerID int64
+		Name    string
+	}
+	type User struct {
+		ID   int64
+		Name string
+	}
+	var (
+		hookNames = []string{"pre-receive", "update", "post-receive"}
+		hookTpls  = []string{
+			fmt.Sprintf("#!/usr/bin/env %s\n\"%s\" hook --config='%s' pre-receive\n", setting.ScriptType, setting.AppPath, setting.CustomConf),
+			fmt.Sprintf("#!/usr/bin/env %s\n\"%s\" hook --config='%s' update $1 $2 $3\n", setting.ScriptType, setting.AppPath, setting.CustomConf),
+			fmt.Sprintf("#!/usr/bin/env %s\n\"%s\" hook --config='%s' post-receive\n", setting.ScriptType, setting.AppPath, setting.CustomConf),
+		}
+	)
+
+	// Cleanup old update.log and http.log files.
+	filepath.Walk(setting.LogRootPath, func(path string, info os.FileInfo, err error) error {
+		if !info.IsDir() &&
+			(strings.HasPrefix(filepath.Base(path), "update.log") ||
+				strings.HasPrefix(filepath.Base(path), "http.log")) {
+			os.Remove(path)
+		}
+		return nil
+	})
+
+	return x.Where("id > 0").Iterate(new(Repository),
+		func(idx int, bean interface{}) error {
+			repo := bean.(*Repository)
+			if repo.Name == "." || repo.Name == ".." {
+				return nil
+			}
+
+			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 {
+				return nil
+			}
+
+			repoBase := filepath.Join(setting.RepoRootPath, strings.ToLower(user.Name), strings.ToLower(repo.Name))
+			repoPath := repoBase + ".git"
+			wikiPath := repoBase + ".wiki.git"
+			log.Trace("[%04d]: %s", idx, repoPath)
+
+			hookDir := filepath.Join(repoPath, "hooks")
+			customHookDir := filepath.Join(repoPath, "custom_hooks")
+			wikiHookDir := filepath.Join(wikiPath, "hooks")
+
+			for i, hookName := range hookNames {
+				oldHookPath := filepath.Join(hookDir, hookName)
+				newHookPath := filepath.Join(customHookDir, hookName)
+
+				// Gogs didn't allow user to set custom update hook thus no migration for it.
+				// In case user runs this migration multiple times, and custom hook exists,
+				// we assume it's been migrated already.
+				if hookName != "update" && com.IsFile(oldHookPath) && !com.IsExist(customHookDir) {
+					os.MkdirAll(customHookDir, os.ModePerm)
+					if err = os.Rename(oldHookPath, newHookPath); err != nil {
+						return fmt.Errorf("move hook file to custom directory '%s' -> '%s': %v", oldHookPath, newHookPath, err)
+					}
+				}
+
+				if err = ioutil.WriteFile(oldHookPath, []byte(hookTpls[i]), os.ModePerm); err != nil {
+					return fmt.Errorf("write hook file '%s': %v", oldHookPath, err)
+				}
+
+				if com.IsDir(wikiPath) {
+					os.MkdirAll(wikiHookDir, os.ModePerm)
+					wikiHookPath := filepath.Join(wikiHookDir, hookName)
+					if err = ioutil.WriteFile(wikiHookPath, []byte(hookTpls[i]), os.ModePerm); err != nil {
+						return fmt.Errorf("write wiki hook file '%s': %v", wikiHookPath, err)
+					}
+				}
+			}
+			return nil
+		})
+}
--- a/models/models.go
+++ b/models/models.go
@@ -13,6 +13,7 @@ import (
 	"path"
 	"strings"

+	_ "github.com/denisenkom/go-mssqldb"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/core"
 	"github.com/go-xorm/xorm"
@@ -64,8 +65,8 @@ func init() {
 		new(Watch), new(Star), new(Follow), new(Action),
 		new(Issue), new(PullRequest), new(Comment), new(Attachment), new(IssueUser),
 		new(Label), new(IssueLabel), new(Milestone),
-		new(Mirror), new(Release), new(LoginSource), new(Webhook),
-		new(UpdateTask), new(HookTask),
+		new(Mirror), new(Release), new(LoginSource), new(Webhook), new(HookTask),
+		new(ProtectBranch), new(ProtectBranchWhitelist),
 		new(Team), new(OrgUser), new(TeamUser), new(TeamRepo),
 		new(Notice), new(EmailAddress))

@@ -85,8 +86,8 @@ func LoadConfigs() {
 		setting.UseMySQL = true
 	case "postgres":
 		setting.UsePostgreSQL = true
-	case "tidb":
-		setting.UseTiDB = true
+	case "mssql":
+		setting.UseMSSQL = true
 	}
 	DbCfg.Host = sec.Key("HOST").String()
 	DbCfg.Name = sec.Key("NAME").String()
@@ -113,6 +114,20 @@ func parsePostgreSQLHostPort(info string) (string, string) {
 	return host, port
 }

+func parseMSSQLHostPort(info string) (string, string) {
+	host, port := "127.0.0.1", "1433"
+	if strings.Contains(info, ":") {
+		host = strings.Split(info, ":")[0]
+		port = strings.Split(info, ":")[1]
+	} else if strings.Contains(info, ",") {
+		host = strings.Split(info, ",")[0]
+		port = strings.TrimSpace(strings.Split(info, ",")[1])
+	} else if len(info) > 0 {
+		host = info
+	}
+	return host, port
+}
+
 func getEngine() (*xorm.Engine, error) {
 	connStr := ""
 	var Param string = "?"
@@ -137,6 +152,9 @@ func getEngine() (*xorm.Engine, error) {
 			connStr = fmt.Sprintf("postgres://%s:%s@%s:%s/%s%ssslmode=%s",
 				url.QueryEscape(DbCfg.User), url.QueryEscape(DbCfg.Passwd), host, port, DbCfg.Name, Param, DbCfg.SSLMode)
 		}
+	case "mssql":
+		host, port := parseMSSQLHostPort(DbCfg.Host)
+		connStr = fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;", host, port, DbCfg.Name, DbCfg.User, DbCfg.Passwd)
 	case "sqlite3":
 		if !EnableSQLite3 {
 			return nil, errors.New("This binary version does not build support for SQLite3.")
@@ -236,7 +254,6 @@ func GetStatistic() (stats Statistic) {
 	stats.Counter.Label, _ = x.Count(new(Label))
 	stats.Counter.HookTask, _ = x.Count(new(HookTask))
 	stats.Counter.Team, _ = x.Count(new(Team))
-	stats.Counter.UpdateTask, _ = x.Count(new(UpdateTask))
 	stats.Counter.Attachment, _ = x.Count(new(Attachment))
 	return
 }
--- a/models/org.go
+++ b/models/org.go
@@ -10,10 +10,8 @@ import (
 	"os"
 	"strings"

+	"github.com/go-xorm/builder"
 	"github.com/go-xorm/xorm"
-	log "gopkg.in/clog.v1"
-
-	"github.com/gogits/gogs/modules/base"
 )

 var (
@@ -32,10 +30,10 @@ func (org *User) IsOrgMember(uid int64) bool {
 }

 func (org *User) getTeam(e Engine, name string) (*Team, error) {
-	return getTeam(e, org.ID, name)
+	return getTeamOfOrgByName(e, org.ID, name)
 }

-// GetTeam returns named team of organization.
+// GetTeamOfOrgByName returns named team of organization.
 func (org *User) GetTeam(name string) (*Team, error) {
 	return org.getTeam(x, name)
 }
@@ -49,8 +47,9 @@ func (org *User) GetOwnerTeam() (*Team, error) {
 	return org.getOwnerTeam(x)
 }

-func (org *User) getTeams(e Engine) error {
-	return e.Where("org_id=?", org.ID).Find(&org.Teams)
+func (org *User) getTeams(e Engine) (err error) {
+	org.Teams, err = getTeamsByOrgID(e, org.ID)
+	return err
 }

 // GetTeams returns all teams that belong to organization.
@@ -58,6 +57,11 @@ func (org *User) GetTeams() error {
 	return org.getTeams(x)
 }

+// TeamsHaveAccessToRepo returns all teamsthat have given access level to the repository.
+func (org *User) TeamsHaveAccessToRepo(repoID int64, mode AccessMode) ([]*Team, error) {
+	return GetTeamsHaveAccessToRepo(org.ID, repoID, mode)
+}
+
 // GetMembers returns all members of organization.
 func (org *User) GetMembers() error {
 	ous, err := GetOrgUsersByOrgID(org.ID)
@@ -483,8 +487,7 @@ func (org *User) GetUserTeams(userID int64) ([]*Team, error) {
 	return org.getUserTeams(x, userID)
 }

-// GetUserRepositories returns a range of repositories in organization
-// that the user with the given userID has access to,
+// GetUserRepositories returns a range of repositories in organization which the user has access to,
 // and total number of records based on given condition.
 func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repository, int64, error) {
 	teamIDs, err := org.GetUserTeamIDs(userID)
@@ -493,43 +496,43 @@ func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repos
 	}
 	if len(teamIDs) == 0 {
 		// user has no team but "IN ()" is invalid SQL
-		teamIDs = []int64{-1} // there is no repo with id=-1
+		teamIDs = []int64{-1} // there is no team with id=-1
+	}
+
+	var teamRepoIDs []int64
+	if err = x.Table("team_repo").In("team_id", teamIDs).Distinct("repo_id").Find(&teamRepoIDs); err != nil {
+		return nil, 0, fmt.Errorf("get team repository IDs: %v", err)
+	}
+	if len(teamRepoIDs) == 0 {
+		// team has no repo but "IN ()" is invalid SQL
+		teamRepoIDs = []int64{-1} // there is no repo with id=-1
 	}

 	if page <= 0 {
 		page = 1
 	}
 	repos := make([]*Repository, 0, pageSize)
-	// FIXME: use XORM chain operations instead of raw SQL.
-	if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository
-	INNER JOIN team_repo 
-	ON team_repo.repo_id = repository.id
-	WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s)
-	GROUP BY repository.id
-	ORDER BY updated_unix DESC
-	LIMIT %d OFFSET %d`,
-		strings.Join(base.Int64sToStrings(teamIDs), ","), pageSize, (page-1)*pageSize),
-		org.ID, false).Find(&repos); err != nil {
-		return nil, 0, fmt.Errorf("get repositories: %v", err)
+	if err = x.Where("owner_id = ?", org.ID).
+		And("is_private = ?", false).
+		Or(builder.In("id", teamRepoIDs)).
+		Desc("updated_unix").
+		Limit(pageSize, (page-1)*pageSize).
+		Find(&repos); err != nil {
+		return nil, 0, fmt.Errorf("get user repositories: %v", err)
 	}

-	results, err := x.Query(fmt.Sprintf(`SELECT repository.id FROM repository
-	INNER JOIN team_repo 
-	ON team_repo.repo_id = repository.id
-	WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s)
-	GROUP BY repository.id
-	ORDER BY updated_unix DESC`,
-		strings.Join(base.Int64sToStrings(teamIDs), ",")),
-		org.ID, false)
+	repoCount, err := x.Where("owner_id = ?", org.ID).
+		And("is_private = ?", false).
+		Or(builder.In("id", teamRepoIDs)).
+		Count(new(Repository))
 	if err != nil {
-		log.Error(4, "count user repositories in organization: %v", err)
+		return nil, 0, fmt.Errorf("count user repositories: %v", err)
 	}

-	return repos, int64(len(results)), nil
+	return repos, repoCount, nil
 }

-// GetUserRepositories returns mirror repositories of the organization
-// that the user with the given userID has access to.
+// GetUserMirrorRepositories returns mirror repositories of the organization which the user has access to.
 func (org *User) GetUserMirrorRepositories(userID int64) ([]*Repository, error) {
 	teamIDs, err := org.GetUserTeamIDs(userID)
 	if err != nil {
@@ -539,16 +542,24 @@ func (org *User) GetUserMirrorRepositories(userID int64) ([]*Repository, error)
 		teamIDs = []int64{-1}
 	}

+	var teamRepoIDs []int64
+	err = x.Table("team_repo").In("team_id", teamIDs).Distinct("repo_id").Find(&teamRepoIDs)
+	if err != nil {
+		return nil, fmt.Errorf("get team repository ids: %v", err)
+	}
+	if len(teamRepoIDs) == 0 {
+		// team has no repo but "IN ()" is invalid SQL
+		teamRepoIDs = []int64{-1} // there is no repo with id=-1
+	}
+
 	repos := make([]*Repository, 0, 10)
-	if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository
-	INNER JOIN team_repo 
-	ON team_repo.repo_id = repository.id AND repository.is_mirror = ?
-	WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s)
-	GROUP BY repository.id
-	ORDER BY updated_unix DESC`,
-		strings.Join(base.Int64sToStrings(teamIDs), ",")),
-		true, org.ID, false).Find(&repos); err != nil {
-		return nil, fmt.Errorf("get repositories: %v", err)
+	if err = x.Where("owner_id = ?", org.ID).
+		And("is_private = ?", false).
+		Or(builder.In("id", teamRepoIDs)).
+		And("is_mirror = ?", true). // Don't move up because it's an independent condition
+		Desc("updated_unix").
+		Find(&repos); err != nil {
+		return nil, fmt.Errorf("get user repositories: %v", err)
 	}
 	return repos, nil
 }
--- a/models/org_team.go
+++ b/models/org_team.go
@@ -43,9 +43,14 @@ func (t *Team) IsOwnerTeam() bool {
 	return t.Name == OWNER_TEAM
 }

+// HasWriteAccess returns true if team has at least write level access mode.
+func (t *Team) HasWriteAccess() bool {
+	return t.Authorize >= ACCESS_MODE_WRITE
+}
+
 // IsTeamMember returns true if given user is a member of team.
-func (t *Team) IsMember(uid int64) bool {
-	return IsTeamMember(t.OrgID, t.ID, uid)
+func (t *Team) IsMember(userID int64) bool {
+	return IsTeamMember(t.OrgID, t.ID, userID)
 }

 func (t *Team) getRepositories(e Engine) (err error) {
@@ -166,15 +171,15 @@ func (t *Team) removeRepository(e Engine, repo *Repository, recalculate bool) (e
 	if err = t.getMembers(e); err != nil {
 		return fmt.Errorf("get team members: %v", err)
 	}
-	for _, u := range t.Members {
-		has, err := hasAccess(e, u, repo, ACCESS_MODE_READ)
+	for _, member := range t.Members {
+		has, err := hasAccess(e, member.ID, repo, ACCESS_MODE_READ)
 		if err != nil {
 			return err
 		} else if has {
 			continue
 		}

-		if err = watchRepo(e, u.ID, repo.ID, false); err != nil {
+		if err = watchRepo(e, member.ID, repo.ID, false); err != nil {
 			return err
 		}
 	}
@@ -206,11 +211,24 @@ func (t *Team) RemoveRepository(repoID int64) error {
 	return sess.Commit()
 }

+var reservedTeamNames = []string{"new"}
+
+// IsUsableTeamName return an error if given name is a reserved name or pattern.
+func IsUsableTeamName(name string) error {
+	return isUsableName(reservedTeamNames, nil, name)
+}
+
 // NewTeam creates a record of new team.
 // It's caller's responsibility to assign organization ID.
 func NewTeam(t *Team) error {
 	if len(t.Name) == 0 {
 		return errors.New("empty team name")
+	} else if t.OrgID == 0 {
+		return errors.New("OrgID is not assigned")
+	}
+
+	if err := IsUsableTeamName(t.Name); err != nil {
+		return err
 	}

 	has, err := x.Id(t.OrgID).Get(new(User))
@@ -247,9 +265,9 @@ func NewTeam(t *Team) error {
 	return sess.Commit()
 }

-func getTeam(e Engine, orgId int64, name string) (*Team, error) {
+func getTeamOfOrgByName(e Engine, orgID int64, name string) (*Team, error) {
 	t := &Team{
-		OrgID:     orgId,
+		OrgID:     orgID,
 		LowerName: strings.ToLower(name),
 	}
 	has, err := e.Get(t)
@@ -261,14 +279,14 @@ func getTeam(e Engine, orgId int64, name string) (*Team, error) {
 	return t, nil
 }

-// GetTeam returns team by given team name and organization.
-func GetTeam(orgId int64, name string) (*Team, error) {
-	return getTeam(x, orgId, name)
+// GetTeamOfOrgByName returns team by given team name and organization.
+func GetTeamOfOrgByName(orgID int64, name string) (*Team, error) {
+	return getTeamOfOrgByName(x, orgID, name)
 }

-func getTeamByID(e Engine, teamId int64) (*Team, error) {
+func getTeamByID(e Engine, teamID int64) (*Team, error) {
 	t := new(Team)
-	has, err := e.Id(teamId).Get(t)
+	has, err := e.Id(teamID).Get(t)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -278,8 +296,18 @@ func getTeamByID(e Engine, teamId int64) (*Team, error) {
 }

 // GetTeamByID returns team by given ID.
-func GetTeamByID(teamId int64) (*Team, error) {
-	return getTeamByID(x, teamId)
+func GetTeamByID(teamID int64) (*Team, error) {
+	return getTeamByID(x, teamID)
+}
+
+func getTeamsByOrgID(e Engine, orgID int64) ([]*Team, error) {
+	teams := make([]*Team, 0, 3)
+	return teams, e.Where("org_id = ?", orgID).Find(&teams)
+}
+
+// GetTeamsByOrgID returns all teams belong to given organization.
+func GetTeamsByOrgID(orgID int64) ([]*Team, error) {
+	return getTeamsByOrgID(x, orgID)
 }

 // UpdateTeam updates information of team.
@@ -416,39 +444,34 @@ func GetTeamMembers(teamID int64) ([]*User, error) {
 	return getTeamMembers(x, teamID)
 }

-func getUserTeams(e Engine, orgId, uid int64) ([]*Team, error) {
-	tus := make([]*TeamUser, 0, 5)
-	if err := e.Where("uid=?", uid).And("org_id=?", orgId).Find(&tus); err != nil {
+func getUserTeams(e Engine, orgID, userID int64) ([]*Team, error) {
+	teamUsers := make([]*TeamUser, 0, 5)
+	if err := e.Where("uid = ?", userID).And("org_id = ?", orgID).Find(&teamUsers); err != nil {
 		return nil, err
 	}

-	ts := make([]*Team, len(tus))
-	for i, tu := range tus {
-		t := new(Team)
-		has, err := e.Id(tu.TeamID).Get(t)
-		if err != nil {
-			return nil, err
-		} else if !has {
-			return nil, ErrTeamNotExist
-		}
-		ts[i] = t
+	teamIDs := make([]int64, len(teamUsers))
+	for i := range teamUsers {
+		teamIDs[i] = teamUsers[i].TeamID
 	}
-	return ts, nil
+
+	teams := make([]*Team, 0, len(teamIDs))
+	return teams, e.Where("org_id = ?", orgID).In("id", teamIDs).Find(&teams)
 }

 // GetUserTeams returns all teams that user belongs to in given organization.
-func GetUserTeams(orgId, uid int64) ([]*Team, error) {
-	return getUserTeams(x, orgId, uid)
+func GetUserTeams(orgID, userID int64) ([]*Team, error) {
+	return getUserTeams(x, orgID, userID)
 }

 // AddTeamMember adds new membership of given team to given organization,
 // the user will have membership to given organization automatically when needed.
-func AddTeamMember(orgID, teamID, uid int64) error {
-	if IsTeamMember(orgID, teamID, uid) {
+func AddTeamMember(orgID, teamID, userID int64) error {
+	if IsTeamMember(orgID, teamID, userID) {
 		return nil
 	}

-	if err := AddOrgUser(orgID, uid); err != nil {
+	if err := AddOrgUser(orgID, userID); err != nil {
 		return err
 	}

@@ -470,7 +493,7 @@ func AddTeamMember(orgID, teamID, uid int64) error {
 	}

 	tu := &TeamUser{
-		UID:    uid,
+		UID:    userID,
 		OrgID:  orgID,
 		TeamID: teamID,
 	}
@@ -489,7 +512,7 @@ func AddTeamMember(orgID, teamID, uid int64) error {

 	// We make sure it exists before.
 	ou := new(OrgUser)
-	if _, err = sess.Where("uid = ?", uid).And("org_id = ?", orgID).Get(ou); err != nil {
+	if _, err = sess.Where("uid = ?", userID).And("org_id = ?", orgID).Get(ou); err != nil {
 		return err
 	}
 	ou.NumTeams++
@@ -587,18 +610,18 @@ func RemoveTeamMember(orgID, teamID, uid int64) error {

 // TeamRepo represents an team-repository relation.
 type TeamRepo struct {
-	ID     int64 `xorm:"pk autoincr"`
+	ID     int64
 	OrgID  int64 `xorm:"INDEX"`
 	TeamID int64 `xorm:"UNIQUE(s)"`
 	RepoID int64 `xorm:"UNIQUE(s)"`
 }

 func hasTeamRepo(e Engine, orgID, teamID, repoID int64) bool {
-	has, _ := e.Where("org_id=?", orgID).And("team_id=?", teamID).And("repo_id=?", repoID).Get(new(TeamRepo))
+	has, _ := e.Where("org_id = ?", orgID).And("team_id = ?", teamID).And("repo_id = ?", repoID).Get(new(TeamRepo))
 	return has
 }

-// HasTeamRepo returns true if given repository belongs to team.
+// HasTeamRepo returns true if given team has access to the repository of the organization.
 func HasTeamRepo(orgID, teamID, repoID int64) bool {
 	return hasTeamRepo(x, orgID, teamID, repoID)
 }
@@ -629,3 +652,13 @@ func removeTeamRepo(e Engine, teamID, repoID int64) error {
 func RemoveTeamRepo(teamID, repoID int64) error {
 	return removeTeamRepo(x, teamID, repoID)
 }
+
+// GetTeamsHaveAccessToRepo returns all teams in an organization that have given access level to the repository.
+func GetTeamsHaveAccessToRepo(orgID, repoID int64, mode AccessMode) ([]*Team, error) {
+	teams := make([]*Team, 0, 5)
+	return teams, x.Where("team.authorize >= ?", mode).
+		Join("INNER", "team_repo", "team_repo.team_id = team.id").
+		And("team_repo.org_id = ?", orgID).
+		And("team_repo.repo_id = ?", repoID).
+		Find(&teams)
+}
--- a/models/repo.go
+++ b/models/repo.go
@@ -36,10 +36,6 @@ import (
 	"github.com/gogits/gogs/modules/sync"
 )

-const (
-	_TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update $1 $2 $3 --config='%s'\n"
-)
-
 var repoWorkingPool = sync.NewExclusivePool()

 var (
@@ -125,6 +121,8 @@ func NewRepoContext() {
 	if version.Compare("1.7.1", setting.Git.Version, ">") {
 		log.Fatal(4, "Gogs requires Git version greater or equal to 1.7.1")
 	}
+	git.HookDir = "custom_hooks"
+	git.HookSampleDir = "hooks"

 	// 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"} {
@@ -331,13 +329,14 @@ func (repo *Repository) DeleteWiki() {
 	}
 }

-func (repo *Repository) getAssignees(e Engine) (_ []*User, err error) {
+// getUsersWithAccesMode returns users that have at least given access mode to the repository.
+func (repo *Repository) getUsersWithAccesMode(e Engine, mode AccessMode) (_ []*User, err error) {
 	if err = repo.getOwner(e); err != nil {
 		return nil, err
 	}

 	accesses := make([]*Access, 0, 10)
-	if err = e.Where("repo_id = ? AND mode >= ?", repo.ID, ACCESS_MODE_WRITE).Find(&accesses); err != nil {
+	if err = e.Where("repo_id = ? AND mode >= ?", repo.ID, mode).Find(&accesses); err != nil {
 		return nil, err
 	}

@@ -361,7 +360,12 @@ func (repo *Repository) getAssignees(e Engine) (_ []*User, err error) {
 	return users, nil
 }

-// GetAssignees returns all users that have write access and can be assigned to issues
+// getAssignees returns a list of users who can be assigned to issues in this repository.
+func (repo *Repository) getAssignees(e Engine) (_ []*User, err error) {
+	return repo.getUsersWithAccesMode(e, ACCESS_MODE_READ)
+}
+
+// GetAssignees returns all users that have read access and can be assigned to issues
 // of the repository,
 func (repo *Repository) GetAssignees() (_ []*User, err error) {
 	return repo.getAssignees(x)
@@ -372,6 +376,11 @@ func (repo *Repository) GetAssigneeByID(userID int64) (*User, error) {
 	return GetAssigneeByID(repo, userID)
 }

+// GetWriters returns all users that have write access to the repository.
+func (repo *Repository) GetWriters() (_ []*User, err error) {
+	return repo.getUsersWithAccesMode(x, ACCESS_MODE_WRITE)
+}
+
 // GetMilestoneByID returns the milestone belongs to repository by given ID.
 func (repo *Repository) GetMilestoneByID(milestoneID int64) (*Milestone, error) {
 	return GetMilestoneByRepoID(repo.ID, milestoneID)
@@ -420,8 +429,8 @@ func (repo *Repository) ComposeCompareURL(oldCommitID, newCommitID string) strin
 	return fmt.Sprintf("%s/%s/compare/%s...%s", repo.MustOwner().Name, repo.Name, oldCommitID, newCommitID)
 }

-func (repo *Repository) HasAccess(u *User) bool {
-	has, _ := HasAccess(u, repo, ACCESS_MODE_READ)
+func (repo *Repository) HasAccess(userID int64) bool {
+	has, _ := HasAccess(userID, repo, ACCESS_MODE_READ)
 	return has
 }

@@ -444,6 +453,10 @@ func (repo *Repository) AllowsPulls() bool {
 	return repo.CanEnablePulls() && repo.EnablePulls
 }

+func (repo *Repository) IsBranchRequirePullRequest(name string) bool {
+	return IsBranchOfRepoRequirePullRequest(repo.ID, name)
+}
+
 // CanEnableEditor returns true if repository meets the requirements of web editor.
 func (repo *Repository) CanEnableEditor() bool {
 	return !repo.IsMirror
@@ -468,38 +481,42 @@ func (repo *Repository) DescriptionHtml() template.HTML {
 }

 func (repo *Repository) LocalCopyPath() string {
-	return path.Join(setting.AppDataPath, "tmp/local-rpeo", com.ToStr(repo.ID))
+	return path.Join(setting.AppDataPath, "tmp/local-repo", com.ToStr(repo.ID))
 }

-// UpdateLocalCopy pulls latest changes of given branch from repoPath to localPath.
-// It creates a new clone if local copy does not exist.
-// This function checks out target branch by default, it is safe to assume subsequent
-// operations are operating against target branch when caller has confidence for no race condition.
-func UpdateLocalCopyBranch(repoPath, localPath, branch string) error {
+// UpdateLocalCopy fetches latest changes of given branch from repoPath to localPath.
+// It creates a new clone if local copy does not exist, but does not checks out to a
+// specific branch if the local copy belongs to a wiki.
+// For existing local copy, it checks out to target branch by default, and safe to
+// assume subsequent operations are against target branch when caller has confidence
+// about no race condition.
+func UpdateLocalCopyBranch(repoPath, localPath, branch string, isWiki bool) (err error) {
 	if !com.IsExist(localPath) {
-		if err := git.Clone(repoPath, localPath, git.CloneRepoOptions{
+		// Checkout to a specific branch fails when wiki is an empty repository.
+		if isWiki {
+			branch = ""
+		}
+		if err = git.Clone(repoPath, localPath, git.CloneRepoOptions{
 			Timeout: time.Duration(setting.Git.Timeout.Clone) * time.Second,
 			Branch:  branch,
 		}); err != nil {
 			return fmt.Errorf("git clone %s: %v", branch, err)
 		}
 	} else {
-		if err := git.Fetch(localPath, git.FetchRemoteOptions{
+		if err = git.Fetch(localPath, git.FetchRemoteOptions{
 			Prune: true,
 		}); err != nil {
 			return fmt.Errorf("git fetch: %v", err)
 		}
-		if err := git.Checkout(localPath, git.CheckoutOptions{
+		if err = git.Checkout(localPath, git.CheckoutOptions{
 			Branch: branch,
 		}); err != nil {
 			return fmt.Errorf("git checkout %s: %v", branch, err)
 		}
-		if err := git.Pull(localPath, git.PullRemoteOptions{
-			Timeout: time.Duration(setting.Git.Timeout.Pull) * time.Second,
-			Remote:  "origin",
-			Branch:  branch,
-		}); err != nil {
-			return fmt.Errorf("git pull origin %s: %v", branch, err)
+
+		// Reset to align with remote in case of force push.
+		if err = git.ResetHEAD(localPath, true, "origin/"+branch); err != nil {
+			return fmt.Errorf("git reset --hard origin/%s: %v", branch, err)
 		}
 	}
 	return nil
@@ -507,7 +524,7 @@ func UpdateLocalCopyBranch(repoPath, localPath, branch string) error {

 // UpdateLocalCopyBranch makes sure local copy of repository in given branch is up-to-date.
 func (repo *Repository) UpdateLocalCopyBranch(branch string) error {
-	return UpdateLocalCopyBranch(repo.RepoPath(), repo.LocalCopyPath(), branch)
+	return UpdateLocalCopyBranch(repo.RepoPath(), repo.LocalCopyPath(), branch, false)
 }

 // PatchPath returns corresponding patch file path of repository by given issue ID.
@@ -637,7 +654,7 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {

 	migrateTimeout := time.Duration(setting.Git.Timeout.Migrate) * time.Second

-	os.RemoveAll(repoPath)
+	RemoveAllWithNotice("Repository path erase before creation", repoPath)
 	if err = git.Clone(opts.RemoteAddr, repoPath, git.CloneRepoOptions{
 		Mirror:  true,
 		Quiet:   true,
@@ -648,14 +665,14 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {

 	wikiRemotePath := wikiRemoteURL(opts.RemoteAddr)
 	if len(wikiRemotePath) > 0 {
-		os.RemoveAll(wikiPath)
+		RemoveAllWithNotice("Repository wiki path erase before creation", wikiPath)
 		if err = git.Clone(wikiRemotePath, wikiPath, git.CloneRepoOptions{
 			Mirror:  true,
 			Quiet:   true,
 			Timeout: migrateTimeout,
 		}); err != nil {
 			log.Trace("Fail to clone wiki: %v", err)
-			os.RemoveAll(wikiPath)
+			RemoveAllWithNotice("Delete repository wiki for initialization failure", wikiPath)
 		}
 	}

@@ -715,20 +732,33 @@ func cleanUpMigrateGitConfig(configPath string) error {
 	return nil
 }

-func createUpdateHook(repoPath string) error {
-	return git.SetUpdateHook(repoPath,
-		fmt.Sprintf(_TPL_UPDATE_HOOK, setting.ScriptType, "\""+setting.AppPath+"\"", setting.CustomConf))
+var hooksTpls = map[string]string{
+	"pre-receive":  "#!/usr/bin/env %s\n\"%s\" hook --config='%s' pre-receive\n",
+	"update":       "#!/usr/bin/env %s\n\"%s\" hook --config='%s' update $1 $2 $3\n",
+	"post-receive": "#!/usr/bin/env %s\n\"%s\" hook --config='%s' post-receive\n",
+}
+
+func createDelegateHooks(repoPath string) (err error) {
+	for _, name := range git.HookNames {
+		hookPath := filepath.Join(repoPath, "hooks", name)
+		if err = ioutil.WriteFile(hookPath,
+			[]byte(fmt.Sprintf(hooksTpls[name], setting.ScriptType, setting.AppPath, setting.CustomConf)),
+			os.ModePerm); err != nil {
+			return fmt.Errorf("create delegate hook '%s': %v", hookPath, err)
+		}
+	}
+	return nil
 }

 // Finish migrating repository and/or wiki with things that don't need to be done for mirrors.
 func CleanUpMigrateInfo(repo *Repository) (*Repository, error) {
 	repoPath := repo.RepoPath()
-	if err := createUpdateHook(repoPath); err != nil {
-		return repo, fmt.Errorf("createUpdateHook: %v", err)
+	if err := createDelegateHooks(repoPath); err != nil {
+		return repo, fmt.Errorf("createDelegateHooks: %v", err)
 	}
 	if repo.HasWiki() {
-		if err := createUpdateHook(repo.WikiPath()); err != nil {
-			return repo, fmt.Errorf("createUpdateHook (wiki): %v", err)
+		if err := createDelegateHooks(repo.WikiPath()); err != nil {
+			return repo, fmt.Errorf("createDelegateHooks.(wiki): %v", err)
 		}
 	}

@@ -737,7 +767,7 @@ func CleanUpMigrateInfo(repo *Repository) (*Repository, error) {
 	}
 	if repo.HasWiki() {
 		if err := cleanUpMigrateGitConfig(path.Join(repo.WikiPath(), "config")); err != nil {
-			return repo, fmt.Errorf("cleanUpMigrateGitConfig (wiki): %v", err)
+			return repo, fmt.Errorf("cleanUpMigrateGitConfig.(wiki): %v", err)
 		}
 	}

@@ -862,8 +892,8 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, opts C
 	// Init bare new repository.
 	if err = git.InitRepository(repoPath, true); err != nil {
 		return fmt.Errorf("InitRepository: %v", err)
-	} else if err = createUpdateHook(repoPath); err != nil {
-		return fmt.Errorf("createUpdateHook: %v", err)
+	} else if err = createDelegateHooks(repoPath); err != nil {
+		return fmt.Errorf("createDelegateHooks: %v", err)
 	}

 	tmpDir := filepath.Join(os.TempDir(), "gogs-"+repo.Name+"-"+com.ToStr(time.Now().Nanosecond()))
@@ -871,7 +901,7 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, opts C
 	// Initialize repository according to user's choice.
 	if opts.AutoInit {
 		os.MkdirAll(tmpDir, os.ModePerm)
-		defer os.RemoveAll(tmpDir)
+		defer RemoveAllWithNotice("Delete repository for auto-initialization", tmpDir)

 		if err = prepareRepoCommit(repo, tmpDir, repoPath, opts); err != nil {
 			return fmt.Errorf("prepareRepoCommit: %v", err)
@@ -906,6 +936,7 @@ var (
 	reservedRepoPatterns = []string{"*.git", "*.wiki"}
 )

+// IsUsableRepoName return an error if given name is a reserved name or pattern.
 func IsUsableRepoName(name string) error {
 	return isUsableName(reservedRepoNames, reservedRepoPatterns, name)
 }
@@ -989,19 +1020,15 @@ func CreateRepository(u *User, opts CreateRepoOptions) (_ *Repository, err error
 	if !opts.IsMirror {
 		repoPath := RepoPath(u.Name, repo.Name)
 		if err = initRepository(sess, repoPath, u, repo, opts); err != nil {
-			if err2 := os.RemoveAll(repoPath); err2 != nil {
-				log.Error(4, "initRepository: %v", err)
-				return nil, fmt.Errorf(
-					"delete repo directory %s/%s failed(2): %v", u.Name, repo.Name, err2)
-			}
+			RemoveAllWithNotice("Delete repository for initialization failure", repoPath)
 			return nil, fmt.Errorf("initRepository: %v", err)
 		}

 		_, stderr, err := process.ExecDir(-1,
-			repoPath, fmt.Sprintf("CreateRepository(git update-server-info): %s", repoPath),
+			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, errors.New("CreateRepository 'git update-server-info': " + stderr)
 		}
 	}

@@ -1374,6 +1401,8 @@ func DeleteRepository(uid, repoID int64) error {
 		&Release{RepoID: repoID},
 		&Collaboration{RepoID: repoID},
 		&PullRequest{BaseRepoID: repoID},
+		&ProtectBranch{RepoID: repoID},
+		&ProtectBranchWhitelist{RepoID: repoID},
 	); err != nil {
 		return fmt.Errorf("deleteBeans: %v", err)
 	}
@@ -1421,7 +1450,7 @@ func DeleteRepository(uid, repoID int64) error {
 	}

 	// Remove repository files.
-	repoPath := repo.repoPath(sess)
+	repoPath := repo.RepoPath()
 	RemoveAllWithNotice("Delete repository files", repoPath)

 	repo.DeleteWiki()
@@ -1577,8 +1606,70 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos []*Repository, _ int
 	return repos, count, sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&repos)
 }

+func DeleteOldRepositoryArchives() {
+	if taskStatusTable.IsRunning(_CLEAN_OLD_ARCHIVES) {
+		return
+	}
+	taskStatusTable.Start(_CLEAN_OLD_ARCHIVES)
+	defer taskStatusTable.Stop(_CLEAN_OLD_ARCHIVES)
+
+	log.Trace("Doing: DeleteOldRepositoryArchives")
+
+	formats := []string{"zip", "targz"}
+	oldestTime := time.Now().Add(-setting.Cron.RepoArchiveCleanup.OlderThan)
+	if err := x.Where("id > 0").Iterate(new(Repository),
+		func(idx int, bean interface{}) error {
+			repo := bean.(*Repository)
+			basePath := filepath.Join(repo.RepoPath(), "archives")
+			for _, format := range formats {
+				dirPath := filepath.Join(basePath, format)
+				if !com.IsDir(dirPath) {
+					continue
+				}
+
+				dir, err := os.Open(dirPath)
+				if err != nil {
+					log.Error(3, "Fail to open directory '%s': %v", dirPath, err)
+					continue
+				}
+
+				fis, err := dir.Readdir(0)
+				dir.Close()
+				if err != nil {
+					log.Error(3, "Fail to read directory '%s': %v", dirPath, err)
+					continue
+				}
+
+				for _, fi := range fis {
+					if fi.IsDir() || fi.ModTime().After(oldestTime) {
+						continue
+					}
+
+					archivePath := filepath.Join(dirPath, fi.Name())
+					if err = os.Remove(archivePath); err != nil {
+						desc := fmt.Sprintf("Fail to health delete archive '%s': %v", archivePath, err)
+						log.Warn(desc)
+						if err = CreateRepositoryNotice(desc); err != nil {
+							log.Error(3, "CreateRepositoryNotice: %v", err)
+						}
+					}
+				}
+			}
+
+			return nil
+		}); err != nil {
+		log.Error(2, "DeleteOldRepositoryArchives: %v", err)
+	}
+}
+
 // DeleteRepositoryArchives deletes all repositories' archives.
 func DeleteRepositoryArchives() error {
+	if taskStatusTable.IsRunning(_CLEAN_OLD_ARCHIVES) {
+		return nil
+	}
+	taskStatusTable.Start(_CLEAN_OLD_ARCHIVES)
+	defer taskStatusTable.Stop(_CLEAN_OLD_ARCHIVES)
+
 	return x.Where("id > 0").Iterate(new(Repository),
 		func(idx int, bean interface{}) error {
 			repo := bean.(*Repository)
@@ -1647,12 +1738,20 @@ func ReinitMissingRepositories() error {
 	return nil
 }

-// RewriteRepositoryUpdateHook rewrites all repositories' update hook.
-func RewriteRepositoryUpdateHook() error {
+// SyncRepositoryHooks rewrites all repositories' pre-receive, update and post-receive hooks
+// to make sure the binary and custom conf path are up-to-date.
+func SyncRepositoryHooks() error {
 	return x.Where("id > 0").Iterate(new(Repository),
 		func(idx int, bean interface{}) error {
 			repo := bean.(*Repository)
-			return createUpdateHook(repo.RepoPath())
+			if err := createDelegateHooks(repo.RepoPath()); err != nil {
+				return err
+			}
+
+			if repo.HasWiki() {
+				return createDelegateHooks(repo.WikiPath())
+			}
+			return nil
 		})
 }

@@ -1660,9 +1759,10 @@ func RewriteRepositoryUpdateHook() error {
 var taskStatusTable = sync.NewStatusTable()

 const (
-	_MIRROR_UPDATE = "mirror_update"
-	_GIT_FSCK      = "git_fsck"
-	_CHECK_REPOs   = "check_repos"
+	_MIRROR_UPDATE      = "mirror_update"
+	_GIT_FSCK           = "git_fsck"
+	_CHECK_REPO_STATS   = "check_repos_stats"
+	_CLEAN_OLD_ARCHIVES = "clean_old_archives"
 )

 // GitFsck calls 'git fsck' to check repository health.
@@ -1680,15 +1780,15 @@ func GitFsck() {
 			repo := bean.(*Repository)
 			repoPath := repo.RepoPath()
 			if err := git.Fsck(repoPath, setting.Cron.RepoHealthCheck.Timeout, setting.Cron.RepoHealthCheck.Args...); err != nil {
-				desc := fmt.Sprintf("Fail to health check repository (%s): %v", repoPath, err)
+				desc := fmt.Sprintf("Fail to health check repository '%s': %v", repoPath, err)
 				log.Warn(desc)
 				if err = CreateRepositoryNotice(desc); err != nil {
-					log.Error(4, "CreateRepositoryNotice: %v", err)
+					log.Error(3, "CreateRepositoryNotice: %v", err)
 				}
 			}
 			return nil
 		}); err != nil {
-		log.Error(4, "GitFsck: %v", err)
+		log.Error(2, "GitFsck: %v", err)
 	}
 }

@@ -1719,7 +1819,7 @@ type repoChecker struct {
 func repoStatsCheck(checker *repoChecker) {
 	results, err := x.Query(checker.querySQL)
 	if err != nil {
-		log.Error(4, "Select %s: %v", checker.desc, err)
+		log.Error(2, "Select %s: %v", checker.desc, err)
 		return
 	}
 	for _, result := range results {
@@ -1727,17 +1827,17 @@ func repoStatsCheck(checker *repoChecker) {
 		log.Trace("Updating %s: %d", checker.desc, id)
 		_, err = x.Exec(checker.correctSQL, id, id)
 		if err != nil {
-			log.Error(4, "Update %s[%d]: %v", checker.desc, id, err)
+			log.Error(2, "Update %s[%d]: %v", checker.desc, id, err)
 		}
 	}
 }

 func CheckRepoStats() {
-	if taskStatusTable.IsRunning(_CHECK_REPOs) {
+	if taskStatusTable.IsRunning(_CHECK_REPO_STATS) {
 		return
 	}
-	taskStatusTable.Start(_CHECK_REPOs)
-	defer taskStatusTable.Stop(_CHECK_REPOs)
+	taskStatusTable.Start(_CHECK_REPO_STATS)
+	defer taskStatusTable.Stop(_CHECK_REPO_STATS)

 	log.Trace("Doing: CheckRepoStats")

@@ -1781,14 +1881,14 @@ func CheckRepoStats() {
 	desc := "repository count 'num_closed_issues'"
 	results, err := x.Query("SELECT repo.id FROM `repository` repo WHERE repo.num_closed_issues!=(SELECT COUNT(*) FROM `issue` WHERE repo_id=repo.id AND is_closed=? AND is_pull=?)", true, false)
 	if err != nil {
-		log.Error(4, "Select %s: %v", desc, err)
+		log.Error(2, "Select %s: %v", desc, err)
 	} else {
 		for _, result := range results {
 			id := com.StrTo(result["id"]).MustInt64()
 			log.Trace("Updating %s: %d", desc, id)
 			_, err = x.Exec("UPDATE `repository` SET num_closed_issues=(SELECT COUNT(*) FROM `issue` WHERE repo_id=? AND is_closed=? AND is_pull=?) WHERE id=?", id, true, false, id)
 			if err != nil {
-				log.Error(4, "Update %s[%d]: %v", desc, id, err)
+				log.Error(2, "Update %s[%d]: %v", desc, id, err)
 			}
 		}
 	}
@@ -1798,7 +1898,7 @@ func CheckRepoStats() {
 	// ***** START: Repository.NumForks *****
 	results, err = x.Query("SELECT repo.id FROM `repository` repo WHERE repo.num_forks!=(SELECT COUNT(*) FROM `repository` WHERE fork_id=repo.id)")
 	if err != nil {
-		log.Error(4, "Select repository count 'num_forks': %v", err)
+		log.Error(2, "Select repository count 'num_forks': %v", err)
 	} else {
 		for _, result := range results {
 			id := com.StrTo(result["id"]).MustInt64()
@@ -1806,19 +1906,19 @@ func CheckRepoStats() {

 			repo, err := GetRepositoryByID(id)
 			if err != nil {
-				log.Error(4, "GetRepositoryByID[%d]: %v", id, err)
+				log.Error(2, "GetRepositoryByID[%d]: %v", id, err)
 				continue
 			}

 			rawResult, err := x.Query("SELECT COUNT(*) FROM `repository` WHERE fork_id=?", repo.ID)
 			if err != nil {
-				log.Error(4, "Select count of forks[%d]: %v", repo.ID, err)
+				log.Error(2, "Select count of forks[%d]: %v", repo.ID, err)
 				continue
 			}
 			repo.NumForks = int(parseCountResult(rawResult))

 			if err = UpdateRepository(repo, false); err != nil {
-				log.Error(4, "UpdateRepository[%d]: %v", id, err)
+				log.Error(2, "UpdateRepository[%d]: %v", id, err)
 				continue
 			}
 		}
@@ -2097,21 +2197,21 @@ func ForkRepository(u *User, oldRepo *Repository, name, desc string) (_ *Reposit

 	repoPath := RepoPath(u.Name, repo.Name)
 	_, stderr, err := process.ExecTimeout(10*time.Minute,
-		fmt.Sprintf("ForkRepository(git clone): %s/%s", u.Name, repo.Name),
+		fmt.Sprintf("ForkRepository 'git clone': %s/%s", u.Name, repo.Name),
 		"git", "clone", "--bare", oldRepo.RepoPath(), repoPath)
 	if err != nil {
 		return nil, fmt.Errorf("git clone: %v", stderr)
 	}

 	_, stderr, err = process.ExecDir(-1,
-		repoPath, fmt.Sprintf("ForkRepository(git update-server-info): %s", repoPath),
+		repoPath, fmt.Sprintf("ForkRepository 'git update-server-info': %s", repoPath),
 		"git", "update-server-info")
 	if err != nil {
 		return nil, fmt.Errorf("git update-server-info: %v", err)
 	}

-	if err = createUpdateHook(repoPath); err != nil {
-		return nil, fmt.Errorf("createUpdateHook: %v", err)
+	if err = createDelegateHooks(repoPath); err != nil {
+		return nil, fmt.Errorf("createDelegateHooks: %v", err)
 	}

 	return repo, sess.Commit()
--- a/models/repo_branch.go
+++ b/models/repo_branch.go
@@ -5,7 +5,13 @@
 package models

 import (
+	"fmt"
+	"strings"
+
+	"github.com/Unknwon/com"
 	"github.com/gogits/git-module"
+
+	"github.com/gogits/gogs/modules/base"
 )

 type Branch struct {
@@ -36,7 +42,7 @@ func GetBranchesByPath(path string) ([]*Branch, error) {

 func (repo *Repository) GetBranch(br string) (*Branch, error) {
 	if !git.IsBranchExist(repo.RepoPath(), br) {
-		return nil, &ErrBranchNotExist{br}
+		return nil, ErrBranchNotExist{br}
 	}
 	return &Branch{
 		Path: repo.RepoPath(),
@@ -55,3 +61,192 @@ func (br *Branch) GetCommit() (*git.Commit, error) {
 	}
 	return gitRepo.GetBranchCommit(br.Name)
 }
+
+type ProtectBranchWhitelist struct {
+	ID              int64
+	ProtectBranchID int64
+	RepoID          int64  `xorm:"UNIQUE(protect_branch_whitelist)"`
+	Name            string `xorm:"UNIQUE(protect_branch_whitelist)"`
+	UserID          int64  `xorm:"UNIQUE(protect_branch_whitelist)"`
+}
+
+// IsUserInProtectBranchWhitelist returns true if given user is in the whitelist of a branch in a repository.
+func IsUserInProtectBranchWhitelist(repoID, userID int64, branch string) bool {
+	has, err := x.Where("repo_id = ?", repoID).And("user_id = ?", userID).And("name = ?", branch).Get(new(ProtectBranchWhitelist))
+	return has && err == nil
+}
+
+// ProtectBranch contains options of a protected branch.
+type ProtectBranch struct {
+	ID                 int64
+	RepoID             int64  `xorm:"UNIQUE(protect_branch)"`
+	Name               string `xorm:"UNIQUE(protect_branch)"`
+	Protected          bool
+	RequirePullRequest bool
+	EnableWhitelist    bool
+	WhitelistUserIDs   string `xorm:"TEXT"`
+	WhitelistTeamIDs   string `xorm:"TEXT"`
+}
+
+// GetProtectBranchOfRepoByName returns *ProtectBranch by branch name in given repostiory.
+func GetProtectBranchOfRepoByName(repoID int64, name string) (*ProtectBranch, error) {
+	protectBranch := &ProtectBranch{
+		RepoID: repoID,
+		Name:   name,
+	}
+	has, err := x.Get(protectBranch)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, ErrBranchNotExist{name}
+	}
+	return protectBranch, nil
+}
+
+// IsBranchOfRepoRequirePullRequest returns true if branch requires pull request in given repository.
+func IsBranchOfRepoRequirePullRequest(repoID int64, name string) bool {
+	protectBranch, err := GetProtectBranchOfRepoByName(repoID, name)
+	if err != nil {
+		return false
+	}
+	return protectBranch.Protected && protectBranch.RequirePullRequest
+}
+
+// UpdateProtectBranch saves branch protection options.
+// If ID is 0, it creates a new record. Otherwise, updates existing record.
+func UpdateProtectBranch(protectBranch *ProtectBranch) (err error) {
+	sess := x.NewSession()
+	defer sessionRelease(sess)
+	if err = sess.Begin(); err != nil {
+		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)
+	}
+
+	return sess.Commit()
+}
+
+// UpdateOrgProtectBranch saves branch protection options of organizational repository.
+// If ID is 0, it creates a new record. Otherwise, updates existing record.
+// This function also performs check if whitelist user and team's IDs have been changed
+// to avoid unnecessary whitelist delete and regenerate.
+func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whitelistUserIDs, whitelistTeamIDs string) (err error) {
+	if err = repo.GetOwner(); err != nil {
+		return fmt.Errorf("GetOwner: %v", err)
+	} else if !repo.Owner.IsOrganization() {
+		return fmt.Errorf("expect repository owner to be an organization")
+	}
+
+	hasUsersChanged := false
+	validUserIDs := base.StringsToInt64s(strings.Split(protectBranch.WhitelistUserIDs, ","))
+	if protectBranch.WhitelistUserIDs != whitelistUserIDs {
+		hasUsersChanged = true
+		userIDs := base.StringsToInt64s(strings.Split(whitelistUserIDs, ","))
+		validUserIDs = make([]int64, 0, len(userIDs))
+		for _, userID := range userIDs {
+			has, err := HasAccess(userID, repo, ACCESS_MODE_WRITE)
+			if err != nil {
+				return fmt.Errorf("HasAccess [user_id: %d, repo_id: %d]: %v", userID, protectBranch.RepoID, err)
+			} else if !has {
+				continue // Drop invalid user ID
+			}
+
+			validUserIDs = append(validUserIDs, userID)
+		}
+
+		protectBranch.WhitelistUserIDs = strings.Join(base.Int64sToStrings(validUserIDs), ",")
+	}
+
+	hasTeamsChanged := false
+	validTeamIDs := base.StringsToInt64s(strings.Split(protectBranch.WhitelistTeamIDs, ","))
+	if protectBranch.WhitelistTeamIDs != whitelistTeamIDs {
+		hasTeamsChanged = true
+		teamIDs := base.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)
+		}
+		validTeamIDs = make([]int64, 0, len(teams))
+		for i := range teams {
+			if teams[i].HasWriteAccess() && com.IsSliceContainsInt64(teamIDs, teams[i].ID) {
+				validTeamIDs = append(validTeamIDs, teams[i].ID)
+			}
+		}
+
+		protectBranch.WhitelistTeamIDs = strings.Join(base.Int64sToStrings(validTeamIDs), ",")
+	}
+
+	// Merge users and members of teams
+	var whitelists []*ProtectBranchWhitelist
+	if hasUsersChanged || hasTeamsChanged {
+		mergedUserIDs := make(map[int64]bool)
+		for _, userID := range validUserIDs {
+			// Empty whitelist users can cause an ID with 0
+			if userID != 0 {
+				mergedUserIDs[userID] = true
+			}
+		}
+
+		for _, teamID := range validTeamIDs {
+			members, err := GetTeamMembers(teamID)
+			if err != nil {
+				return fmt.Errorf("GetTeamMembers [team_id: %d]: %v", teamID, err)
+			}
+
+			for i := range members {
+				mergedUserIDs[members[i].ID] = true
+			}
+		}
+
+		whitelists = make([]*ProtectBranchWhitelist, 0, len(mergedUserIDs))
+		for userID := range mergedUserIDs {
+			whitelists = append(whitelists, &ProtectBranchWhitelist{
+				ProtectBranchID: protectBranch.ID,
+				RepoID:          repo.ID,
+				Name:            protectBranch.Name,
+				UserID:          userID,
+			})
+		}
+	}
+
+	sess := x.NewSession()
+	defer sessionRelease(sess)
+	if err = sess.Begin(); err != nil {
+		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)
+	}
+
+	// Refresh whitelists
+	if hasUsersChanged || hasTeamsChanged {
+		if _, err = sess.Delete(&ProtectBranchWhitelist{ProtectBranchID: protectBranch.ID}); err != nil {
+			return fmt.Errorf("delete old protect branch whitelists: %v", err)
+		} else if _, err = sess.Insert(whitelists); err != nil {
+			return fmt.Errorf("insert new protect branch whitelists: %v", err)
+		}
+	}
+
+	return sess.Commit()
+}
+
+// GetProtectBranchesByRepoID returns a list of *ProtectBranch in given repostiory.
+func GetProtectBranchesByRepoID(repoID int64) ([]*ProtectBranch, error) {
+	protectBranches := make([]*ProtectBranch, 0, 2)
+	return protectBranches, x.Where("repo_id = ?", repoID).Asc("name").Find(&protectBranches)
+}
--- a/models/repo_collaboration.go
+++ b/models/repo_collaboration.go
@@ -6,6 +6,8 @@ package models

 import (
 	"fmt"
+
+	api "github.com/gogits/go-gogs-client"
 )

 // Collaboration represent the relation between an individual and a repository.
@@ -29,6 +31,16 @@ func (c *Collaboration) ModeI18nKey() string {
 	}
 }

+//IsCollaborator returns true if the user is a collaborator
+func (repo *Repository) IsCollaborator(uid int64) (bool, error) {
+	collaboration := &Collaboration{
+		RepoID: repo.ID,
+		UserID: uid,
+	}
+
+	return x.Get(collaboration)
+}
+
 // AddCollaborator adds new collaboration to a repository with default access mode.
 func (repo *Repository) AddCollaborator(u *User) error {
 	collaboration := &Collaboration{
@@ -50,17 +62,10 @@ func (repo *Repository) AddCollaborator(u *User) error {
 		return err
 	}

-	if _, err = sess.InsertOne(collaboration); err != nil {
+	if _, err = sess.Insert(collaboration); err != nil {
 		return err
-	}
-
-	if repo.Owner.IsOrganization() {
-		err = repo.recalculateTeamAccesses(sess, 0)
-	} else {
-		err = repo.recalculateAccesses(sess)
-	}
-	if err != nil {
-		return fmt.Errorf("recalculateAccesses 'team=%v': %v", repo.Owner.IsOrganization(), err)
+	} else if err = repo.recalculateAccesses(sess); err != nil {
+		return fmt.Errorf("recalculateAccesses [repo_id: %v]: %v", repo.ID, err)
 	}

 	return sess.Commit()
@@ -77,6 +82,17 @@ type Collaborator struct {
 	Collaboration *Collaboration
 }

+func (c *Collaborator) APIFormat() *api.Collaborator {
+	return &api.Collaborator{
+		User: c.User.APIFormat(),
+		Permissions: api.Permission{
+			Admin: c.Collaboration.Mode >= ACCESS_MODE_ADMIN,
+			Push:  c.Collaboration.Mode >= ACCESS_MODE_WRITE,
+			Pull:  c.Collaboration.Mode >= ACCESS_MODE_READ,
+		},
+	}
+}
+
 func (repo *Repository) getCollaborators(e Engine) ([]*Collaborator, error) {
 	collaborations, err := repo.getCollaborations(e)
 	if err != nil {
@@ -103,7 +119,7 @@ func (repo *Repository) GetCollaborators() ([]*Collaborator, error) {
 }

 // ChangeCollaborationAccessMode sets new access mode for the collaboration.
-func (repo *Repository) ChangeCollaborationAccessMode(uid int64, mode AccessMode) error {
+func (repo *Repository) ChangeCollaborationAccessMode(userID int64, mode AccessMode) error {
 	// Discard invalid input
 	if mode <= ACCESS_MODE_NONE || mode > ACCESS_MODE_OWNER {
 		return nil
@@ -111,7 +127,7 @@ func (repo *Repository) ChangeCollaborationAccessMode(uid int64, mode AccessMode

 	collaboration := &Collaboration{
 		RepoID: repo.ID,
-		UserID: uid,
+		UserID: userID,
 	}
 	has, err := x.Get(collaboration)
 	if err != nil {
@@ -125,6 +141,19 @@ func (repo *Repository) ChangeCollaborationAccessMode(uid int64, mode AccessMode
 	}
 	collaboration.Mode = mode

+	// If it's an organizational repository, merge with team access level for highest permission
+	if repo.Owner.IsOrganization() {
+		teams, err := GetUserTeams(repo.OwnerID, userID)
+		if err != nil {
+			return fmt.Errorf("GetUserTeams: [org_id: %d, user_id: %d]: %v", repo.OwnerID, userID, err)
+		}
+		for i := range teams {
+			if mode < teams[i].Authorize {
+				mode = teams[i].Authorize
+			}
+		}
+	}
+
 	sess := x.NewSession()
 	defer sessionRelease(sess)
 	if err = sess.Begin(); err != nil {
@@ -133,8 +162,24 @@ func (repo *Repository) ChangeCollaborationAccessMode(uid int64, mode AccessMode

 	if _, err = sess.Id(collaboration.ID).AllCols().Update(collaboration); err != nil {
 		return fmt.Errorf("update collaboration: %v", err)
-	} else if _, err = sess.Exec("UPDATE access SET mode = ? WHERE user_id = ? AND repo_id = ?", mode, uid, repo.ID); err != nil {
-		return fmt.Errorf("update access table: %v", err)
+	}
+
+	access := Access{
+		UserID: userID,
+		RepoID: repo.ID,
+	}
+	has, err = sess.Get(access)
+	if err != nil {
+		return fmt.Errorf("get access record: %v", err)
+	}
+	if has {
+		_, err = sess.Exec("UPDATE access SET mode = ? WHERE user_id = ? AND repo_id = ?", mode, userID, repo.ID)
+	} else {
+		access.Mode = mode
+		_, err = sess.Insert(access)
+	}
+	if err != nil {
+		return fmt.Errorf("update/insert access table: %v", err)
 	}

 	return sess.Commit()
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -736,7 +736,7 @@ func DeleteDeployKey(doer *User, id int64) error {
 		if err != nil {
 			return fmt.Errorf("GetRepositoryByID: %v", err)
 		}
-		yes, err := HasAccess(doer, repo, ACCESS_MODE_ADMIN)
+		yes, err := HasAccess(doer.ID, repo, ACCESS_MODE_ADMIN)
 		if err != nil {
 			return fmt.Errorf("HasAccess: %v", err)
 		} else if !yes {
--- a/models/update.go
+++ b/models/update.go
@@ -15,38 +15,6 @@ import (
 	git "github.com/gogits/git-module"
 )

-type UpdateTask struct {
-	ID          int64  `xorm:"pk autoincr"`
-	UUID        string `xorm:"index"`
-	RefName     string
-	OldCommitID string
-	NewCommitID string
-}
-
-func AddUpdateTask(task *UpdateTask) error {
-	_, err := x.Insert(task)
-	return err
-}
-
-// GetUpdateTaskByUUID returns update task by given UUID.
-func GetUpdateTaskByUUID(uuid string) (*UpdateTask, error) {
-	task := &UpdateTask{
-		UUID: uuid,
-	}
-	has, err := x.Get(task)
-	if err != nil {
-		return nil, err
-	} else if !has {
-		return nil, ErrUpdateTaskNotExist{uuid}
-	}
-	return task, nil
-}
-
-func DeleteUpdateTaskByUUID(uuid string) error {
-	_, err := x.Delete(&UpdateTask{UUID: uuid})
-	return err
-}
-
 // CommitToPushCommit transforms a git.Commit to PushCommit type.
 func CommitToPushCommit(commit *git.Commit) *PushCommit {
 	return &PushCommit{
@@ -74,13 +42,13 @@ func ListToPushCommits(l *list.List) *PushCommits {
 }

 type PushUpdateOptions struct {
+	OldCommitID  string
+	NewCommitID  string
+	RefFullName  string
 	PusherID     int64
 	PusherName   string
 	RepoUserName string
 	RepoName     string
-	RefFullName  string
-	OldCommitID  string
-	NewCommitID  string
 }

 // PushUpdate must be called for any push actions in order to
--- a/models/user.go
+++ b/models/user.go
@@ -373,7 +373,7 @@ func (u *User) UploadAvatar(data []byte) error {

 // DeleteAvatar deletes the user's custom avatar.
 func (u *User) DeleteAvatar() error {
-	log.Trace("DeleteAvatar[%d]: %s", u.ID, u.CustomAvatarPath())
+	log.Trace("DeleteAvatar [%d]: %s", u.ID, u.CustomAvatarPath())
 	os.Remove(u.CustomAvatarPath())

 	u.UseCustomAvatar = false
@@ -385,18 +385,18 @@ func (u *User) DeleteAvatar() error {

 // IsAdminOfRepo returns true if user has admin or higher access of repository.
 func (u *User) IsAdminOfRepo(repo *Repository) bool {
-	has, err := HasAccess(u, repo, ACCESS_MODE_ADMIN)
+	has, err := HasAccess(u.ID, repo, ACCESS_MODE_ADMIN)
 	if err != nil {
-		log.Error(3, "HasAccess: %v", err)
+		log.Error(2, "HasAccess: %v", err)
 	}
 	return has
 }

 // IsWriterOfRepo returns true if user has write access to given repository.
 func (u *User) IsWriterOfRepo(repo *Repository) bool {
-	has, err := HasAccess(u, repo, ACCESS_MODE_WRITE)
+	has, err := HasAccess(u.ID, repo, ACCESS_MODE_WRITE)
 	if err != nil {
-		log.Error(3, "HasAccess: %v", err)
+		log.Error(2, "HasAccess: %v", err)
 	}
 	return has
 }
@@ -911,7 +911,7 @@ func GetUserByID(id int64) (*User, error) {

 // GetAssigneeByID returns the user with write access of repository by given ID.
 func GetAssigneeByID(repo *Repository, userID int64) (*User, error) {
-	has, err := HasAccess(&User{ID: userID}, repo, ACCESS_MODE_WRITE)
+	has, err := HasAccess(userID, repo, ACCESS_MODE_READ)
 	if err != nil {
 		return nil, err
 	} else if !has {
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -5,7 +5,10 @@
 package models

 import (
+	"crypto/hmac"
+	"crypto/sha256"
 	"crypto/tls"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -118,7 +121,7 @@ func (w *Webhook) AfterSet(colName string, _ xorm.Cell) {
 	case "events":
 		w.HookEvent = &HookEvent{}
 		if err = json.Unmarshal([]byte(w.Events), w.HookEvent); err != nil {
-			log.Error(3, "Unmarshal[%d]: %v", w.ID, err)
+			log.Error(3, "Unmarshal [%d]: %v", w.ID, err)
 		}
 	case "created_unix":
 		w.Created = time.Unix(w.CreatedUnix, 0).Local()
@@ -130,7 +133,7 @@ func (w *Webhook) AfterSet(colName string, _ xorm.Cell) {
 func (w *Webhook) GetSlackHook() *SlackMeta {
 	s := &SlackMeta{}
 	if err := json.Unmarshal([]byte(w.Meta), s); err != nil {
-		log.Error(4, "webhook.GetSlackHook(%d): %v", w.ID, err)
+		log.Error(2, "GetSlackHook [%d]: %v", w.ID, err)
 	}
 	return s
 }
@@ -197,8 +200,17 @@ func getWebhook(bean *Webhook) (*Webhook, error) {
 	return bean, nil
 }

-// GetWebhookByRepoID returns webhook of repository by given ID.
-func GetWebhookByRepoID(repoID, id int64) (*Webhook, error) {
+// GetWebhookByID returns webhook by given ID.
+// Use this function with caution of accessing unauthorized webhook,
+// which means should only be used in non-user interactive functions.
+func GetWebhookByID(id int64) (*Webhook, error) {
+	return getWebhook(&Webhook{
+		ID: id,
+	})
+}
+
+// GetWebhookOfRepoByID returns webhook of repository by given ID.
+func GetWebhookOfRepoByID(repoID, id int64) (*Webhook, error) {
 	return getWebhook(&Webhook{
 		ID:     id,
 		RepoID: repoID,
@@ -216,10 +228,7 @@ func GetWebhookByOrgID(orgID, id int64) (*Webhook, error) {
 // GetActiveWebhooksByRepoID returns all active webhooks of repository.
 func GetActiveWebhooksByRepoID(repoID int64) ([]*Webhook, error) {
 	webhooks := make([]*Webhook, 0, 5)
-	return webhooks, x.Find(&webhooks, &Webhook{
-		RepoID:   repoID,
-		IsActive: true,
-	})
+	return webhooks, x.Where("repo_id = ?", repoID).And("is_active = ?", true).Find(&webhooks)
 }

 // GetWebhooksByRepoID returns all webhooks of a repository.
@@ -292,11 +301,13 @@ type HookTaskType int
 const (
 	GOGS HookTaskType = iota + 1
 	SLACK
+	DISCORD
 )

 var hookTaskTypes = map[string]HookTaskType{
-	"gogs":  GOGS,
-	"slack": SLACK,
+	"gogs":    GOGS,
+	"slack":   SLACK,
+	"discord": DISCORD,
 }

 // ToHookTaskType returns HookTaskType by given name.
@@ -310,6 +321,8 @@ func (t HookTaskType) Name() string {
 		return "gogs"
 	case SLACK:
 		return "slack"
+	case DISCORD:
+		return "discord"
 	}
 	return ""
 }
@@ -348,6 +361,7 @@ type HookTask struct {
 	UUID            string
 	Type            HookTaskType
 	URL             string `xorm:"TEXT"`
+	Signature       string `xorm:"TEXT"`
 	api.Payloader   `xorm:"-"`
 	PayloadContent  string `xorm:"TEXT"`
 	ContentType     HookContentType
@@ -435,29 +449,14 @@ func UpdateHookTask(t *HookTask) error {
 	return err
 }

-// PrepareWebhooks adds new webhooks to task queue for given payload.
-func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) error {
-	ws, err := GetActiveWebhooksByRepoID(repo.ID)
-	if err != nil {
-		return fmt.Errorf("GetActiveWebhooksByRepoID: %v", err)
-	}
-
-	// check if repo belongs to org and append additional webhooks
-	if repo.MustOwner().IsOrganization() {
-		// get hooks for org
-		orgws, err := GetActiveWebhooksByOrgID(repo.OwnerID)
-		if err != nil {
-			return fmt.Errorf("GetActiveWebhooksByOrgID: %v", err)
-		}
-		ws = append(ws, orgws...)
-	}
-
-	if len(ws) == 0 {
+// prepareWebhooks adds list of webhooks to task queue.
+func prepareWebhooks(repo *Repository, event HookEventType, p api.Payloader, webhooks []*Webhook) (err error) {
+	if len(webhooks) == 0 {
 		return nil
 	}

 	var payloader api.Payloader
-	for _, w := range ws {
+	for _, w := range webhooks {
 		switch event {
 		case HOOK_EVENT_CREATE:
 			if !w.HasCreateEvent() {
@@ -480,16 +479,32 @@ func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) err
 			if err != nil {
 				return fmt.Errorf("GetSlackPayload: %v", err)
 			}
+		case DISCORD:
+			payloader, err = GetDiscordPayload(p, event, w.Meta)
+			if err != nil {
+				return fmt.Errorf("GetDiscordPayload: %v", err)
+			}
 		default:
-			p.SetSecret(w.Secret)
 			payloader = p
 		}

+		var signature string
+		if len(w.Secret) > 0 {
+			data, err := payloader.JSONPayload()
+			if err != nil {
+				log.Error(2, "prepareWebhooks.JSONPayload: %v", err)
+			}
+			sig := hmac.New(sha256.New, []byte(w.Secret))
+			sig.Write(data)
+			signature = hex.EncodeToString(sig.Sum(nil))
+		}
+
 		if err = CreateHookTask(&HookTask{
 			RepoID:      repo.ID,
 			HookID:      w.ID,
 			Type:        w.HookTaskType,
 			URL:         w.URL,
+			Signature:   signature,
 			Payloader:   payloader,
 			ContentType: w.ContentType,
 			EventType:   event,
@@ -501,12 +516,41 @@ func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) err
 	return nil
 }

+// PrepareWebhooks adds all active webhooks to task queue.
+func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) error {
+	webhooks, err := GetActiveWebhooksByRepoID(repo.ID)
+	if err != nil {
+		return fmt.Errorf("GetActiveWebhooksByRepoID [%d]: %v", repo.ID, err)
+	}
+
+	// check if repo belongs to org and append additional webhooks
+	if repo.MustOwner().IsOrganization() {
+		// get hooks for org
+		orgws, err := GetActiveWebhooksByOrgID(repo.OwnerID)
+		if err != nil {
+			return fmt.Errorf("GetActiveWebhooksByOrgID [%d]: %v", repo.OwnerID, err)
+		}
+		webhooks = append(webhooks, orgws...)
+	}
+	return prepareWebhooks(repo, event, p, webhooks)
+}
+
+// TestWebhook adds the test webhook matches the ID to task queue.
+func TestWebhook(repo *Repository, event HookEventType, p api.Payloader, webhookID int64) error {
+	webhook, err := GetWebhookOfRepoByID(repo.ID, webhookID)
+	if err != nil {
+		return fmt.Errorf("GetWebhookOfRepoByID [repo_id: %d, id: %d]: %v", repo.ID, webhookID, err)
+	}
+	return prepareWebhooks(repo, event, p, []*Webhook{webhook})
+}
+
 func (t *HookTask) deliver() {
 	t.IsDelivered = true

 	timeout := time.Duration(setting.Webhook.DeliverTimeout) * time.Second
 	req := httplib.Post(t.URL).SetTimeout(timeout, timeout).
 		Header("X-Gogs-Delivery", t.UUID).
+		Header("X-Gogs-Signature", t.Signature).
 		Header("X-Gogs-Event", string(t.EventType)).
 		SetTLSClientConfig(&tls.Config{InsecureSkipVerify: setting.Webhook.SkipTLSVerify})

@@ -538,9 +582,9 @@ func (t *HookTask) deliver() {
 		}

 		// Update webhook last delivery status.
-		w, err := GetWebhookByRepoID(t.RepoID, t.HookID)
+		w, err := GetWebhookByID(t.HookID)
 		if err != nil {
-			log.Error(5, "GetWebhookByID: %v", err)
+			log.Error(3, "GetWebhookByID: %v", err)
 			return
 		}
 		if t.IsSucceed {
@@ -549,7 +593,7 @@ func (t *HookTask) deliver() {
 			w.LastStatus = HOOK_STATUS_FAILED
 		}
 		if err = UpdateWebhook(w); err != nil {
-			log.Error(5, "UpdateWebhook: %v", err)
+			log.Error(3, "UpdateWebhook: %v", err)
 			return
 		}
 	}()
--- a/models/webhook_discord.go
+++ b/models/webhook_discord.go
@@ -0,0 +1,227 @@
+// 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/json"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/gogits/git-module"
+	api "github.com/gogits/go-gogs-client"
+
+	"github.com/gogits/gogs/modules/setting"
+)
+
+type DiscordEmbedFooterObject struct {
+	Text string `json:"text"`
+}
+
+type DiscordEmbedAuthorObject struct {
+	Name    string `json:"name"`
+	URL     string `json:"url"`
+	IconURL string `json:"icon_url"`
+}
+
+type DiscordEmbedFieldObject struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+type DiscordEmbedObject struct {
+	Title       string                     `json:"title"`
+	Description string                     `json:"description"`
+	URL         string                     `json:"url"`
+	Color       int                        `json:"color"`
+	Footer      *DiscordEmbedFooterObject  `json:"footer"`
+	Author      *DiscordEmbedAuthorObject  `json:"author"`
+	Fields      []*DiscordEmbedFieldObject `json:"fields"`
+}
+
+type DiscordPayload struct {
+	Content   string                `json:"content"`
+	Username  string                `json:"username"`
+	AvatarURL string                `json:"avatar_url"`
+	Embeds    []*DiscordEmbedObject `json:"embeds"`
+}
+
+func (p *DiscordPayload) JSONPayload() ([]byte, error) {
+	data, err := json.MarshalIndent(p, "", "  ")
+	if err != nil {
+		return []byte{}, err
+	}
+	return data, nil
+}
+
+func DiscordTextFormatter(s string) string {
+	return strings.Split(s, "\n")[0]
+}
+
+func DiscordLinkFormatter(url string, text string) string {
+	return fmt.Sprintf("[%s](%s)", text, url)
+}
+
+func DiscordSHALinkFormatter(url string, text string) string {
+	return fmt.Sprintf("[`%s`](%s)", text, url)
+}
+
+func getDiscordCreatePayload(p *api.CreatePayload, slack *SlackMeta) (*DiscordPayload, error) {
+	// Created tag/branch
+	refName := git.RefEndName(p.Ref)
+
+	repoLink := DiscordLinkFormatter(p.Repo.HTMLURL, p.Repo.Name)
+	refLink := DiscordLinkFormatter(p.Repo.HTMLURL+"/src/"+refName, refName)
+	content := fmt.Sprintf("Created new %s: %s/%s", p.RefType, repoLink, refLink)
+
+	color, _ := strconv.ParseInt(strings.TrimLeft(slack.Color, "#"), 16, 32)
+	return &DiscordPayload{
+		Username:  slack.Username,
+		AvatarURL: slack.IconURL,
+		Embeds: []*DiscordEmbedObject{{
+			Description: content,
+			URL:         setting.AppUrl + p.Sender.UserName,
+			Color:       int(color),
+			Author: &DiscordEmbedAuthorObject{
+				Name:    p.Sender.UserName,
+				IconURL: p.Sender.AvatarUrl,
+			},
+		}},
+	}, nil
+}
+
+func getDiscordPushPayload(p *api.PushPayload, slack *SlackMeta) (*DiscordPayload, error) {
+	// n new commits
+	var (
+		branchName   = git.RefEndName(p.Ref)
+		commitDesc   string
+		commitString string
+	)
+
+	if len(p.Commits) == 1 {
+		commitDesc = "1 new commit"
+	} else {
+		commitDesc = fmt.Sprintf("%d new commits", len(p.Commits))
+	}
+
+	if len(p.CompareURL) > 0 {
+		commitString = DiscordLinkFormatter(p.CompareURL, commitDesc)
+	} else {
+		commitString = commitDesc
+	}
+
+	repoLink := DiscordLinkFormatter(p.Repo.HTMLURL, p.Repo.Name)
+	branchLink := DiscordLinkFormatter(p.Repo.HTMLURL+"/src/"+branchName, branchName)
+	content := fmt.Sprintf("Pushed %s to %s/%s\n", commitString, repoLink, branchLink)
+
+	// for each commit, generate attachment text
+	for i, commit := range p.Commits {
+		content += fmt.Sprintf("%s %s - %s", DiscordSHALinkFormatter(commit.URL, commit.ID[:7]), DiscordTextFormatter(commit.Message), commit.Author.Name)
+		// add linebreak to each commit but the last
+		if i < len(p.Commits)-1 {
+			content += "\n"
+		}
+	}
+
+	color, _ := strconv.ParseInt(strings.TrimLeft(slack.Color, "#"), 16, 32)
+	return &DiscordPayload{
+		Username:  slack.Username,
+		AvatarURL: slack.IconURL,
+		Embeds: []*DiscordEmbedObject{{
+			Description: content,
+			URL:         setting.AppUrl + p.Sender.UserName,
+			Color:       int(color),
+			Author: &DiscordEmbedAuthorObject{
+				Name:    p.Sender.UserName,
+				IconURL: p.Sender.AvatarUrl,
+			},
+		}},
+	}, 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)
+	content := ""
+	fields := make([]*DiscordEmbedFieldObject, 0, 1)
+	switch p.Action {
+	case api.HOOK_ISSUE_OPENED:
+		title = "New pull request: " + title
+		content = p.PullRequest.Body
+	case api.HOOK_ISSUE_CLOSED:
+		if p.PullRequest.HasMerged {
+			title = "Pull request merged: " + title
+		} else {
+			title = "Pull request closed: " + title
+		}
+	case api.HOOK_ISSUE_REOPENED:
+		title = "Pull request re-opened: " + title
+	case api.HOOK_ISSUE_EDITED:
+		title = "Pull request edited: " + title
+		content = p.PullRequest.Body
+	case api.HOOK_ISSUE_ASSIGNED:
+		title = "Pull request assigned: " + title
+		fields = []*DiscordEmbedFieldObject{{
+			Name:  "New Assignee",
+			Value: p.PullRequest.Assignee.UserName,
+		}}
+	case api.HOOK_ISSUE_UNASSIGNED:
+		title = "Pull request unassigned: " + title
+	case api.HOOK_ISSUE_LABEL_UPDATED:
+		title = "Pull request labels updated: " + title
+		labels := make([]string, len(p.PullRequest.Labels))
+		for i := range p.PullRequest.Labels {
+			labels[i] = p.PullRequest.Labels[i].Name
+		}
+		fields = []*DiscordEmbedFieldObject{{
+			Name:  "Labels",
+			Value: strings.Join(labels, ", "),
+		}}
+	case api.HOOK_ISSUE_LABEL_CLEARED:
+		title = "Pull request labels cleared: " + title
+	case api.HOOK_ISSUE_SYNCHRONIZED:
+		title = "Pull request synchronized: " + 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 GetDiscordPayload(p api.Payloader, event HookEventType, meta string) (*DiscordPayload, error) {
+	d := new(DiscordPayload)
+
+	slack := &SlackMeta{}
+	if err := json.Unmarshal([]byte(meta), &slack); err != nil {
+		return d, fmt.Errorf("GetDiscordPayload meta json: %v", err)
+	}
+
+	switch event {
+	case HOOK_EVENT_CREATE:
+		return getDiscordCreatePayload(p.(*api.CreatePayload), slack)
+	case HOOK_EVENT_PUSH:
+		return getDiscordPushPayload(p.(*api.PushPayload), slack)
+	case HOOK_EVENT_PULL_REQUEST:
+		return getDiscordPullRequestPayload(p.(*api.PullRequestPayload), slack)
+	}
+
+	return d, nil
+}
--- a/models/webhook_slack.go
+++ b/models/webhook_slack.go
@@ -6,7 +6,6 @@ package models

 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"strings"

@@ -23,16 +22,6 @@ type SlackMeta struct {
 	Color    string `json:"color"`
 }

-type SlackPayload struct {
-	Channel     string            `json:"channel"`
-	Text        string            `json:"text"`
-	Username    string            `json:"username"`
-	IconURL     string            `json:"icon_url"`
-	UnfurlLinks int               `json:"unfurl_links"`
-	LinkNames   int               `json:"link_names"`
-	Attachments []SlackAttachment `json:"attachments"`
-}
-
 type SlackAttachment struct {
 	Fallback string `json:"fallback"`
 	Color    string `json:"color"`
@@ -40,7 +29,15 @@ type SlackAttachment struct {
 	Text     string `json:"text"`
 }

-func (p *SlackPayload) SetSecret(_ string) {}
+type SlackPayload struct {
+	Channel     string             `json:"channel"`
+	Text        string             `json:"text"`
+	Username    string             `json:"username"`
+	IconURL     string             `json:"icon_url"`
+	UnfurlLinks int                `json:"unfurl_links"`
+	LinkNames   int                `json:"link_names"`
+	Attachments []*SlackAttachment `json:"attachments"`
+}

 func (p *SlackPayload) JSONPayload() ([]byte, error) {
 	data, err := json.MarshalIndent(p, "", "  ")
@@ -73,7 +70,7 @@ func SlackLinkFormatter(url string, text string) string {
 }

 func getSlackCreatePayload(p *api.CreatePayload, slack *SlackMeta) (*SlackPayload, error) {
-	// created tag/branch
+	// Created tag/branch
 	refName := git.RefEndName(p.Ref)

 	repoLink := SlackLinkFormatter(p.Repo.HTMLURL, p.Repo.Name)
@@ -126,7 +123,7 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e
 		Text:     text,
 		Username: slack.Username,
 		IconURL:  slack.IconURL,
-		Attachments: []SlackAttachment{{
+		Attachments: []*SlackAttachment{{
 			Color: slack.Color,
 			Text:  attachmentText,
 		}},
@@ -173,7 +170,7 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S
 		Text:     text,
 		Username: slack.Username,
 		IconURL:  slack.IconURL,
-		Attachments: []SlackAttachment{{
+		Attachments: []*SlackAttachment{{
 			Color: slack.Color,
 			Title: title,
 			Text:  attachmentText,
@@ -186,7 +183,7 @@ func GetSlackPayload(p api.Payloader, event HookEventType, meta string) (*SlackP

 	slack := &SlackMeta{}
 	if err := json.Unmarshal([]byte(meta), &slack); err != nil {
-		return s, errors.New("GetSlackPayload meta json:" + err.Error())
+		return s, fmt.Errorf("GetSlackPayload meta json: %v", err)
 	}

 	switch event {
--- a/models/wiki.go
+++ b/models/wiki.go
@@ -25,14 +25,14 @@ var wikiWorkingPool = sync.NewExclusivePool()

 // ToWikiPageURL formats a string to corresponding wiki URL name.
 func ToWikiPageURL(name string) string {
-	return url.QueryEscape(strings.Replace(name, " ", "-", -1))
+	return url.QueryEscape(name)
 }

 // ToWikiPageName formats a URL back to corresponding wiki page name,
 // and removes leading characters './' to prevent changing files
 // that are not belong to wiki repository.
 func ToWikiPageName(urlString string) string {
-	name, _ := url.QueryUnescape(strings.Replace(urlString, "-", " ", -1))
+	name, _ := url.QueryUnescape(urlString)
 	return strings.Replace(strings.TrimLeft(name, "./"), "/", " ", -1)
 }

@@ -64,8 +64,8 @@ func (repo *Repository) InitWiki() error {

 	if err := git.InitRepository(repo.WikiPath(), true); err != nil {
 		return fmt.Errorf("InitRepository: %v", err)
-	} else if err = createUpdateHook(repo.WikiPath()); err != nil {
-		return fmt.Errorf("createUpdateHook: %v", err)
+	} else if err = createDelegateHooks(repo.WikiPath()); err != nil {
+		return fmt.Errorf("createDelegateHooks: %v", err)
 	}
 	return nil
 }
@@ -76,9 +76,7 @@ func (repo *Repository) LocalWikiPath() string {

 // UpdateLocalWiki makes sure the local copy of repository wiki is up-to-date.
 func (repo *Repository) UpdateLocalWiki() error {
-	// Don't pass branch name here because it fails to clone and
-	// checkout to a specific branch when wiki is an empty repository.
-	return UpdateLocalCopyBranch(repo.WikiPath(), repo.LocalWikiPath(), "")
+	return UpdateLocalCopyBranch(repo.WikiPath(), repo.LocalWikiPath(), "master", true)
 }

 func discardLocalWikiChanges(localPath string) error {
--- a/modules/auth/auth.go
+++ b/modules/auth/auth.go
@@ -49,14 +49,14 @@ func SignedInID(ctx *macaron.Context, sess session.Store) int64 {
 		if len(tokenSHA) > 0 {
 			t, err := models.GetAccessTokenBySHA(tokenSHA)
 			if err != nil {
-				if models.IsErrAccessTokenNotExist(err) || models.IsErrAccessTokenEmpty(err) {
-					log.Error(4, "GetAccessTokenBySHA: %v", err)
+				if !models.IsErrAccessTokenNotExist(err) && !models.IsErrAccessTokenEmpty(err) {
+					log.Error(2, "GetAccessTokenBySHA: %v", err)
 				}
 				return 0
 			}
 			t.Updated = time.Now()
 			if err = models.UpdateAccessToken(t); err != nil {
-				log.Error(4, "UpdateAccessToken: %v", err)
+				log.Error(2, "UpdateAccessToken: %v", err)
 			}
 			return t.UID
 		}
@@ -69,7 +69,7 @@ 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(4, "GetUserById: %v", err)
+				log.Error(2, "GetUserById: %v", err)
 			}
 			return 0
 		}
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -106,6 +106,25 @@ func (f *RepoSettingForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }

+// __________                             .__
+// \______   \____________    ____   ____ |  |__
+//  |    |  _/\_  __ \__  \  /    \_/ ___\|  |  \
+//  |    |   \ |  | \// __ \|   |  \  \___|   Y  \
+//  |______  / |__|  (____  /___|  /\___  >___|  /
+//         \/             \/     \/     \/     \/
+
+type ProtectBranchForm struct {
+	Protected          bool
+	RequirePullRequest bool
+	EnableWhitelist    bool
+	WhitelistUsers     string
+	WhitelistTeams     string
+}
+
+func (f *ProtectBranchForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
+
 //  __      __      ___.   .__    .__            __
 // /  \    /  \ ____\_ |__ |  |__ |  |__   ____ |  | __
 // \   \/\/   // __ \| __ \|  |  \|  |  \ /  _ \|  |/ /
@@ -157,6 +176,18 @@ func (f *NewSlackHookForm) Validate(ctx *macaron.Context, errs binding.Errors) b
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }

+type NewDiscordHookForm struct {
+	PayloadURL string `binding:"Required;Url"`
+	Username   string
+	IconURL    string
+	Color      string
+	WebhookForm
+}
+
+func (f *NewDiscordHookForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
+
 // .___
 // |   | ______ ________ __   ____
 // |   |/  ___//  ___/  |  \_/ __ \
@@ -300,6 +331,10 @@ func (f *EditRepoFileForm) Validate(ctx *macaron.Context, errs binding.Errors) b
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }

+func (f *EditRepoFileForm) IsNewBrnach() bool {
+	return f.CommitChoice == "commit-to-new-branch"
+}
+
 type EditPreviewDiffForm struct {
 	Content string
 }
@@ -329,6 +364,10 @@ func (f *UploadRepoFileForm) Validate(ctx *macaron.Context, errs binding.Errors)
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }

+func (f *UploadRepoFileForm) IsNewBrnach() bool {
+	return f.CommitChoice == "commit-to-new-branch"
+}
+
 type RemoveUploadFileForm struct {
 	File string `binding:"Required;MaxSize(50)"`
 }
@@ -354,3 +393,7 @@ type DeleteRepoFileForm struct {
 func (f *DeleteRepoFileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }
+
+func (f *DeleteRepoFileForm) IsNewBrnach() bool {
+	return f.CommitChoice == "commit-to-new-branch"
+}
--- a/modules/auth/user_form.go
+++ b/modules/auth/user_form.go
@@ -20,18 +20,19 @@ type InstallForm struct {
 	SSLMode  string
 	DbPath   string

-	AppName      string `binding:"Required" locale:"install.app_name"`
-	RepoRootPath string `binding:"Required"`
-	RunUser      string `binding:"Required"`
-	Domain       string `binding:"Required"`
-	SSHPort      int
-	HTTPPort     string `binding:"Required"`
-	AppUrl       string `binding:"Required"`
-	LogRootPath  string `binding:"Required"`
+	AppName             string `binding:"Required" locale:"install.app_name"`
+	RepoRootPath        string `binding:"Required"`
+	RunUser             string `binding:"Required"`
+	Domain              string `binding:"Required"`
+	SSHPort             int
+	UseBuiltinSSHServer bool
+	HTTPPort            string `binding:"Required"`
+	AppUrl              string `binding:"Required"`
+	LogRootPath         string `binding:"Required"`

 	SMTPHost        string
 	SMTPFrom        string
-	SMTPEmail       string `binding:"OmitEmpty;Email;MaxSize(254)" locale:"install.mailer_user"`
+	SMTPUser        string `binding:"OmitEmpty;MaxSize(254)" locale:"install.mailer_user"`
 	SMTPPasswd      string
 	RegisterConfirm bool
 	MailNotify      bool
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -181,11 +181,12 @@ func HashEmail(email string) string {
 // which includes app sub-url as prefix. However, it is possible
 // to return full URL if user enables Gravatar-like service.
 func AvatarLink(email string) (url string) {
-	if setting.EnableFederatedAvatar && setting.LibravatarService != nil {
+	if setting.EnableFederatedAvatar && setting.LibravatarService != nil &&
+		strings.Contains(email, "@") {
 		var err error
 		url, err = setting.LibravatarService.FromEmail(email)
 		if err != nil {
-			log.Error(4, "LibravatarService.FromEmail [%s]: %v", email, err)
+			log.Warn("AvatarLink.LibravatarService.FromEmail [%s]: %v", email, err)
 		}
 	}
 	if len(url) == 0 && !setting.DisableGravatar {
--- a/modules/bindata/bindata.go
+++ b/modules/bindata/bindata.go
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -94,7 +94,7 @@ func (ctx *Context) Handle(status int, title string, err error) {
 		ctx.Data["Title"] = "Page Not Found"
 	case 500:
 		ctx.Data["Title"] = "Internal Server Error"
-		log.Error(4, "%s: %v", title, err)
+		log.Error(2, "%s: %v", title, err)
 		if !setting.ProdMode || (ctx.IsSigned && ctx.User.IsAdmin) {
 			ctx.Data["ErrorMsg"] = err
 		}
@@ -112,7 +112,7 @@ func (ctx *Context) NotFound() {
 // 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.Handle(404, title, err)
+		ctx.NotFound()
 		return
 	}

--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -73,7 +73,7 @@ func (r *Repository) HasAccess() bool {

 // 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()
+	return r.Repository.CanEnableEditor() && r.IsViewBranch && r.IsWriter() && !r.Repository.IsBranchRequirePullRequest(r.BranchName)
 }

 // GetEditorconfig returns the .editorconfig definition if found in the
@@ -98,6 +98,16 @@ func (r *Repository) GetEditorconfig() (*editorconfig.Editorconfig, error) {
 	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 {
@@ -146,18 +156,18 @@ func RepoAssignment(args ...bool) macaron.Handler {
 			err   error
 		)

-		userName := ctx.Params(":username")
-		repoName := ctx.Params(":reponame")
+		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(userName) {
+		if ctx.IsSigned && ctx.User.LowerName == strings.ToLower(ownerName) {
 			owner = ctx.User
 		} else {
-			owner, err = models.GetUserByName(userName)
+			owner, err = models.GetUserByName(ownerName)
 			if err != nil {
 				if models.IsErrUserNotExist(err) {
 					if ctx.Query("go-get") == "1" {
@@ -196,7 +206,11 @@ func RepoAssignment(args ...bool) macaron.Handler {
 		if ctx.IsSigned && ctx.User.IsAdmin {
 			ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER
 		} else {
-			mode, err := models.AccessLevel(ctx.User, repo)
+			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
@@ -230,9 +244,9 @@ func RepoAssignment(args ...bool) macaron.Handler {
 		ctx.Data["RepoName"] = ctx.Repo.Repository.Name
 		ctx.Data["IsBareRepo"] = ctx.Repo.Repository.IsBare

-		gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName))
+		gitRepo, err := git.OpenRepository(models.RepoPath(ownerName, repoName))
 		if err != nil {
-			ctx.Handle(500, "RepoAssignment Invalid repo "+models.RepoPath(userName, repoName), err)
+			ctx.Handle(500, "RepoAssignment Invalid repo "+models.RepoPath(ownerName, repoName), err)
 			return
 		}
 		ctx.Repo.GitRepo = gitRepo
--- a/modules/cron/cron.go
+++ b/modules/cron/cron.go
@@ -25,7 +25,7 @@ func NewContext() {
 	if setting.Cron.UpdateMirror.Enabled {
 		entry, err = c.AddFunc("Update mirrors", setting.Cron.UpdateMirror.Schedule, models.MirrorUpdate)
 		if err != nil {
-			log.Fatal(4, "Cron[Update mirrors]: %v", err)
+			log.Fatal(2, "Cron.(update mirrors): %v", err)
 		}
 		if setting.Cron.UpdateMirror.RunAtStart {
 			entry.Prev = time.Now()
@@ -36,7 +36,7 @@ func NewContext() {
 	if setting.Cron.RepoHealthCheck.Enabled {
 		entry, err = c.AddFunc("Repository health check", setting.Cron.RepoHealthCheck.Schedule, models.GitFsck)
 		if err != nil {
-			log.Fatal(4, "Cron[Repository health check]: %v", err)
+			log.Fatal(2, "Cron.(repository health check): %v", err)
 		}
 		if setting.Cron.RepoHealthCheck.RunAtStart {
 			entry.Prev = time.Now()
@@ -47,7 +47,7 @@ func NewContext() {
 	if setting.Cron.CheckRepoStats.Enabled {
 		entry, err = c.AddFunc("Check repository statistics", setting.Cron.CheckRepoStats.Schedule, models.CheckRepoStats)
 		if err != nil {
-			log.Fatal(4, "Cron[Check repository statistics]: %v", err)
+			log.Fatal(2, "Cron.(check repository statistics): %v", err)
 		}
 		if setting.Cron.CheckRepoStats.RunAtStart {
 			entry.Prev = time.Now()
@@ -55,6 +55,17 @@ func NewContext() {
 			go models.CheckRepoStats()
 		}
 	}
+	if setting.Cron.RepoArchiveCleanup.Enabled {
+		entry, err = c.AddFunc("Repository archive cleanup", setting.Cron.RepoArchiveCleanup.Schedule, models.DeleteOldRepositoryArchives)
+		if err != nil {
+			log.Fatal(2, "Cron.(repository archive cleanup): %v", err)
+		}
+		if setting.Cron.RepoArchiveCleanup.RunAtStart {
+			entry.Prev = time.Now()
+			entry.ExecTimes++
+			go models.DeleteOldRepositoryArchives()
+		}
+	}
 	c.Start()
 }

--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -98,22 +98,14 @@ var (
 	LogInRememberDays    int
 	CookieUserName       string
 	CookieRememberName   string
+	CookieSecure         bool
 	ReverseProxyAuthUser string

 	// Database settings
 	UseSQLite3    bool
 	UseMySQL      bool
 	UsePostgreSQL bool
-	UseTiDB       bool
-
-	// Webhook settings
-	Webhook struct {
-		QueueLength    int
-		DeliverTimeout int
-		SkipTLSVerify  bool
-		Types          []string
-		PagingNum      int
-	}
+	UseMSSQL      bool

 	// Repository settings
 	Repository struct {
@@ -125,6 +117,7 @@ var (
 		PreferredLicenses        []string
 		DisableHTTPGit           bool `ini:"DISABLE_HTTP_GIT"`
 		EnableLocalPathMigration bool
+		CommitsFetchConcurrency  int

 		// Repository editor settings
 		Editor struct {
@@ -144,6 +137,15 @@ var (
 	RepoRootPath string
 	ScriptType   string

+	// Webhook settings
+	Webhook struct {
+		Types          []string
+		QueueLength    int
+		DeliverTimeout int
+		SkipTLSVerify  bool
+		PagingNum      int
+	}
+
 	// Markdown sttings
 	Markdown struct {
 		EnableHardLineBreak bool
@@ -185,7 +187,7 @@ var (

 	// Session settings
 	SessionConfig  session.Options
-	CSRFCookieName = "_csrf"
+	CSRFCookieName string

 	// Cron tasks
 	Cron struct {
@@ -206,6 +208,12 @@ var (
 			RunAtStart bool
 			Schedule   string
 		} `ini:"cron.check_repo_stats"`
+		RepoArchiveCleanup struct {
+			Enabled    bool
+			RunAtStart bool
+			Schedule   string
+			OlderThan  time.Duration
+		} `ini:"cron.repo_archive_cleanup"`
 	}

 	// Git settings
@@ -300,7 +308,7 @@ func init() {

 	var err error
 	if AppPath, err = execPath(); err != nil {
-		log.Fatal(4, "Fail to get app path: %v\n", err)
+		log.Fatal(2, "Fail to get app path: %v\n", err)
 	}

 	// Note: we don't use path.Dir here because it does not handle case
@@ -324,7 +332,7 @@ func WorkDir() (string, error) {

 func forcePathSeparator(path string) {
 	if strings.Contains(path, "\\") {
-		log.Fatal(4, "Do not use '\\' or '\\\\' in paths, instead, please use '/' in all places")
+		log.Fatal(2, "Do not use '\\' or '\\\\' in paths, instead, please use '/' in all places")
 	}
 }

@@ -346,12 +354,12 @@ func IsRunUserMatchCurrentUser(runUser string) (string, bool) {
 func NewContext() {
 	workDir, err := WorkDir()
 	if err != nil {
-		log.Fatal(4, "Fail to get work directory: %v", err)
+		log.Fatal(2, "Fail to get work directory: %v", err)
 	}

 	Cfg, err = ini.Load(bindata.MustAsset("conf/app.ini"))
 	if err != nil {
-		log.Fatal(4, "Fail to parse 'conf/app.ini': %v", err)
+		log.Fatal(2, "Fail to parse 'conf/app.ini': %v", err)
 	}

 	CustomPath = os.Getenv("GOGS_CUSTOM")
@@ -365,7 +373,7 @@ func NewContext() {

 	if com.IsFile(CustomConf) {
 		if err = Cfg.Append(CustomConf); err != nil {
-			log.Fatal(4, "Fail to load custom conf '%s': %v", CustomConf, err)
+			log.Fatal(2, "Fail to load custom conf '%s': %v", CustomConf, err)
 		}
 	} else {
 		log.Warn("Custom config '%s' not found, ignore this if you're running first time", CustomConf)
@@ -374,7 +382,7 @@ func NewContext() {

 	homeDir, err := com.HomeDir()
 	if err != nil {
-		log.Fatal(4, "Fail to get home directory: %v", err)
+		log.Fatal(2, "Fail to get home directory: %v", err)
 	}
 	homeDir = strings.Replace(homeDir, "\\", "/", -1)

@@ -382,7 +390,7 @@ func NewContext() {
 	forcePathSeparator(LogRootPath)

 	sec := Cfg.Section("server")
-	AppName = Cfg.Section("").Key("APP_NAME").MustString("Gogs: Go Git Service")
+	AppName = Cfg.Section("").Key("APP_NAME").MustString("Gogs")
 	AppUrl = sec.Key("ROOT_URL").MustString("http://localhost:3000/")
 	if AppUrl[len(AppUrl)-1] != '/' {
 		AppUrl += "/"
@@ -391,7 +399,7 @@ func NewContext() {
 	// Check if has app suburl.
 	url, err := url.Parse(AppUrl)
 	if err != nil {
-		log.Fatal(4, "Invalid ROOT_URL '%s': %s", AppUrl, err)
+		log.Fatal(2, "Invalid ROOT_URL '%s': %s", AppUrl, err)
 	}
 	// Suburl should start with '/' and end without '/', such as '/{subpath}'.
 	// This value is empty if site does not have sub-url.
@@ -410,7 +418,7 @@ func NewContext() {
 		UnixSocketPermissionRaw := sec.Key("UNIX_SOCKET_PERMISSION").MustString("666")
 		UnixSocketPermissionParsed, err := strconv.ParseUint(UnixSocketPermissionRaw, 8, 32)
 		if err != nil || UnixSocketPermissionParsed > 0777 {
-			log.Fatal(4, "Fail to parse unixSocketPermission: %s", UnixSocketPermissionRaw)
+			log.Fatal(2, "Fail to parse unixSocketPermission: %s", UnixSocketPermissionRaw)
 		}
 		UnixSocketPermission = uint32(UnixSocketPermissionParsed)
 	}
@@ -435,7 +443,7 @@ func NewContext() {
 	SSH.ServerCiphers = sec.Key("SSH_SERVER_CIPHERS").Strings(",")
 	SSH.KeyTestPath = os.TempDir()
 	if err = Cfg.Section("server").MapTo(&SSH); err != nil {
-		log.Fatal(4, "Fail to map SSH settings: %v", err)
+		log.Fatal(2, "Fail to map SSH settings: %v", err)
 	}
 	// When disable SSH, start builtin server value is ignored.
 	if SSH.Disabled {
@@ -444,9 +452,9 @@ func NewContext() {

 	if !SSH.Disabled && !SSH.StartBuiltinServer {
 		if err := os.MkdirAll(SSH.RootPath, 0700); err != nil {
-			log.Fatal(4, "Fail to create '%s': %v", SSH.RootPath, err)
+			log.Fatal(2, "Fail to create '%s': %v", SSH.RootPath, err)
 		} else if err = os.MkdirAll(SSH.KeyTestPath, 0644); err != nil {
-			log.Fatal(4, "Fail to create '%s': %v", SSH.KeyTestPath, err)
+			log.Fatal(2, "Fail to create '%s': %v", SSH.KeyTestPath, err)
 		}
 	}

@@ -465,6 +473,7 @@ func NewContext() {
 	LogInRememberDays = sec.Key("LOGIN_REMEMBER_DAYS").MustInt()
 	CookieUserName = sec.Key("COOKIE_USERNAME").String()
 	CookieRememberName = sec.Key("COOKIE_REMEMBER_NAME").String()
+	CookieSecure = sec.Key("COOKIE_SECURE").MustBool(false)
 	ReverseProxyAuthUser = sec.Key("REVERSE_PROXY_AUTHENTICATION_USER").MustString("X-WEBAUTH-USER")

 	sec = Cfg.Section("attachment")
@@ -500,7 +509,7 @@ func NewContext() {
 	if InstallLock {
 		currentUser, match := IsRunUserMatchCurrentUser(RunUser)
 		if !match {
-			log.Fatal(4, "Expect user '%s' but current user is: %s", RunUser, currentUser)
+			log.Fatal(2, "Expect user '%s' but current user is: %s", RunUser, currentUser)
 		}
 	}

@@ -517,11 +526,11 @@ func NewContext() {
 	}
 	ScriptType = sec.Key("SCRIPT_TYPE").MustString("bash")
 	if err = Cfg.Section("repository").MapTo(&Repository); err != nil {
-		log.Fatal(4, "Fail to map Repository settings: %v", err)
+		log.Fatal(2, "Fail to map Repository settings: %v", err)
 	} else if err = Cfg.Section("repository.editor").MapTo(&Repository.Editor); err != nil {
-		log.Fatal(4, "Fail to map Repository.Editor settings: %v", err)
+		log.Fatal(2, "Fail to map Repository.Editor settings: %v", err)
 	} else if err = Cfg.Section("repository.upload").MapTo(&Repository.Upload); err != nil {
-		log.Fatal(4, "Fail to map Repository.Upload settings: %v", err)
+		log.Fatal(2, "Fail to map Repository.Upload settings: %v", err)
 	}

 	if !filepath.IsAbs(Repository.Upload.TempPath) {
@@ -569,21 +578,23 @@ func NewContext() {
 	}

 	if err = Cfg.Section("http").MapTo(&HTTP); err != nil {
-		log.Fatal(4, "Fail to map HTTP settings: %v", err)
+		log.Fatal(2, "Fail to map HTTP settings: %v", err)
+	} else if err = Cfg.Section("webhook").MapTo(&Webhook); err != nil {
+		log.Fatal(2, "Fail to map Webhook settings: %v", err)
 	} else if err = Cfg.Section("markdown").MapTo(&Markdown); err != nil {
-		log.Fatal(4, "Fail to map Markdown settings: %v", err)
+		log.Fatal(2, "Fail to map Markdown settings: %v", err)
 	} else if err = Cfg.Section("admin").MapTo(&Admin); err != nil {
-		log.Fatal(4, "Fail to map Admin settings: %v", err)
+		log.Fatal(2, "Fail to map Admin settings: %v", err)
 	} else if err = Cfg.Section("cron").MapTo(&Cron); err != nil {
-		log.Fatal(4, "Fail to map Cron settings: %v", err)
+		log.Fatal(2, "Fail to map Cron settings: %v", err)
 	} else if err = Cfg.Section("git").MapTo(&Git); err != nil {
-		log.Fatal(4, "Fail to map Git settings: %v", err)
+		log.Fatal(2, "Fail to map Git settings: %v", err)
 	} else if err = Cfg.Section("mirror").MapTo(&Mirror); err != nil {
-		log.Fatal(4, "Fail to map Mirror settings: %v", err)
+		log.Fatal(2, "Fail to map Mirror settings: %v", err)
 	} else if err = Cfg.Section("api").MapTo(&API); err != nil {
-		log.Fatal(4, "Fail to map API settings: %v", err)
+		log.Fatal(2, "Fail to map API settings: %v", err)
 	} else if err = Cfg.Section("ui").MapTo(&UI); err != nil {
-		log.Fatal(4, "Fail to map UI settings: %v", err)
+		log.Fatal(2, "Fail to map UI settings: %v", err)
 	}

 	if Mirror.DefaultInterval <= 0 {
@@ -650,7 +661,7 @@ func newLogService() {
 		mode = strings.ToLower(strings.TrimSpace(mode))
 		sec, err := Cfg.GetSection("log." + mode)
 		if err != nil {
-			log.Fatal(4, "Unknown logger mode: %s", mode)
+			log.Fatal(2, "Unknown logger mode: %s", mode)
 		}

 		validLevels := []string{"trace", "info", "warn", "error", "fatal"}
@@ -675,7 +686,7 @@ func newLogService() {
 		case log.FILE:
 			logPath := path.Join(LogRootPath, "gogs.log")
 			if err = os.MkdirAll(path.Dir(logPath), os.ModePerm); err != nil {
-				log.Fatal(4, "Fail to create log directory '%s': %v", path.Dir(logPath), err)
+				log.Fatal(2, "Fail to create log directory '%s': %v", path.Dir(logPath), err)
 			}

 			LogConfigs[i] = log.FileConfig{
@@ -718,7 +729,7 @@ func newCacheService() {
 	case "redis", "memcache":
 		CacheConn = strings.Trim(Cfg.Section("cache").Key("HOST").String(), "\" ")
 	default:
-		log.Fatal(4, "Unknown cache adapter: %s", CacheAdapter)
+		log.Fatal(2, "Unknown cache adapter: %s", CacheAdapter)
 	}

 	log.Info("Cache Service Enabled")
@@ -733,6 +744,7 @@ func newSessionService() {
 	SessionConfig.Secure = Cfg.Section("session").Key("COOKIE_SECURE").MustBool()
 	SessionConfig.Gclifetime = Cfg.Section("session").Key("GC_INTERVAL_TIME").MustInt64(86400)
 	SessionConfig.Maxlifetime = Cfg.Section("session").Key("SESSION_LIFE_TIME").MustInt64(86400)
+	CSRFCookieName = Cfg.Section("session").Key("CSRF_COOKIE_NAME").MustString("_csrf")

 	log.Info("Session Service Enabled")
 }
@@ -780,11 +792,13 @@ func newMailService() {
 	}
 	MailService.From = sec.Key("FROM").MustString(MailService.User)

-	parsed, err := mail.ParseAddress(MailService.From)
-	if err != nil {
-		log.Fatal(4, "Invalid mailer.FROM (%s): %v", MailService.From, err)
+	if len(MailService.From) > 0 {
+		parsed, err := mail.ParseAddress(MailService.From)
+		if err != nil {
+			log.Fatal(2, "Invalid mailer.FROM (%s): %v", MailService.From, err)
+		}
+		MailService.FromEmail = parsed.Address
 	}
-	MailService.FromEmail = parsed.Address

 	log.Info("Mail Service Enabled")
 }
@@ -811,15 +825,6 @@ func newNotifyMailService() {
 	log.Info("Notify Mail Service Enabled")
 }

-func newWebhookService() {
-	sec := Cfg.Section("webhook")
-	Webhook.QueueLength = sec.Key("QUEUE_LENGTH").MustInt(1000)
-	Webhook.DeliverTimeout = sec.Key("DELIVER_TIMEOUT").MustInt(5)
-	Webhook.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool()
-	Webhook.Types = []string{"gogs", "slack"}
-	Webhook.PagingNum = sec.Key("PAGING_NUM").MustInt(10)
-}
-
 func NewService() {
 	newService()
 }
@@ -832,5 +837,4 @@ func NewServices() {
 	newMailService()
 	newRegisterMailService()
 	newNotifyMailService()
-	newWebhookService()
 }
--- a/modules/ssh/ssh.go
+++ b/modules/ssh/ssh.go
@@ -166,7 +166,7 @@ func Listen(host string, port int, ciphers []string) {
 	keyPath := filepath.Join(setting.AppDataPath, "ssh/gogs.rsa")
 	if !com.IsExist(keyPath) {
 		os.MkdirAll(filepath.Dir(keyPath), os.ModePerm)
-		_, stderr, err := com.ExecCmd("ssh-keygen", "-f", keyPath, "-t", "rsa", "-N", "")
+		_, stderr, err := com.ExecCmd(setting.SSH.KeygenPath, "-f", keyPath, "-t", "rsa", "-N", "")
 		if err != nil {
 			panic(fmt.Sprintf("Fail to generate private key: %v - %s", err, stderr))
 		}
--- a/modules/template/highlight/highlight.go
+++ b/modules/template/highlight/highlight.go
@@ -20,6 +20,7 @@ var (

 	// File names that are representing highlight classes.
 	highlightFileNames = map[string]bool{
+		"cmakelists.txt": true,
 		"dockerfile": true,
 		"makefile":   true,
 	}
--- a/modules/template/template.go
+++ b/modules/template/template.go
@@ -15,6 +15,7 @@ import (
 	"strings"
 	"time"

+	"github.com/microcosm-cc/bluemonday"
 	"golang.org/x/net/html/charset"
 	"golang.org/x/text/transform"
 	log "gopkg.in/clog.v1"
@@ -60,6 +61,7 @@ func NewFuncMap() []template.FuncMap {
 		},
 		"AvatarLink":   base.AvatarLink,
 		"Safe":         Safe,
+		"Sanitize":     bluemonday.UGCPolicy().Sanitize,
 		"Str2html":     Str2html,
 		"TimeSince":    base.TimeSince,
 		"RawTimeSince": base.RawTimeSince,
@@ -89,6 +91,7 @@ func NewFuncMap() []template.FuncMap {
 			}
 			return str[start:end]
 		},
+		"Join":              strings.Join,
 		"EllipsisString":    base.EllipsisString,
 		"DiffTypeToStr":     DiffTypeToStr,
 		"DiffLineTypeToStr": DiffLineTypeToStr,
--- a/packager/Procfile
+++ b/packager/Procfile
@@ -1 +1 @@
-web: ./gogs web
+web: ./gogs web -p ${PORT:=3000}
--- a/public/config.codekit
+++ b/public/config.codekit
@@ -20,11 +20,11 @@
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0
 		},
-	"\/css\/semantic-2.2.7.min.css": {
+	"\/css\/semantic-2.2.9.min.css": {
 		"fileType": 16,
 		"ignore": 1,
 		"ignoreWasSetByUser": 1,
-		"inputAbbreviatedPath": "\/css\/semantic-2.2.7.min.css",
+		"inputAbbreviatedPath": "\/css\/semantic-2.2.9.min.css",
 		"outputAbbreviatedPath": "No Output Path",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0
@@ -66,7 +66,7 @@
 		"fileType": 32768,
 		"ignore": 0,
 		"ignoreWasSetByUser": 0,
-		"initialSize": 4048,
+		"initialSize": 514087,
 		"inputAbbreviatedPath": "\/img\/avatar_default.png",
 		"outputAbbreviatedPath": "\/img\/avatar_default.png",
 		"outputPathIsOutsideProject": 0,
@@ -84,6 +84,17 @@
 		"outputPathIsSetByUser": 0,
 		"processed": 1
 		},
+	"\/img\/discord.png": {
+		"fileType": 32768,
+		"ignore": 0,
+		"ignoreWasSetByUser": 0,
+		"initialSize": 1559,
+		"inputAbbreviatedPath": "\/img\/discord.png",
+		"outputAbbreviatedPath": "\/img\/discord.png",
+		"outputPathIsOutsideProject": 0,
+		"outputPathIsSetByUser": 0,
+		"processed": 0
+		},
 	"\/img\/favicon.png": {
 		"fileType": 32768,
 		"ignore": 0,
@@ -150,12 +161,12 @@
 		"outputStyle": 1,
 		"syntaxCheckerStyle": 1
 		},
-	"\/js\/semantic-2.2.7.min.js": {
+	"\/js\/semantic-2.2.9.min.js": {
 		"fileType": 64,
 		"ignore": 1,
 		"ignoreWasSetByUser": 1,
-		"inputAbbreviatedPath": "\/js\/semantic-2.2.7.min.js",
-		"outputAbbreviatedPath": "\/js\/min\/semantic-2.2.7.min-min.js",
+		"inputAbbreviatedPath": "\/js\/semantic-2.2.9.min.js",
+		"outputAbbreviatedPath": "\/js\/min\/semantic-2.2.9.min-min.js",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0,
 		"outputStyle": 1,
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -844,17 +844,14 @@ footer .ui.language .menu {
  padding-bottom: 80px;
 }
 .home .logo {
-  max-width: 220px;
-}
-.home .hero h1,
-.home .hero h2 {
-  font-family: 'PT Sans Narrow', sans-serif, 'Microsoft YaHei';
+  margin-bottom: 20px;
 }
 .home .hero h1 {
-  font-size: 5.5em;
+  font-size: 4.5em;
 }
 .home .hero h2 {
-  font-size: 3em;
+  margin-top: 0;
+  font-size: 2em;
 }
 .home .hero .octicon {
  color: #d9453d;
@@ -903,12 +900,17 @@ footer .ui.language .menu {
 .install .ui .checkbox label {
  width: auto !important;
 }
+.install #use-builtin-ssh-server {
+  margin-top: -1em;
+  margin-left: -15px !important;
+  margin-bottom: 2em;
+}
 .form .help {
  color: #999999;
  padding-top: .6em;
  padding-bottom: .6em;
  display: inline-block;
-  word-break: break-all;
+  word-break: break-word;
 }
 .ui.attached.header {
  background: #f0f0f0;
@@ -1228,7 +1230,6 @@ footer .ui.language .menu {
 }
 .repository.file.list #file-buttons {
  font-weight: normal;
-  margin-top: -3px;
 }
 .repository.file.list #file-buttons .ui.button {
  padding: 8px 10px;
@@ -2064,8 +2065,15 @@ footer .ui.language .menu {
  border-right: 1px solid #d4d4d5;
  padding: 0 5px;
 }
-.repository .diff-file-box .code-diff tbody tr.tag-code td,
-.repository .diff-file-box .code-diff tbody tr.tag-code pre {
+.repository .diff-file-box .code-diff .lines-num.lines-num-old,
+.repository .diff-file-box .code-diff .lines-num.lines-num-new {
+  cursor: pointer;
+}
+.repository .diff-file-box .code-diff .lines-num.lines-num-old:hover,
+.repository .diff-file-box .code-diff .lines-num.lines-num-new:hover {
+  color: #383636;
+}
+.repository .diff-file-box .code-diff tbody tr.tag-code td {
  background-color: #F0F0F0 !important;
  border-color: #D2CECE!important;
  padding-top: 4px;
@@ -2074,6 +2082,9 @@ footer .ui.language .menu {
 .repository .diff-file-box .code-diff tbody tr.tag-code td.halfwidth {
  width: 50%;
 }
+.repository .diff-file-box .code-diff tbody tr.same-code td.active {
+  background-color: #ffffdd !important;
+}
 .repository .diff-file-box .code-diff tbody tr.del-code td.add-code {
  background-color: #eaffea !important;
  border-color: #c1e9c1 !important;
@@ -2082,22 +2093,26 @@ footer .ui.language .menu {
  background-color: #eaffea !important;
  border-color: #c1e9c1 !important;
 }
-.repository .diff-file-box .code-diff tbody tr.del-code td,
-.repository .diff-file-box .code-diff tbody tr.del-code pre {
+.repository .diff-file-box .code-diff tbody tr.del-code td {
  background-color: #ffecec !important;
  border-color: #f1c0c0 !important;
 }
+.repository .diff-file-box .code-diff tbody tr.del-code td.active {
+  background-color: #ffffdd !important;
+}
 .repository .diff-file-box .code-diff tbody tr.del-code td.halfwidth {
  width: 50%;
 }
-.repository .diff-file-box .code-diff tbody tr.add-code td,
-.repository .diff-file-box .code-diff tbody tr.add-code pre {
+.repository .diff-file-box .code-diff tbody tr.add-code td {
  background-color: #eaffea !important;
  border-color: #c1e9c1 !important;
 }
 .repository .diff-file-box .code-diff tbody tr.add-code td.halfwidth {
  width: 50%;
 }
+.repository .diff-file-box .code-diff tbody tr.add-code td.active {
+  background-color: #ffffdd !important;
+}
 .repository .diff-file-box .code-diff tbody tr .removed-code {
  background-color: #ff9999;
 }
@@ -2277,6 +2292,36 @@ footer .ui.language .menu {
  margin-left: 5px;
  margin-top: -3px;
 }
+.repository.settings.branches .protected-branches .selection.dropdown {
+  width: 300px;
+}
+.repository.settings.branches .protected-branches .item {
+  border: 1px solid #eaeaea;
+  padding: 10px 15px;
+}
+.repository.settings.branches .protected-branches .item:not(:last-child) {
+  border-bottom: 0;
+}
+.repository.settings.branches .branch-protection .help {
+  margin-left: 26px;
+  padding-top: 0;
+}
+.repository.settings.branches .branch-protection .fields {
+  margin-left: 20px;
+  display: block;
+}
+.repository.settings.branches .branch-protection .whitelist {
+  margin-left: 26px;
+}
+.repository.settings.branches .branch-protection .whitelist .dropdown img {
+  display: inline-block;
+}
+.repository.settings.webhooks .types .menu .item {
+  padding: 10px !important;
+}
+.repository.settings.webhook .text.desc {
+  margin-top: 5px;
+}
 .repository.settings.webhook .events .column {
  padding-bottom: 0;
 }
@@ -2745,7 +2790,7 @@ footer .ui.language .menu {
 .user.settings .email.list .item:not(:first-child) .button {
  margin-top: -10px;
 }
-.user.settings .orgs {
+.user.settings .orgs.non-empty {
  padding: 0;
 }
 .user.settings .orgs .item {
@@ -2869,7 +2914,7 @@ footer .ui.language .menu {
  margin-bottom: -2px;
 }
 .feeds .news .push.news .content ul .text.truncate {
-  width: 80%;
+  width: 60%;
  margin-bottom: -5px;
 }
 .feeds .news .commit-id {
--- a/public/css/themes/github/assets/fonts/octicons-local.ttf
+++ b/public/css/themes/github/assets/fonts/octicons-local.ttf
--- a/public/css/themes/github/assets/fonts/octicons.svg
+++ b/public/css/themes/github/assets/fonts/octicons.svg
@@ -1,200 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-(c) 2012-2015 GitHub
-
-When using the GitHub logos, be sure to follow the GitHub logo guidelines (https://github.com/logos)
-
-Font License: SIL OFL 1.1 (http://scripts.sil.org/OFL)
-Applies to all font files
-
-Code License: MIT (http://choosealicense.com/licenses/mit/)
-Applies to all other files
-</metadata>
-<defs>
-<font id="octicons" horiz-adv-x="1024" >
-<font-face font-family="octicons" font-weight="400" font-stretch="normal" units-per-em="1024" ascent="832" descent="-192" />
-<missing-glyph d="M512 832C229.25 832 0 602.75 0 320c0-226.25 146.688-418.125 350.156-485.812 25.594-4.688 34.938 11.125 34.938 24.625 0 12.188-0.469 52.562-0.719 95.312C242-76.81200000000001 211.906 14.5 211.906 14.5c-23.312 59.125-56.844 74.875-56.844 74.875-46.531 31.75 3.53 31.125 3.53 31.125 51.406-3.562 78.47-52.75 78.47-52.75 45.688-78.25 119.875-55.625 149-42.5 4.654 33 17.904 55.625 32.5 68.375C304.906 106.56200000000001 185.344 150.5 185.344 346.688c0 55.938 19.969 101.562 52.656 137.406-5.219 13-22.844 65.094 5.062 135.562 0 0 42.938 13.75 140.812-52.5 40.812 11.406 84.594 17.031 128.125 17.219 43.5-0.188 87.312-5.875 128.188-17.281 97.688 66.312 140.688 52.5 140.688 52.5 28-70.531 10.375-122.562 5.125-135.5 32.812-35.844 52.625-81.469 52.625-137.406 0-196.688-119.75-240-233.812-252.688 18.438-15.875 34.75-47 34.75-94.75 0-68.438-0.688-123.625-0.688-140.5 0-13.625 9.312-29.562 35.25-24.562C877.438-98 1024 93.875 1024 320 1024 602.75 794.75 832 512 832z" horiz-adv-x="1024" />
-<glyph glyph-name="alert" unicode="&#xf02d;" d="M1005.854 31.753000000000043l-438.286 767C556.173 818.694 534.967 831 512 831s-44.173-12.306-55.567-32.247l-438.286-767c-11.319-19.809-11.238-44.144 0.213-63.876C29.811-51.85500000000002 50.899-64 73.714-64h876.572c22.814 0 43.903 12.145 55.354 31.877S1017.173 11.94399999999996 1005.854 31.753000000000043zM576 64H448V192h128V64zM576 256H448V512h128V256z" horiz-adv-x="1024" />
-<glyph glyph-name="alignment-align" unicode="&#xf08a;" d="M192 768C85.938 768 0 682.062 0 576s85.938-192 192-192c106.062 0 192 85.938 192 192S298.062 768 192 768zM672 224l160 160H384v-448l160 160 288-288 128 128L672 224z" horiz-adv-x="960" />
-<glyph glyph-name="alignment-aligned-to" unicode="&#xf08e;" d="M384 256l128 128 288-288 160 160v-448H512l160 160L384 256zM192 384C85.938 384 0 469.938 0 576S85.938 768 192 768c106.062 0 192-85.938 192-192S298.062 384 192 384z" horiz-adv-x="960" />
-<glyph glyph-name="alignment-unalign" unicode="&#xf08b;" d="M512 640L384 512 128 768 0 640l256-256L128 256l64-64 384 384L512 640zM640 256l128 128-64 64L320 64l64-64 128 128 256-256 128 128L640 256z" horiz-adv-x="896" />
-<glyph glyph-name="arrow-down" unicode="&#xf03f;" d="M448 384V640H192v-256H0l320-384 320 384H448z" horiz-adv-x="640" />
-<glyph glyph-name="arrow-left" unicode="&#xf040;" d="M384 448V640L0 320l384-320V192h256V448H384z" horiz-adv-x="640" />
-<glyph glyph-name="arrow-right" unicode="&#xf03e;" d="M640 320L256 640v-192H0v-256h256v-192L640 320z" horiz-adv-x="640" />
-<glyph glyph-name="arrow-small-down" unicode="&#xf0a0;" d="M256 384V512H128v-128H0l192-256 192 256H256z" horiz-adv-x="384" />
-<glyph glyph-name="arrow-small-left" unicode="&#xf0a1;" d="M256 384V512L0 320l256-192V256h128V384H256z" horiz-adv-x="384" />
-<glyph glyph-name="arrow-small-right" unicode="&#xf071;" d="M384 320L128 512v-128H0v-128h128v-128L384 320z" horiz-adv-x="384" />
-<glyph glyph-name="arrow-small-up" unicode="&#xf09f;" d="M192 512L0 256h128v-128h128V256h128L192 512z" horiz-adv-x="384" />
-<glyph glyph-name="arrow-up" unicode="&#xf03d;" d="M320 640L0 256h192v-256h256V256h192L320 640z" horiz-adv-x="640" />
-<glyph glyph-name="beer" unicode="&#xf069;" d="M896 576c-31 0-192 0-192 0v128c0 71-158 128-352 128s-352-57-352-128v-768c0-71 158-128 352-128s352 57 352 128v128s160 0 192 0 64 30 64 64 0 350 0 384-29 64-64 64z m-704-576h-64v512h64v-512z m192-64h-64v512h64v-512z m192 64h-64v512h64v-512z m-224 640c-124 0-224 29-224 64s100 64 224 64 224-29 224-64-100-64-224-64z m480-448h-128v256h128v-256z" horiz-adv-x="1024" />
-<glyph glyph-name="book" unicode="&#xf007;" d="M768 256h-128c-34 0-64-32-64-64h256c0 34-32 64-64 64z m-55 416c-167 0-209-32-233-56-24 24-66 56-233 56s-247-46-247-78v-586c29 16 119 48 214 56 115 9 234-9 234-32 0-16 8-31 31-32 0 0 0 0 1 0 0 0 0 0 1 0 23 1 31 16 31 32 0 23 119 41 234 32 94-7 185-40 214-56v586c0 32-80 78-247 78z m-265-572c-30 16-103 28-192 28s-170-12-192-27c0 0 0 411 0 443s64 59 192 59 192-27 192-59 0-444 0-444z m448 1c-22 15-103 27-192 27s-162-12-192-28c0 0 0 412 0 444s64 59 192 59 192-27 192-59 0-443 0-443z m-128 283h-128c-34 0-64-32-64-64h256c0 34-32 64-64 64z m0 128h-128c-34 0-64-32-64-64h256c0 34-32 64-64 64z m-448-128h-128c-32 0-64-30-64-64h256c0 32-30 64-64 64z m0-128h-128c-32 0-64-30-64-64h256c0 32-30 64-64 64z m0 256h-128c-32 0-64-30-64-64h256c0 32-30 64-64 64z" horiz-adv-x="1024" />
-<glyph glyph-name="bookmark" unicode="&#xf07b;" d="M0 704v-768l192 128 192-128V704H0zM316.25 507.25l-71.875-51.938 27.188-83.406c2.75-8.375-0.688-11.062-7.562-6.594l-72 52.094-72-52.031c-6.844-4.469-10.312-1.781-7.562 6.594l27.219 83.406L67.783 507.25c-6.469 5.125-5 9.219 3.906 9.219l88 0.125 27.125 83.094c2.812 8.812 7.562 8.812 10.375 0l27.188-83.094 87.938-0.125C321.25 516.469 322.688 512.375 316.25 507.25z" horiz-adv-x="384" />
-<glyph glyph-name="briefcase" unicode="&#xf0d3;" d="M896 640H640v66c0 34.2-27.8 62-62 62H446c-34.2 0-62-27.8-62-62v-66H128c-35.3 0-64-28.7-64-64v-512c0-35.3 28.7-64 64-64h768c35.3 0 64 28.7 64 64V576C960 611.3 931.3 640 896 640zM448 688c0 8.8 7.2 16 16 16h96c8.8 0 16-7.2 16-16v-48H448V688zM896 320H576v-64H448v64H128V576h64v-192h640V576h64V320z" horiz-adv-x="1024" />
-<glyph glyph-name="broadcast" unicode="&#xf048;" d="M448 640c142 0 256-115 256-256 0-69-28-132-72-178l-16-93c91 56 152 156 152 271 0 177-143 320-320 320s-320-143-320-320c0-115 61-215 152-271l-16 93c-45 46-72 109-72 178 0 142 114 256 256 256z m-64-320c-36 0-64-29-64-64v-128c0-36 30-64 64-64v-256h128v256c34 0 64 28 64 64v128c0 35-28 64-64 64s-64 0-64 0-28 0-64 0z m192 128c0 71-57 128-128 128s-128-57-128-128 57-128 128-128 128 57 128 128z m-128 384c-247 0-448-201-448-448 0-197 128-363 305-423l-12 72c-135 60-229 194-229 351 0 212 172 384 384 384s384-172 384-384c0-157-94-291-229-351l-12-72c177 60 305 225 305 423 0 247-201 448-448 448z" horiz-adv-x="896" />
-<glyph glyph-name="browser" unicode="&#xf0c5;" d="M320 640h64v-64h-64V640zM192 640h64v-64h-64V640zM64 640h64v-64H64V640zM832 0H64V512h768V0zM832 576H448v64h384V576zM896 640c0 35.35-28.65 64-64 64H64c-35.35 0-64-28.65-64-64v-640c0-35.35 28.65-64 64-64h768c35.35 0 64 28.65 64 64V640z" horiz-adv-x="896" />
-<glyph glyph-name="bug" unicode="&#xf091;" d="M243.621 675.469C190.747 618.688 205.34 528 205.34 528s53.968-64 160-64c106.031 0 160.031 64 160.031 64s14.375 89.469-37.375 146.312c32.375 18.031 51.438 44.094 43.562 61.812-8.938 19.969-48.375 21.75-88.25 3.969-14.812-6.594-27.438-14.969-37.25-23.875-12.438 2.25-25.625 3.781-40.72 3.781-14.061 0-26.561-1.344-38.344-3.25-9.656 8.75-22.062 16.875-36.531 23.344-39.875 17.719-79.375 15.938-88.25-3.969C194.465 718.781 212.497 693.438 243.621 675.469zM644.746 262.25c-8.25 1.75-16.125 2.75-23.75 3.5 0 2.125 0.375 4.125 0.375 6.312 0 33.594-4.75 65.654-12.438 96.125 16.438-1.406 37.375 2.375 58.562 11.779 39.875 17.781 65 48.375 56.125 68.219-8.875 19.969-48.375 21.75-88.25 3.969-18.625-8.312-33.812-19.469-44-30.906-7.75 18.25-16.5 35.781-26.812 51.719-30.188-25.156-87.312-62.719-167.062-71.062v-321.781c0 0-0.25-32-32.031-32-31.75 0-32 32-32 32V401.781c-79.811 8.344-136.968 45.969-167.093 71.062-9.875-15.312-18.375-32-25.938-49.344-10.281 10.625-24.625 20.844-41.969 28.594-39.875 17.719-79.375 15.938-88.25-3.969-8.906-19.906 16.25-50.438 56.125-68.219 19.844-8.846 39.531-12.812 55.469-12.096-7.656-30.404-12.469-62.344-12.469-95.812 0-2.188 0.375-4.25 0.438-6.5-6.719-0.75-13.688-1.75-20.781-3.25-51.969-10.75-91.781-37.625-88.844-59.812 2.938-22.312 47.5-31.5 99.594-20.688 6.781 1.375 13.438 3.125 19.781 5.062C128.684 146 143.34 108.125 163.622 75.5c-12.031-6.062-24.531-15-36.031-26.625C95.715 17 82.779-21.75 98.715-37.68799999999999c15.938-15.937 54.656-3 86.531 28.812 9.344 9.375 16.844 19.25 22.656 29C251.434-22.5 305.965-48 365.465-48c60.343 0 115.781 26.25 159.531 69.938 5.875-10.312 13.75-20.812 23.625-30.688 31.812-31.875 70.625-44.812 86.562-28.875s3 54.625-28.875 86.5c-12.312 12.375-25.688 21.75-38.438 27.938 20.125 32.5 34.625 70.375 43.688 111.062 7.188-2.25 14.688-4.375 22.562-6.062 52.061-10.812 96.625-1.562 99.625 20.688C736.558 224.625 696.746 251.5 644.746 262.25z" horiz-adv-x="733.886" />
-<glyph glyph-name="calendar" unicode="&#xf068;" d="M704 320h-64v-128h64V320zM576 320h-64v-128h64V320zM704 512h-64v-128h64V512zM832 320h-64v-128h64V320zM576 128h-64v-128h64V128zM768 832h-64v-128h64V832zM256 832h-64v-128h64V832zM832 512h-64v-128h64V512zM576 512h-64v-128h64V512zM320 128h-64v-128h64V128zM192 320h-64v-128h64V320zM320 320h-64v-128h64V320zM832 768v-128H640V768H320v-128H128V768H0v-896h960V768H832zM896-64H64V576h832V-64zM192 128h-64v-128h64V128zM448 512h-64v-128h64V512zM448 128h-64v-128h64V128zM320 512h-64v-128h64V512zM448 320h-64v-128h64V320zM704 128h-64v-128h64V128z" horiz-adv-x="1024" />
-<glyph glyph-name="check" unicode="&#xf03a;" d="M640 640L256 256 128 384 0 256l256-256 512 512L640 640z" horiz-adv-x="768" />
-<glyph glyph-name="checklist" unicode="&#xf076;" d="M760.688 315.78099999999995l-49.812 49.656c-6.438 6.529-16.938 6.594-23.375 0L582.5 260.5 462.375 140.125l-93.031 93.125c-6.531 6.562-17.031 6.562-23.5 0l-49.719-49.688c-6.531-6.562-6.531-17.062 0-23.562l104.781-104.875 17.969-17.875 31.688-31.812c6.562-6.562 17.188-6.562 23.562 0l49.625 49.688L760.625 292.22C767.25 298.688 767.25 309.188 760.688 315.78099999999995zM228.469 251.188L278.156 301c42.469 42.375 116.344 42.438 158.781-0.062l25.312-25.312L576 384V704H0v-704h320l-91.531 92.125C184.688 136.062 184.688 207.375 228.469 251.188zM192 640h320v-64H192V640zM192 512h320v-64H192V512zM128 320H64v64h64V320zM128 448H64v64h64V448zM128 576H64v64h64V576zM192 384h64v-64h-64V384z" horiz-adv-x="765.602" />
-<glyph glyph-name="chevron-down" unicode="&#xf0a3;" d="M512 512L320 320 128 512 0 384l320-320 320 320L512 512z" horiz-adv-x="640" />
-<glyph glyph-name="chevron-left" unicode="&#xf0a4;" d="M448 512L320 640 0 320l320-320 128 128L256 320 448 512z" horiz-adv-x="448" />
-<glyph glyph-name="chevron-right" unicode="&#xf078;" d="M128 640L0 512l192-192L0 128l128-128 320 320L128 640z" horiz-adv-x="448" />
-<glyph glyph-name="chevron-up" unicode="&#xf0a2;" d="M320 576L0 256l128-128 192 192 192-192 128 128L320 576z" horiz-adv-x="640" />
-<glyph glyph-name="circle-slash" unicode="&#xf084;" d="M320 640C143.219 640 0 496.781 0 320c0-176.75 143.219-320 320-320 176.75 0 320 143.25 320 320C640 496.781 496.75 640 320 640zM320 512c27.656 0 53.688-6.094 77.438-16.562L144.562 242.562C134.094 266.312 128 292.34400000000005 128 320 128 426 213.938 512 320 512zM320 128c-28.031 0-54.531 6.375-78.594 17.125l253.906 252.5C505.875 373.812 512 347.719 512 320 512 213.938 426.062 128 320 128z" horiz-adv-x="640" />
-<glyph glyph-name="circuit-board" unicode="&#xf0d6;" d="M320 576c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64s-64 28.654-64 64C256 547.346 284.654 576 320 576zM960 64c0-106.039-85.961-192-192-192H320l192 192h81.128c22.132-38.258 63.494-64 110.872-64 70.692 0 128 57.308 128 128s-57.308 128-128 128c-47.377 0-88.74-25.742-110.872-64H448L156.044-99.95600000000002C100.845-66.23199999999997 64-5.419999999999959 64 64V576c0 106.039 85.961 192 192 192v-145.128C217.742 600.74 192 559.377 192 512c0-70.692 57.308-128 128-128 47.276 0 88.56 25.633 110.727 63.756l162.416 0.219C615.279 409.731 656.633 384 704 384c70.692 0 128 57.308 128 128s-57.308 128-128 128c-47.388 0-88.758-25.753-110.887-64.025l-162.097-0.219c-11.246 19.54-27.503 35.828-47.016 47.116V768h384c106.039 0 192-85.961 192-192V64zM640 128c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64S640 92.654 640 128zM640 512c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64S640 476.654 640 512z" horiz-adv-x="1024" />
-<glyph glyph-name="clippy" unicode="&#xf035;" d="M704-64h-640v576h640v-192h64v320c0 35-29 64-64 64h-192c0 71-57 128-128 128s-128-57-128-128h-192c-35 0-64-29-64-64v-704c0-35 29-64 64-64h640c35 0 64 29 64 64v128h-64v-128z m-512 704c29 0 29 0 64 0s64 29 64 64 29 64 64 64 64-29 64-64 32-64 64-64 33 0 64 0 64-29 64-64h-512c0 39 28 64 64 64z m-64-512h128v64h-128v-64z m448 128v128l-256-192 256-192v128h320v128h-320z m-448-256h192v64h-192v-64z m320 448h-320v-64h320v64z m-192-128h-128v-64h128v64z" horiz-adv-x="896" />
-<glyph glyph-name="clock" unicode="&#xf046;" d="M384 256h256l64 64-64 64H512V576l-64 64-64-64V256zM448 768C200.562 768 0 567.438 0 320c0-247.438 200.562-448 448-448 247.438 0 448 200.562 448 448C896 567.438 695.438 768 448 768zM448 0c-176.25 0-320 143.75-320 320 0 175.938 144.188 319.5 320 320 175.812-0.5 320-144.062 320-320C768 143.75 624.25 0 448 0z" horiz-adv-x="896" />
-<glyph glyph-name="cloud-download" unicode="&#xf00b;" d="M832 512c-8.75 0-17.125-1.406-25.625-2.562C757.625 623.75 644.125 704 512 704c-132.156 0-245.562-80.25-294.406-194.562C209.156 510.594 200.781 512 192 512 85.938 512 0 426.062 0 320s85.938-192 192-192c20.531 0 39.875 4.25 58.375 10.375C284.469 100.625 331.312 75.25 384 67.5v65.25c-49.844 10.375-91.594 42.812-112.625 87.875C249.531 203 222.219 192 192 192c-70.656 0-128 57.375-128 128 0 70.656 57.344 128 128 128 25.281 0 48.625-7.562 68.406-20.094C281.344 548.219 385.594 640 512 640c126.5 0 229.75-92.219 250.5-212.75 20 13 43.875 20.75 69.5 20.75 70.625 0 128-57.344 128-128 0-70.625-57.375-128-128-128-10.25 0-20 1.5-29.625 3.75C773.438 154.875 725.938 128 672 128c-11.062 0-21.625 1.625-32 4v-64.938c10.438-1.688 21.062-3.062 32-3.062 61.188 0 116.5 24.625 156.938 64.438C830 128.375 830.875 128 832 128c106.062 0 192 85.938 192 192S938.062 512 832 512zM576 320H448v-320H320l192-192 192 192H576V320z" horiz-adv-x="1024" />
-<glyph glyph-name="cloud-upload" unicode="&#xf00c;" d="M512 448L320 256h128v-320h128V256h128L512 448zM832 512c-8.75 0-17.125-1.406-25.625-2.562C757.625 623.812 644.125 704 512 704c-132.156 0-245.562-80.188-294.406-194.562C209.156 510.594 200.781 512 192 512 85.938 512 0 426 0 320c0-106.062 85.938-192 192-192 20.531 0 39.875 4.25 58.375 10.438C284.469 100.625 331.312 75.25 384 67.5v65.25c-49.844 10.375-91.594 42.812-112.625 87.75C249.531 203 222.219 192 192 192c-70.656 0-128 57.375-128 128 0 70.656 57.344 128 128 128 25.281 0 48.625-7.562 68.406-20.156C281.344 548.219 385.594 640 512 640c126.5 0 229.75-92.219 250.5-212.75 20 13 43.875 20.75 69.5 20.75 70.625 0 128-57.344 128-128 0-70.625-57.375-128-128-128-10.25 0-20 1.5-29.625 3.75C773.438 154.875 725.938 128 672 128c-11.062 0-21.625 1.625-32 4v-64.938c10.438-1.688 21.062-3.062 32-3.062 61.188 0 116.5 24.688 157 64.438 1 0 1.875-0.438 3-0.438 106.062 0 192 85.938 192 192C1024 426 938.062 512 832 512z" horiz-adv-x="1024" />
-<glyph glyph-name="code" unicode="&#xf05f;" d="M608 640l-96-96 224-224L512 96l96-96 288 320L608 640zM288 640L0 320l288-320 96 96L160 320l224 224L288 640z" horiz-adv-x="896" />
-<glyph glyph-name="color-mode" unicode="&#xf065;" d="M0 704v-768h768V704H0zM64 0V640h640L64 0z" horiz-adv-x="768" />
-<glyph glyph-name="comment" unicode="&#xf02b;" d="M768 704H128C66 704 0 640 0 576v-384c0-128 128-128 128-128h64v-256l256 256c0 0 258 0 320 0s128 68 128 128V576C896 638 832 704 768 704z" horiz-adv-x="896" />
-<glyph glyph-name="comment-discussion" unicode="&#xf04f;" d="M256 320c0 64 0 192 0 192s-160 0-192 0-64-32-64-64 0-288 0-320 32-64 64-64 64 0 64 0v-192l194 192s162 0 192 0 62 32 62 64 0 64 0 64-128 0-192 0-128 64-128 128z m576 384c-32 0-416 0-448 0s-64-32-64-64 0-288 0-320 32-64 64-64 190 0 190 0l194-192v192s32 0 64 0 64 32 64 64 0 288 0 320-32 64-64 64z" horiz-adv-x="896" />
-<glyph glyph-name="credit-card" unicode="&#xf045;" d="M128 128h128v64h-128v-64z m192 0h128v64h-128v-64z m64 192h-256v-64h256v64z m-128 64h64l128 128h-64l-128-128z m192-128h192v64h-192v-64z m512 384c-32 0-864 0-896 0s-64-32-64-64 0-480 0-512 32-64 64-64 864 0 896 0 64 32 64 64 0 480 0 512-32 64-64 64z m0-256v-288s0-32-32-32h-832c-32 0-32 32-32 32v288h64l128 128h-192v32s0 32 32 32h832c32 0 32-32 32-32v-32h-384l-128-128h512z" horiz-adv-x="1024" />
-<glyph glyph-name="dash" unicode="&#xf0ca;" d="M0 384v-128h512V384H0z" horiz-adv-x="512" />
-<glyph glyph-name="dashboard" unicode="&#xf07d;" d="M416 367.5c-61.562 0-111.5-49.938-111.5-111.5S354.438 144.5 416 144.5 527.5 194.438 527.5 256c0 8.5-1.125 16.75-3 24.688C606.125 375.625 732.5 523.656 800 608c23.125 28.875-2.312 56.188-32 32-85.188-69.375-232.312-194.688-326.906-275.594C433.031 366.281 424.625 367.5 416 367.5zM447.875 576.125c0 17.656-14.344 32-32 32s-32-14.344-32-32 14.344-32 32-32S447.875 558.469 447.875 576.125zM639.875 320.125c0-17.656 14.375-32 32-32s32 14.344 32 32-14.375 32-32 32S639.875 337.781 639.875 320.125zM287.875 576.125c-17.656 0-32-14.344-32-32s14.344-32 32-32 32 14.344 32 32S305.531 576.125 287.875 576.125zM223.875 448.125c0 17.656-14.344 32-32 32s-32-14.344-32-32 14.344-32 32-32S223.875 430.469 223.875 448.125zM127.875 320.125c0-17.656 14.344-32 32-32s32 14.344 32 32-14.344 32-32 32S127.875 337.781 127.875 320.125zM575.875 544.125c0 17.656-14.375 32-32 32s-32-14.344-32-32 14.375-32 32-32S575.875 526.469 575.875 544.125zM792.875 495.312l-68.75-89.938C731.625 378.188 736 349.625 736 320c0-176.75-143.312-320-320-320S96 143.25 96 320c0 176.688 143.312 320 320 320 65.875 0 127-19.969 177.875-54.094l79.25 60.625C602.375 702.406 513.25 736 416 736 186.25 736 0 549.75 0 320s186.25-416 416-416 416 186.25 416 416C832 382.719 817.75 442 792.875 495.312z" horiz-adv-x="832" />
-<glyph glyph-name="database" unicode="&#xf096;" d="M384-128C171.969-128 0-70.625 0 0c0 38.625 0 80.875 0 128 0 11.125 5.562 21.688 13.562 32C56.375 104.875 205.25 64 384 64s327.625 40.875 370.438 96c8-10.312 13.562-20.875 13.562-32 0-37.062 0-76.375 0-128C768-70.625 596-128 384-128zM384 128C171.969 128 0 185.375 0 256c0 38.656 0 80.844 0 128 0 6.781 2.562 13.375 6 19.906l0 0C7.938 408 10.5 412.031 13.562 416 56.375 360.906 205.25 320 384 320s327.625 40.906 370.438 96c3.062-3.969 5.625-8 7.562-12.094l0 0c3.438-6.531 6-13.125 6-19.906 0-37.062 0-76.344 0-128C768 185.375 596 128 384 128zM384 384C171.969 384 0 441.344 0 512c0 20.219 0 41.594 0 64 0 20.344 0 41.469 0 64C0 710.656 171.969 768 384 768c212 0 384-57.344 384-128 0-19.969 0-41.156 0-64 0-19.594 0-40.25 0-64C768 441.344 596 384 384 384zM384 704c-141.375 0-256-28.594-256-64s114.625-64 256-64 256 28.594 256 64S525.375 704 384 704z" horiz-adv-x="768" />
-<glyph glyph-name="device-camera" unicode="&#xf056;" d="M512 447.999c-70.691 0-127.999-57.308-127.999-127.999S441.309 192.00099999999998 512 192.00099999999998c5.713 0 11.337 0.38 16.852 1.105-46.344 7.058-81.851 47.079-81.851 95.394 0 53.295 43.204 96.499 96.499 96.499 48.314 0 88.336-35.507 95.394-81.851 0.726 5.515 1.105 11.139 1.105 16.852C639.999 390.691 582.691 447.999 512 447.999zM896 576H767.999L640 704H384L255.999 576H128c-35.348 0-64-28.652-64-64v-448c0-35.347 28.652-64 64-64h768c35.347 0 64 28.653 64 64V512C960 547.348 931.347 576 896 576zM416 640h192l64-64H352L416 640zM160.143 64C142.391 64 128 78.39099999999996 128 96.14300000000003V384h64v64h-64v31.857C128 497.609 142.391 512 160.143 512h182.526c-3.98-3.518-7.881-7.174-11.688-10.98-99.974-99.975-99.974-262.064 0-362.039l74.98-74.98H160.143zM512 128.00099999999998c-106.038 0-191.999 85.961-191.999 191.999S405.962 511.999 512 511.999 703.999 426.038 703.999 320 618.038 128.00099999999998 512 128.00099999999998zM832 352L681.327 512H832V352z" horiz-adv-x="1024" />
-<glyph glyph-name="device-camera-video" unicode="&#xf057;" d="M576 640c-35.347 0-64-28.653-64-64s28.653-64 64-64 64 28.653 64 64S611.347 640 576 640zM896 448L768 320v64c0 30.625-21.515 56.21-50.25 62.503C748.958 480.646 768 526.097 768 575.998 768 682.038 682.039 768 576 768c-101.123 0-183.986-78.178-191.45-177.393C350.516 621.306 305.442 640 256 640c-106.038 0-192-85.962-192-192.002C64 341.961 149.962 256 256 256h-64v-128h64v-128c0-35.347 28.653-64 64-64h384c35.347 0 64 28.653 64 64v64l128-128h64V448H896zM256 512c-35.347 0-64-28.653-64-64s28.653-64 64-64v-64c-70.692 0-128 57.308-128 127.999C128 518.692 185.308 576 256 576s128-57.307 128-128h-64C320 483.347 291.347 512 256 512zM576 128H448V256h128V128zM704 237.21299999999997c-33.526 33.547-70.276 70.317-73.373 73.414C624.837 316.418 616.837 320 608 320H416c-17.674 0-32-14.326-32-32v-192c0-8.329 3.183-15.915 8.396-21.607 0.53-0.58 39.123-39.164 74.409-74.393H352c-17.674 0-32 14.326-32 32V352c0 17.674 14.326 32 32 32h320c17.674 0 32-14.326 32-32V237.21299999999997zM576 448c-70.692 0-128 57.308-128 127.999C448 646.692 505.308 704 576 704s128-57.308 128-128.001C704 505.308 646.692 448 576 448zM896 128l-64 64 0.082 128.084L896 384.002V128z" horiz-adv-x="1024" />
-<glyph glyph-name="device-desktop" unicode="&#xf27c;" d="M960 768c-32 0-864 0-896 0s-64-32-64-64 0-544 0-576 32-64 64-64 320 0 320 0-192-64-192-128c0-32 32-64 64-64s480 0 512 0 64 32 64 64c0 64-192 128-192 128s288 0 320 0 64 32 64 64 0 544 0 576-32 64-64 64z m0-640h-896v576h896v-576z m-64 512h-192c-384-64-542-300-576-384v-64h768v448z" horiz-adv-x="1024" />
-<glyph glyph-name="device-mobile" unicode="&#xf038;" d="M576 832H64C28.688 832 0 803.312 0 768v-896c0-35.375 28.688-64 64-64h512c35.375 0 64 28.625 64 64V768C640 803.312 611.375 832 576 832zM288 768h64c17.625 0 32-14.344 32-32s-14.375-32-32-32h-64c-17.656 0-32 14.344-32 32S270.344 768 288 768zM352-128h-64c-17.656 0-32 14.375-32 32s14.344 32 32 32h64c17.625 0 32-14.375 32-32S369.625-128 352-128zM576 0H64V640h512V0z" horiz-adv-x="640" />
-<glyph glyph-name="diff" unicode="&#xf04d;" d="M448 576H320v-128H192v-128h128v-128h128V320h128V448H448V576zM192-64h384V64H192V-64zM640 832H128v-64h480l224-224v-608h64V576L640 832zM0 704v-896h768V512L576 704H0zM704-128H64V640h480l160-160V-128z" horiz-adv-x="896" />
-<glyph glyph-name="diff-added" unicode="&#xf06b;" d="M512 512h-128v-128h-128v-128h128v-128h128v128h128v128h-128v128z m320 256c-32 0-736 0-768 0s-64-32-64-64 0-736 0-768 32-64 64-64 736 0 768 0 64 32 64 64 0 736 0 768-32 64-64 64z m-64-736c0-16-17-32-32-32s-558 0-576 0-32 12-32 32c0 16 0 560 0 576s16 32 32 32 561 0 576 0 32-16 32-32 0-560 0-576z" horiz-adv-x="896" />
-<glyph glyph-name="diff-ignored" unicode="&#xf099;" d="M832 768h-768c-32 0-64-32-64-64v-768c0-32 32-64 64-64h768c32 0 64 32 64 64v768c0 32-32 64-64 64z m-64-736c0-16-17-32-32-32h-576c-18 0-32 12-32 32v576c0 16 16 32 32 32h576c15 0 32-16 32-32v-576z m-512 194v-98h98l286 286v98h-98l-286-286z" horiz-adv-x="896" />
-<glyph glyph-name="diff-modified" unicode="&#xf06d;" d="M832 768h-768c-32 0-64-32-64-64v-768c0-32 32-64 64-64h768c32 0 64 32 64 64v768c0 32-32 64-64 64z m-64-736c0-16-17-32-32-32h-576c-18 0-32 12-32 32v576c0 16 16 32 32 32h576c15 0 32-16 32-32v-576z m-320 416c-71 0-128-57-128-128s57-128 128-128 128 57 128 128-57 128-128 128z" horiz-adv-x="896" />
-<glyph glyph-name="diff-removed" unicode="&#xf06c;" d="M832 768h-768c-32 0-64-32-64-64v-768c0-32 32-64 64-64h768c32 0 64 32 64 64v768c0 32-32 64-64 64z m-64-736c0-16-17-32-32-32h-576c-18 0-32 12-32 32v576c0 16 16 32 32 32h576c15 0 32-16 32-32v-576z m-512 224h384v128h-384v-128z" horiz-adv-x="896" />
-<glyph glyph-name="diff-renamed" unicode="&#xf06e;" d="M832 768h-768c-32 0-64-32-64-64v-768c0-32 32-64 64-64h768c32 0 64 32 64 64v768c0 32-32 64-64 64z m-64-736c0-16-17-32-32-32h-576c-18 0-32 12-32 32v576c0 16 16 32 32 32h576c15 0 32-16 32-32v-576z m-320 352h-192v-128h192v-128l256 192-256 192v-128z" horiz-adv-x="896" />
-<glyph glyph-name="ellipsis" unicode="&#xf09a;" d="M640 512c-64 0-448 0-512 0s-128-64-128-128 0-64 0-128 64-128 128-128 448 0 512 0 128 64 128 128 0 64 0 128-64 128-128 128z m-384-256h-128v128h128v-128z m192 0h-128v128h128v-128z m192 0h-128v128h128v-128z" horiz-adv-x="768" />
-<glyph glyph-name="eye" unicode="&#xf04e;" d="M512 704c-192 0-416-128-512-384 96-192 288-320 512-320s416 128 512 320c-96 256-320 384-512 384z m0-640c-192 0-352 128-384 256 32 128 192 256 384 256s352-128 384-256c-32-128-192-256-384-256z m0 448c-20 0-38-4-56-9 33-15 56-48 56-87 0-53-43-96-96-96-39 0-72 23-87 56-5-18-9-36-9-56 0-106 86-192 192-192s192 86 192 192-86 192-192 192z" horiz-adv-x="1024" />
-<glyph glyph-name="file-binary" unicode="&#xf094;" d="M0-128V768h576l192-192v-704z m704 672L544 704H64v-768h640zM320 320H128V576h192z m-64 192h-64v-128h64z m0-448h64v-64H128v64h64V192h-64v64h128z m256 320h64v-64H384v64h64V512h-64v64h128z m64-384H384V256h192z m-64 192h-64v-128h64z" horiz-adv-x="768" />
-<glyph glyph-name="file-code" unicode="&#xf010;" d="M288 448L128 288l160-160 64 64-96 96 96 96z m128-64l96-96-96-96 64-64 160 160-160 160zM576 768H0v-896h768V576z m128-832H64V704h480l160-160z" horiz-adv-x="768" />
-<glyph glyph-name="file-directory" unicode="&#xf016;" d="M832 640c-32 0-336 0-352 0s-32 16-32 32 0 0 0 32-32 64-64 64-288 0-320 0-64-32-64-64 0-704 0-704h896s0 544 0 576-32 64-64 64z m-448 0h-320s0 15 0 32 16 32 32 32 241 0 256 0 32-15 32-32 0-32 0-32z" horiz-adv-x="896" />
-<glyph glyph-name="file-media" unicode="&#xf012;" d="M576 768H0v-896h768V576z m128-832H64V704h480l160-160zM128 576v-512h128c0 71 57 128 128 128-71 0-128 57-128 128s57 128 128 128 128-57 128-128-57-128-128-128c71 0 128-57 128-128h128V448L512 576z" horiz-adv-x="768" />
-<glyph glyph-name="file-pdf" unicode="&#xf014;" d="M576 768H0v-896h768V576zM64 704h256c-13-4-27-15-35-43-13-49-7-131 16-209-24-81-123-277-129-289-16-4-66-23-108-59z m283-307c58-150 95-150 135-168-84-13-148-22-232-60-4-6 76 146 97 228z m357-461H64c1 0 1 0 2 0 34 0 85 21 180 182 39 16 72 27 79 29 59 15 125 27 187 34 55-28 127-46 168-49 10 0 16 2 24 2z m0 311c-24 14-54 25-89 25-24 0-51-2-79-5-27 13-92 33-147 190 17 104 13 174 13 174 6 53-24 73-52 73h194l160-160z" horiz-adv-x="768" />
-<glyph glyph-name="file-submodule" unicode="&#xf017;" d="M832 320c-32 0-192 0-192 0 0 32-32 64-64 64s-96 0-128 0-64-32-64-64 0-320 0-320h512s0 224 0 256-32 64-64 64z m-256-64h-128s0 17 0 32 15 32 32 32 48 0 64 0 32-15 32-32 0-32 0-32z m256 320c-32 0-336 0-352 0s-32 17-32 32 0 0 0 32-32 64-64 64-288 0-320 0-64-32-64-64 0-640 0-640h320s0 352 0 384 32 64 64 64 224 0 256 0 64-32 64-64h192s0 96 0 128-32 64-64 64z m-448 0h-320s0 16 0 32 16 32 32 32 240 0 256 0 32-17 32-32 0-32 0-32z" horiz-adv-x="896" />
-<glyph glyph-name="file-symlink-directory" unicode="&#xf0b1;" d="M832 640h-352c-16 0-32 16-32 32s0 0 0 32-32 64-64 64h-320c-32 0-64-32-64-64s0-704 0-704h896s0 544 0 576-32 64-64 64z m-768 32c0 17 16 32 32 32h256c15 0 32-15 32-32s0-32 0-32h-320s0 15 0 32z m384-544v128c-125 0-224-56-256-192 0 209 107 320 256 320 0 49 0 128 0 128l256-192-256-192z" horiz-adv-x="896" />
-<glyph glyph-name="file-symlink-file" unicode="&#xf0b0;" d="M576 768H0v-896h768V576z m128-832H64V704h480l160-160zM384 384c-149 0-256-111-256-320 32 136 131 192 256 192v-128l256 192-256 192z" horiz-adv-x="768" />
-<glyph glyph-name="file-text" unicode="&#xf011;" d="M448 576H128v-64h320zM576 768H0v-896h768V576z m128-832H64V704h480l160-160zM128 64h512v64H128z m0 128h512v64H128z m0 128h512v64H128z" horiz-adv-x="768" />
-<glyph glyph-name="file-zip" unicode="&#xf013;" d="M320 256v64h-64v-64z m0 128v64h-64v-64z m0 128v64h-64v-64z m-128-64h64v64h-64zM576 768H0v-896h768V576z m128-832H64V704h192v-64h64v64h224l160-160zM192 576h64v64h-64z m0-256h64v64h-64z m0-128l-64-64v-128h256V128l-64 64h-64v64h-64z m128-64v-64H192v64z" horiz-adv-x="768" />
-<glyph glyph-name="flame" unicode="&#xf0d2;" d="M433 787c50-134 24-207-32-265-61-64-156-112-223-206-89-125-104-400 217-472-135 71-164 277-18 406-38-125 32-205 119-176 85 29 141-32 139-102-1-48-20-89-69-112 209 37 293 210 293 342 0 174-155 198-77 344-93-8-125-69-116-169 6-66-63-111-114-81-41 25-40 73-4 109 77 76 107 251-115 382z" horiz-adv-x="1024" />
-<glyph glyph-name="fold" unicode="&#xf0cc;" d="M896 576H672l-64-64h192L672 384H224L96 512h192l-64 64H0v-63.999L160 352 0 192v-64h224l64 64H96l128 128h448l128-128H608l64-64h224v64L736 352l160 160.001V576zM640 640H512V832H384v-192H256l192-192L640 640zM256 64h128v-192h128V64h128L448 256 256 64z" horiz-adv-x="896" />
-<glyph glyph-name="gear" unicode="&#xf02f;" d="M447.938 482C358.531 482 286 409.469 286 320c0-89.375 72.531-162.062 161.938-162.062 89.438 0 161.438 72.688 161.438 162.062C609.375 409.469 537.375 482 447.938 482zM772.625 226.938l-29.188-70.312 52.062-102.25 6.875-13.5-72.188-72.188L611.75 24.625l-70.312-28.875L505.75-113.5l-4.562-14.5H399.156L355-4.687999999999988l-70.312 29-102.404-51.938-13.5-6.75-72.156 72.125 55.875 118.5-28.969 70.25L14.469 262.125 0 266.812V368.781L123.406 413l28.969 70.188-51.906 102.469-6.844 13.438 72.062 72.062 118.594-55.844 70.219 29.031 35.656 109.188L394.75 768h102l44.188-123.469 70.125-29.031L713.5 667.469l13.625 6.844 72.125-72.062-55.875-118.406L772.25 413.5l109.375-35.656L896 373.25v-101.938L772.625 226.938z" horiz-adv-x="896" />
-<glyph glyph-name="gift" unicode="&#xf042;" d="M448-128h320V192H448V-128zM64-128h320V192H64V-128zM447.75 455.812c31.469 3.5 66.875 7.406 87.375 9.719C619 474.875 694.5 550.406 703.812 634.25c9.312 83.75-51 144.125-134.688 134.719C503.688 761.656 443.844 714 416 653.625 388.156 714 328.312 761.656 262.906 769.031 179.188 778.375 118.781 718 128.188 634.25c9.344-83.844 84.875-159.312 168.656-168.719 20.531-2.312 55.938-6.281 87.406-9.719C383.75 451.594 384 448 384 448h64C448 448 448.25 451.594 447.75 455.812zM555.375 691.312c45.25 5.062 78-27.562 72.875-72.875-5-45.312-45.875-86.156-91.125-91.219-45.375-5.031-78 27.594-72.938 72.906C469.249 645.436 510.125 686.281 555.375 691.312zM294.906 527.219c-45.25 5.062-86.062 45.906-91.125 91.219-5.063 45.313 27.594 77.938 72.812 72.875 45.312-5.031 86.156-45.875 91.222-91.188C372.875 554.812 340.219 522.188 294.906 527.219zM448 448v-192h384V448H448zM0 256h384V448H0V256z" horiz-adv-x="896" />
-<glyph glyph-name="gist" unicode="&#xf00e;" d="M416 448l96-96-96-96 64-64 160 160-160 160-64-64z m-416 320v-832h768v832h-768z m704-768h-640v704h640v-704z m-352 256l-96 96 96 96-64 64-160-160 160-160 64 64z" horiz-adv-x="768" />
-<glyph glyph-name="gist-secret" unicode="&#xf08c;" d="M193 128l128-192h-256l-65 256 257 64-64-128z m448 128l64-128-128-192h256l64 256-256 64z m-84 0h-216l44-102-64-218h256l-64 218 44 102z m84 192h-384l-128-64h640l-128 64z m-64 256l-128-64-128 64-64-192h384l-64 192z" horiz-adv-x="896" />
-<glyph glyph-name="git-branch" unicode="&#xf020;" d="M512 640c-71 0-128-57-128-128 0-47 26-88 64-110v-18c0-64-64-128-128-128-53 0-95-11-128-29v303c38 22 64 63 64 110 0 71-57 128-128 128s-128-57-128-128c0-47 26-88 64-110v-419c-38-22-64-63-64-110 0-71 57-128 128-128s128 57 128 128c0 34-13 64-34 87 19 23 49 41 98 41 128 0 256 128 256 256v18c38 22 64 63 64 110 0 71-57 128-128 128z m-384 64c35 0 64-29 64-64s-29-64-64-64-64 29-64 64 29 64 64 64z m0-768c-35 0-64 29-64 64s29 64 64 64 64-29 64-64-29-64-64-64z m384 512c-35 0-64 29-64 64s29 64 64 64 64-29 64-64-29-64-64-64z" horiz-adv-x="640" />
-<glyph glyph-name="git-commit" unicode="&#xf01f;" d="M694.875 384C666.375 494.219 567.125 576 448 576c-119.094 0-218.375-81.781-246.906-192H0v-128h201.094C229.625 145.75 328.906 64 448 64c119.125 0 218.375 81.75 246.875 192H896V384H694.875zM448 192c-70.656 0-128 57.375-128 128 0 70.656 57.344 128 128 128 70.625 0 128-57.344 128-128C576 249.375 518.625 192 448 192z" horiz-adv-x="896" />
-<glyph glyph-name="git-compare" unicode="&#xf0ac;" d="M832 110s0 306 0 402-96 192-192 192c-64 0-64 0-64 0v128l-192-192 192-192v128s32 0 64 0 64-32 64-64 0-402 0-402c-38-22-64-63-64-110 0-71 57-128 128-128s128 57 128 128c0 47-26 88-64 110z m-64-174c-35 0-64 29-64 64s29 64 64 64 64-29 64-64-29-64-64-64z m-448 128s-32 0-64 0-64 32-64 64 0 402 0 402c38 22 64 63 64 110 0 71-57 128-128 128s-128-57-128-128c0-47 26-88 64-110 0 0 0-306 0-402s96-192 192-192c64 0 64 0 64 0v-128l192 192-192 192v-128z m-192 512c-35 0-64 29-64 64s29 64 64 64 64-29 64-64-29-64-64-64z" horiz-adv-x="896" />
-<glyph glyph-name="git-merge" unicode="&#xf023;" d="M640 384c-47.625 0-88.625-26.312-110.625-64.906C523.625 319.5 518 320 512 320c-131.062 0-255.438 99.844-300.812 223.438C238.469 566.906 256 601.281 256 640c0 70.656-57.344 128-128 128S0 710.656 0 640c0-47.219 25.844-88.062 64-110.281V110.25C25.844 88.06200000000001 0 47.25 0 0c0-70.625 57.344-128 128-128s128 57.375 128 128c0 47.25-25.844 88.062-64 110.25V340.531C276.156 251.5 392.375 192 512 192c6.375 0 11.625 0.438 17.375 0.625C551.5 154.188 592.5 128 640 128c70.625 0 128 57.375 128 128C768 326.656 710.625 384 640 384zM128-64c-35.312 0-64 28.625-64 64 0 35.312 28.688 64 64 64 35.406 0 64-28.688 64-64C192-35.375 163.406-64 128-64zM128 576c-35.312 0-64 28.594-64 64s28.688 64 64 64c35.406 0 64-28.594 64-64S163.406 576 128 576zM640 192c-35.312 0-64 28.625-64 64 0 35.406 28.688 64 64 64 35.375 0 64-28.594 64-64C704 220.625 675.375 192 640 192z" horiz-adv-x="768" />
-<glyph glyph-name="git-pull-request" unicode="&#xf009;" d="M704 110s0 306 0 402-96 192-192 192c-64 0-64 0-64 0v128l-192-192 192-192v128s32 0 64 0 64-32 64-64 0-402 0-402c-38-22-64-63-64-110 0-71 57-128 128-128s128 57 128 128c0 47-26 88-64 110z m-64-174c-35 0-64 29-64 64s29 64 64 64 64-29 64-64-29-64-64-64z m-512 832c-71 0-128-57-128-128 0-47 26-88 64-110v-419c-38-22-64-63-64-110 0-71 57-128 128-128s128 57 128 128c0 47-26 88-64 110v419c38 22 64 63 64 110 0 71-57 128-128 128z m0-832c-35 0-64 29-64 64s29 64 64 64 64-29 64-64-29-64-64-64z m0 640c-35 0-64 29-64 64s29 64 64 64 64-29 64-64-29-64-64-64z" horiz-adv-x="768" />
-<glyph glyph-name="globe" unicode="&#xf0b6;" d="M512 704c-212.077 0-384-171.923-384-384s171.923-384 384-384c25.953 0 51.303 2.582 75.812 7.49-9.879 4.725-10.957 40.174-1.188 60.385 10.875 22.5 45 79.5 11.25 98.625s-24.375 27.75-45 49.875-12.19 25.451-13.5 31.125c-4.5 19.5 19.875 48.75 21 51.75s1.125 14.25 0.75 17.625S545.75 265.25 542 265.625s-5.625-6-10.875-6.375-28.125 13.875-33 17.625-7.125 12.75-13.875 19.5-7.5 1.5-18 5.625-44.25 16.5-70.125 27-28.125 25.219-28.5 35.625-15.75 25.5-22.961 36.375c-7.209 10.875-8.539 25.875-11.164 22.5s13.5-42.75 10.875-43.875-8.25 10.875-15.75 20.625 7.875 4.5-16.125 51.75 7.5 71.344 9 96 20.25-9 10.5 6.75 0.75 48.75-6.75 60.75S275 602 275 602c1.125 11.625 37.5 31.5 63.75 49.875s42.281 4.125 63.375-2.625 22.5-4.5 15.375 2.25 3 10.125 19.5 7.5 21-22.5 46.125-20.625 2.625-4.875 6-11.25-3.75-5.625-20.25-16.875S469.25 599 498.5 577.625s20.25 14.25 17.25 30S537.125 611 537.125 611c18-12 14.674-0.66 27.799-4.785S613.625 572 613.625 572c-44.625-24.375-16.5-27-9-32.625s-15.375-16.5-15.375-16.5c-9.375 9.375-10.875-0.375-16.875-3.75s-0.375-12-0.375-12c-31.031-4.875-24-37.5-23.625-45.375s-19.875-19.875-25.125-31.125S536.75 395 527 393.5s-19.5 36.75-72 22.5c-15.828-4.297-51-22.5-32.25-59.625s49.875 10.5 60.375 5.25-3-28.875-0.75-29.25 29.625-1.031 31.125-33 41.625-29.25 50.25-30 37.5 23.625 41.625 24.75S626 309.125 662 288.5s54.375-17.625 66.75-26.25 3.75-25.875 15.375-31.5 58.125 1.875 69.75-17.25-48-115.125-66.75-125.625S719.75 53.375 701 38s-45-34.406-69.75-49.125c-21.908-13.027-25.85-36.365-35.609-43.732C767.496-16.67999999999995 896 136.64999999999998 896 320 896 532.077 724.077 704 512 704zM602 343.625c-5.25-1.5-16.125-11.25-42.75 4.5s-45 12.75-47.25 15.375c0 0-2.25 6.375 9.375 7.5 23.871 2.311 54-22.125 60.75-22.5s10.125 6.75 22.125 2.883C616.25 347.52 607.25 345.125 602 343.625zM476.375 665.75c-2.615 1.902 2.166 4.092 5.016 7.875 1.645 2.186 0.425 5.815 2.484 7.875 5.625 5.625 33.375 13.5 27.949-1.875C506.4 664.25 480.5 662.75 476.375 665.75zM543.5 617c-9.375 0.375-31.443 2.707-27.375 6.75 15.844 15.75-6 20.25-19.5 21.375S477.5 653.75 484.25 654.5s33.75-0.375 38.25-4.125 28.875-13.5 30.375-20.625S552.875 616.625 543.5 617zM624.875 619.625c-7.5-6-45.24 21.529-52.5 27.75-31.5 27-48.375 18-54.99 22.5-6.617 4.5-4.26 10.5 5.865 19.5s38.625-3 55.125-4.875 35.625-14.625 36-29.781C614.75 639.564 632.375 625.625 624.875 619.625z" horiz-adv-x="1024" />
-<glyph glyph-name="graph" unicode="&#xf043;" d="M704 576H512v-640h192V576zM960 384H768v-448h192V384zM64-128V0h64v64H64V192h64v64H64V384h64v64H64V576h64v64H64V768h64V832H0v-1024h1024v64H64zM448 256H256v-320h192V256z" horiz-adv-x="1024" />
-<glyph glyph-name="heart" unicode="&#x2665;" d="M384-32c399 314 384 425 384 512s-72 192-192 192-192-128-192-128-72 128-192 128-192-105-192-192-15-198 384-512z" horiz-adv-x="768.199" />
-<glyph glyph-name="history" unicode="&#xf07e;" d="M448 768c-90.938 0-175.312-27.531-245.938-74.062L128 768v-256h256l-88 88c45.438 24.688 96.688 40 152 40 176.75 0 320-143.219 320-320 0-176.75-143.25-320-320-320-176.781 0-320 143.25-320 320 0 45.562 9.781 88.781 27 128H64v99.406C24.312 480.5 0 403.406 0 320c0-247.438 200.562-448 448-448 247.438 0 448 200.562 448 448C896 567.438 695.438 768 448 768zM447.031 1L512 64V256h128l64 64-64 64H512l-64 64L320 320l64-64v-192L447.031 1z" horiz-adv-x="896" />
-<glyph glyph-name="home" unicode="&#xf08d;" d="M192 256l64-384h192V192h128v-320h192l64 384L512 576 192 256zM832 448V704H704l0.312-128.312L512 768 0 256h128l384 384 384-384h128L832 448z" horiz-adv-x="1024" />
-<glyph glyph-name="horizontal-rule" unicode="&#xf070;" d="M63.938 384h128v-128h64V639.938h-64V448h-128V639.938H0V256h63.938V384zM639.875 256V384h-63.938v-128H639.875zM639.875 448V575.938h-63.938V448H639.875zM447.938 448V575.938h128v64h-192V256h64V384h128v64H447.938zM0 0h639.875V128H0V0z" horiz-adv-x="639.875" />
-<glyph glyph-name="hourglass" unicode="&#xf09e;" d="M571 320c118 85 197 240 197 384 0 71-172 128-384 128s-384-57-384-128c0-144 80-299 197-384-118-85-197-240-197-384 0-71 172-128 384-128s384 57 384 128c0 144-80 299-197 384z m-187 448c141 0 256-29 256-64s-115-64-256-64-256 29-256 64 115 64 256 64z m-64-706c-154-7-238-40-253-82 16 114 75 189 141 251 73 68 112 60 112 103v-273z m-105 352c-70 55-122 130-142 215 70-32 183-53 311-53s241 21 311 53c-20-85-72-160-142-215-24 17-70 34-169 34s-145-17-169-34z m233-352v273c0-43 39-35 112-103 66-62 125-138 141-251-14 41-99 75-253 82z" horiz-adv-x="768" />
-<glyph glyph-name="hubot" unicode="&#xf09d;" d="M512 768c-283 0-512-229-512-512 0 0 0-192 0-256s64-128 128-128 704 0 768 0 128 64 128 128 0 256 0 256c0 283-229 512-512 512z m96-768h-192c-18 0-32 14-32 32s14 32 32 32h192c18 0 32-14 32-32s-14-32-32-32z m288 128c0-32-32-64-64-64s-128 0-128 0c0 32-32 64-64 64s-224 0-256 0-64-32-64-64c0 0-96 0-128 0s-64 32-64 64 0 360 0 360c78 129 220 216 384 216s306-87 384-216c0 0 0-328 0-360z m-128 384c-32 0-480 0-512 0s-64-32-64-64 0-96 0-128 32-64 64-64 480 0 512 0 64 32 64 64 0 96 0 128-32 64-64 64z m0-128l-64-64h-128l-64 64-64-64h-128l-64 64v64h64l64-64 64 64h128l64-64 64 64h64v-64z" horiz-adv-x="1024" />
-<glyph glyph-name="inbox" unicode="&#xf0cf;" d="M704 640H64L0 256v-256h768V256L704 640zM576 256l-64-128H256l-64 128H79l49 320h512l49-320H576z" horiz-adv-x="768" />
-<glyph glyph-name="info" unicode="&#xf059;" d="M448 448c35 0 64 29 64 64s-29 64-64 64-64-29-64-64 29-64 64-64z m0 320c-247 0-448-201-448-448s201-448 448-448 448 201 448 448-201 448-448 448z m0-768c-177 0-320 143-320 320s143 320 320 320 320-143 320-320-143-320-320-320z m64 320c0 32-32 64-64 64s-32 0-64 0-64-32-64-64h64s0-160 0-192 32-64 64-64 32 0 64 0 64 32 64 64h-64s0 160 0 192z" horiz-adv-x="896" />
-<glyph glyph-name="issue-closed" unicode="&#xf028;" d="M704 515.969l-96-96L768 256l256 256-96 96L769.25 449.219 704 515.969zM512 0c-176.781 0-320 143.25-320 320 0 176.781 143.219 320 320 320 88.375 0 168.375-35.844 226.25-93.75l90.562 90.5C747.75 717.875 635.75 768 512 768 264.562 768 64 567.438 64 320c0-247.438 200.562-448 448-448 247.438 0 448 200.562 448 448L759.75 119.75C768.688 130.75 684.75 0 512 0zM576 576H448v-320h128V576zM448 64h128V192H448V64z" horiz-adv-x="1024" />
-<glyph glyph-name="issue-opened" unicode="&#xf026;" d="M448 768C200.562 768 0 567.438 0 320c0-247.438 200.562-448 448-448 247.438 0 448 200.562 448 448C896 567.438 695.438 768 448 768zM448 0c-176.781 0-320 143.25-320 320 0 176.781 143.219 320 320 320 176.75 0 320-143.219 320-320C768 143.25 624.75 0 448 0zM384 64h128V192H384V64zM384 256h128V576H384V256z" horiz-adv-x="896" />
-<glyph glyph-name="issue-reopened" unicode="&#xf027;" d="M639.125 64.75C585.75 24.625 520 0 448 0c-176.781 0-320 143.25-320 320 0 45.562 9.781 88.781 27 128H64v99.469C24.312 480.562 0 403.406 0 320c0-247.438 200.562-448 448-448 107.375 0 204.5 39.312 281.75 102.25L768-64V128H576L639.125 64.75zM384 64h128V192H384V64zM512 576H384v-320h128V576zM896 320c0 247.438-200.562 448-448 448-107.406 0-204.531-39.312-281.656-102.344L128 704v-192h192l-63.156 63.156C310.281 615.312 376 640 448 640c176.75 0 320-143.219 320-320 0-45.562-9.75-88.75-27-128h91v-99.5C871.688 159.438 896 236.5 896 320z" horiz-adv-x="896" />
-<glyph glyph-name="jersey" unicode="&#xf019;" d="M704 832h-192c0-32-33-64-97-64s-95 32-95 64h-192c0-128-2-384-128-384 0 0-1-544-1-576s32-64 64-64 672 0 704 0 64 32 64 64 0 576 0 576c-126 0-128 256-128 384z m-609-960c-16 0-31 10-31 32 0 32 0 480 0 480 119 64 128 192 128 384h64c0-96 32-191 160-192s160 96 160 192h64c0-186 32-276 64-339v-557s-593 0-609 0z m385 576l-32-32v-320l32-32h128l32 32v320l-32 32h-128z m96-320h-64v256h64v-256z m-352 320l-32-32v-320l32-32h128l32 32v320l-32 32h-128z m96-320h-64v256h64v-256z" horiz-adv-x="896" />
-<glyph glyph-name="jump-down" unicode="&#xf072;" d="M767.75 640H0.25L384 256.25 767.75 640zM0 128v-128h768V128H0z" horiz-adv-x="768" />
-<glyph glyph-name="jump-left" unicode="&#xf0a5;" d="M256.25 320L640-63.75v767.5L256.25 320zM0-64h128V704H0V-64z" horiz-adv-x="640" />
-<glyph glyph-name="jump-right" unicode="&#xf0a6;" d="M0-63.75L383.75 320 0 703.812V-63.75zM512 704v-768h128V704H512z" horiz-adv-x="640" />
-<glyph glyph-name="jump-up" unicode="&#xf073;" d="M0.188 0h767.5L384 383.75 0.188 0zM0 640v-128h768V640H0z" horiz-adv-x="768" />
-<glyph glyph-name="key" unicode="&#xf049;" d="M640.9 768.1c-141.4 0-256-114.6-256-256 0-19.6 2.2-38.6 6.4-56.9L0 64v-64l64-64h128l64 64v64h64v64h64v64h128l70.8 70.8c18.7-4.3 38.1-6.6 58.1-6.6 141.4 0 256 114.6 256 256S782.2 768.1 640.9 768.1zM384 320L64 0v64l320 320V320zM704 512c-35.3 0-64 28.7-64 64 0 35.3 28.7 64 64 64s64-28.7 64-64C768 540.7 739.3 512 704 512z" horiz-adv-x="896.9" />
-<glyph glyph-name="keyboard" unicode="&#xf00d;" d="M640 256h64V384h-64V256zM768 576h-64v-128h64V576zM640 576h-64v-128h64V576zM512 256h64V384h-64V256zM384 64h320V192H384V64zM768 256h128V576h-64v-192h-64V256zM256 64h64V192h-64V64zM768 64h128V192H768V64zM512 576h-64v-128h64V576zM192 384h-64v-128h64V384zM192 192h-64v-128h64V192zM0 704v-768h1024V704H0zM960 0H64V640h896V0zM384 256h64V384h-64V256zM256 576H128v-128h128V576zM384 576h-64v-128h64V576zM256 256h64V384h-64V256z" horiz-adv-x="1024" />
-<glyph glyph-name="law" unicode="&#xf0d8;" d="M514 640c34 1 61 28 62 62 1 37-29 67-66 66-34-1-61-28-62-62-1-37 29-67 66-66z m464-384h-18l-127 246c18 2 36 9 52 16 24 11 29 43 11 62l-1 1c-11 11-28 15-43 8-14-6-34-13-53-13-56 0-81 64-287 64s-231-64-287-64c-20 0-39 6-53 13-15 6-32 3-43-8l-1-1c-18-19-13-50 11-62 16-8 34-14 52-16l-127-246h-18c-8 0-14-7-13-15 11-64 92-113 191-113s180 49 191 113c1 8-5 15-13 15h-18l-127 245c83 7 127 49 191 49v-486c-35 0-64-29-64-64h-71c-28 0-57-29-57-64h512c0 35-29 64-71 64h-57c0 35-29 64-64 64v486c64 0 108-42 191-49l-127-245h-18c-8 0-14-7-13-15 11-64 92-113 191-113s180 49 191 113c1 8-5 15-13 15z m-658 0h-192l96 180 96-180z m384 0l96 180 96-180h-192z" horiz-adv-x="1024" />
-<glyph glyph-name="light-bulb" unicode="&#xf000;" d="M512 768c-176.731 0-320-143.269-320-320 0-104.69 50.278-197.633 128-256.015V0c0-35.346 28.653-64 64-64 0-35.346 28.653-64 64-64h128c35.347 0 64 28.654 64 64 35.347 0 64 28.654 64 64V191.985C781.722 250.36699999999996 832 343.31 832 448 832 624.731 688.731 768 512 768zM640 32c0-17.673-14.326-32-32-32H416c-17.674 0-32 14.327-32 32v32h256V32zM704 278.693c-33.234-33.03-64-42.389-64-124.041V128h-64V256l128 128v64l-64 64-64-64-64 64-64-64-64 64-64-64v-64l128-128v-128h-64v26.652c0 81.652-30.766 91.011-64 124.041C280.177 323.82 256 383.082 256 448c0 141.385 114.615 256 256 256s256-114.615 256-256C768 383.082 743.823 323.82 704 278.693zM512 256L384 384v64l64-64 64 64 64-64 64 64v-64L512 256z" horiz-adv-x="1024" />
-<glyph glyph-name="link" unicode="&#xf05c;" d="M768 576h-138c48-32 93-89 107-128h30c65 0 128-64 128-128s-65-128-128-128h-192c-63 0-128 64-128 128 0 23 7 45 18 64h-137c-5-21-8-42-8-64 0-128 127-256 255-256s65 0 193 0 256 128 256 256-128 256-256 256z m-481-384h-30c-65 0-128 64-128 128s65 128 128 128h192c63 0 128-64 128-128 0-23-7-45-18-64h137c5 21 8 42 8 64 0 128-127 256-255 256s-65 0-193 0-256-128-256-256 128-256 256-256h138c-48 32-93 89-107 128z" horiz-adv-x="1024" />
-<glyph glyph-name="link-external" unicode="&#xf07f;" d="M640 64H128V574.094L256 576V704H0v-768h768V256H640V64zM384 704l128-128L320 384l128-128 192 192 128-128V704H384z" horiz-adv-x="768" />
-<glyph glyph-name="list-ordered" unicode="&#xf062;" d="M320 256h448v128h-448v-128z m0-256h448v128h-448v-128z m0 640v-128h448v128h-448z m-241-256h78v256h-36l-85-23v-50l43 2v-185z m110-206c0 36-12 78-96 78-33 0-64-6-83-16l1-66c21 10 42 15 67 15s32-11 32-28c0-26-30-58-110-112v-50h192v67l-91-2c49 30 87 66 87 113l1 1z" horiz-adv-x="768" />
-<glyph glyph-name="list-unordered" unicode="&#xf061;" d="M0 256h128v128h-128v-128z m0 256h128v128h-128v-128z m0-512h128v128h-128v-128z m256 256h512v128h-512v-128z m0 256h512v128h-512v-128z m0-512h512v128h-512v-128z" horiz-adv-x="768" />
-<glyph glyph-name="location" unicode="&#xf060;" d="M320 832c-177 0-320-143-320-320s160-416 320-704c160 288 320 527 320 704s-143 320-320 320z m0-448c-71 0-128 57-128 128s57 128 128 128 128-57 128-128-57-128-128-128z" horiz-adv-x="640" />
-<glyph glyph-name="lock" unicode="&#xf06a;" d="M704 384c-32 0-64 0-64 0s0 64 0 192-128 256-256 256-256-128-256-256 0-192 0-192-32 0-64 0-64-32-64-64 0-416 0-448 32-64 64-64 608 0 640 0 64 32 64 64 0 416 0 448-32 64-64 64z m-192-128h-384v-64h384v-64h-384v-64h384v-64h-384v-64h384v-64h-448v448h448v-64z m0 128h-256s0 128 0 192 64 128 128 128 128-64 128-128 0-192 0-192z" horiz-adv-x="768" />
-<glyph glyph-name="logo-github" unicode="&#xf092;" d="M552.73 499.865H311.557c-6.205 0-11.25-5.045-11.25-11.297v-117.887c0-6.252 5.045-11.272 11.25-11.272h94.109v-146.542c0 0-21.145-7.057-79.496-7.057-68.914 0-165.156 25.244-165.156 236.795 0 211.642 100.197 239.491 194.307 239.491 81.465 0 116.514-14.304 138.869-21.241 7.01-2.203 13.404 4.831 13.404 11.105L534.543 785.87c0 2.912-1.041 6.417-4.262 8.785C521.186 801.048 465.865 832 326.168 832 165.133 832 0 763.513 0 434.243 0 105.02099999999996 189.051 56 348.381 56c131.883 0 212.021 56.314 212.021 56.314 3.268 1.801 3.6 6.395 3.6 8.479V488.568C563.955 494.773 558.887 499.865 552.73 499.865zM1772.381 803.866h-135.695c-6.252 0-11.271-5.044-11.271-11.296v-262.393h-211.619V792.57c0 6.252-5.068 11.296-11.178 11.296h-135.838c-6.111 0-11.084-5.044-11.084-11.296v-710.473c0-6.299 5.021-11.32 11.084-11.32h135.838c6.203 0 11.178 5.068 11.178 11.32V385.933h211.619l-0.475-303.883c0-6.3 5.021-11.272 11.084-11.272h135.885c6.252 0 11.131 5.068 11.131 11.272l0.473 710.521C1783.607 798.822 1778.539 803.866 1772.381 803.866zM714.949 787.763c-48.357 0-87.574-39.572-87.574-88.403 0-48.855 39.217-88.428 87.574-88.428s87.527 39.572 87.527 88.428C802.477 748.19 763.307 787.763 714.949 787.763zM792.861 559.874c0 6.205-5.02 11.344-11.131 11.344H646.32c-6.348 0-11.746-6.394-11.746-12.67 0 0 0-394.654 0-469.867 0-13.735 8.572-17.903 19.703-17.903 0 0 57.688 0 121.959 0 13.311 0 16.814 6.536 16.814 18.188-0.094 25.197-0.094 123.808-0.094 142.942C792.861 250.09500000000003 792.861 559.874 792.861 559.874zM2297.973 570.152h-134.701c-6.158 0-11.084-5.092-11.084-11.344v-348.31c0 0-34.244-25.197-82.934-25.197-48.547 0-61.525 22.024-61.525 69.719 0 47.553 0 303.835 0 303.835 0 6.252-5.068 11.345-11.131 11.345h-136.643c-6.252 0-11.178-5.093-11.178-11.345 0 0 0-185.521 0-326.807 0-141.284 78.766-175.906 186.99-175.906 88.854 0 160.609 49.115 160.609 49.115s3.363-25.766 5.068-28.844c1.422-3.078 5.447-6.158 9.852-6.158h86.58c6.158 0 11.178 5.069 11.178 11.321l0.379 477.278C2309.15 565.0609999999999 2304.129 570.152 2297.973 570.152zM2666.932 586.1610000000001c-76.539 0-128.592-34.148-128.592-34.148V792.57c0 6.252-5.068 11.296-11.131 11.296h-136.264c-6.109 0-11.131-5.044-11.131-11.296l-0.379-710.521c0-6.3 5.068-11.272 11.225-11.272 0 0 94.773 0 94.869 0 4.215 0 7.389 2.179 9.805 5.968 2.369 3.837 5.73 32.775 5.73 32.775s55.557-52.763 161.035-52.763c123.807 0 194.758 62.804 194.758 281.906C2856.859 557.482 2743.471 586.1610000000001 2666.932 586.1610000000001zM2613.791 185.77499999999998c-46.701 1.421-78.34 22.64-78.34 22.64v225.07c0 0 31.307 19.206 69.672 22.593 48.547 4.31 95.438-10.326 95.438-126.13C2700.322 207.94100000000003 2679.199 183.83399999999995 2613.791 185.77499999999998zM1185.125 188.33299999999997c-5.969 0-21.219-2.368-36.85-2.368-49.92 0-66.971 23.256-66.971 53.331 0 30.218 0 199.85 0 199.85h101.926c6.252 0 11.178 5.044 11.178 11.343v109.48c0.094 6.299-4.926 11.344-11.178 11.344h-101.926l-0.143 134.535c0 5.092-2.699 7.625-8.572 7.625H933.861c-5.352 0-8.336-2.391-8.336-7.578v-139.035c0 0-69.576-16.79-74.266-18.188-4.641-1.326-8.051-5.684-8.051-10.822v-87.408c0-6.252 5.068-11.344 11.178-11.344h71.139c0 0 0-91.34 0-210.222 0-156.109 109.553-171.455 183.439-171.455 33.723 0 74.076 10.988 80.848 13.356 4.074 1.421 6.395 5.637 6.395 10.136l0.047 96.101C1196.254 183.312 1190.998 188.428 1185.125 188.33299999999997z" horiz-adv-x="2856.857" />
-<glyph glyph-name="mail" unicode="&#xf03b;" d="M0 640v-640h896V640H0zM768 576L448 312 128 576H768zM64 512l252.031-191.625L64 128V512zM128 64l254 206.25L448 220l65.875 50.125L768 64H128zM832 128L579.625 320.062 832 512V128z" horiz-adv-x="896" />
-<glyph glyph-name="mail-read" unicode="&#xf03c;" d="M576 448H256v-64h320V448zM384 576H256v-64h128V576zM768 603.469V704H627.188L448 832 268.812 704H128v-100.531L0 512v-640h896V512L768 603.469zM192 640h512v-244.812L448 184 192 395.188V640zM64 384l252.031-191.625L64 0V384zM128-64l254 206.25L448 92l65.875 50.125L768-64H128zM832 0L579.625 192.062 832 384V0z" horiz-adv-x="896" />
-<glyph glyph-name="mail-reply" unicode="&#xf051;" d="M384 672l-384-288 384-288v192c111 0 329-61 384-280 0 291-196 451-384 472v192z" horiz-adv-x="768" />
-<glyph glyph-name="mark-github" unicode="&#xf00a;" d="M512 832C229.252 832 0 602.748 0 320c0-226.251 146.688-418.126 350.155-485.813 25.593-4.686 34.937 11.125 34.937 24.626 0 12.188-0.469 52.562-0.718 95.314-128.708-23.46-161.707 31.541-172.469 60.373-5.525 14.809-30.407 60.249-52.398 72.263-17.988 9.828-43.26 33.237-0.917 33.735 40.434 0.476 69.348-37.308 78.471-52.75 45.938-77.749 119.876-55.627 148.999-42.5 4.654 32.999 17.902 55.627 32.501 68.373-113.657 12.939-233.22 56.875-233.22 253.063 0 55.94 19.968 101.561 52.658 137.404-5.22 12.999-22.844 65.095 5.063 135.563 0 0 42.937 13.749 140.811-52.501 40.811 11.406 84.594 17.031 128.124 17.22 43.499-0.188 87.314-5.874 128.188-17.28 97.689 66.311 140.686 52.501 140.686 52.501 28-70.532 10.375-122.564 5.124-135.499 32.811-35.844 52.626-81.468 52.626-137.404 0-196.686-119.751-240-233.813-252.686 18.439-15.876 34.748-47.001 34.748-94.748 0-68.437-0.686-123.627-0.686-140.501 0-13.625 9.312-29.561 35.25-24.562C877.436-97.99800000000005 1024 93.87400000000002 1024 320 1024 602.748 794.748 832 512 832z" horiz-adv-x="1024" />
-<glyph glyph-name="markdown" unicode="&#xf0c9;" d="M950.154 640H73.846C33.127 640 0 606.873 0 566.154v-492.308C0 33.125 33.127 0 73.846 0h876.308c40.721 0 73.846 33.125 73.846 73.846V566.154C1024 606.873 990.875 640 950.154 640zM576 128.125L448 128V320l-96-123.077L256 320v-192H128V512h128l96-128 96 128 128 0.125V128.125zM767.091 96.125L608 320h96V512h128v-192h96L767.091 96.125z" horiz-adv-x="1024" />
-<glyph glyph-name="megaphone" unicode="&#xf077;" d="M832 800c-130 0-124-130-704-128C57.344 672 0 557.375 0 416s57.344-256 128-256c22.781 0 43.188-0.5 64.188-0.875L256-128l192-32 64 96-45.125 203.125C709.375 102.875 733.75 32 832 32c106 0 192 172 192 384C1024 628.031 938 800 832 800zM197 349.062c-39.188 1.469-82.188 2.25-127.562 2.625C66 371.406 64 393.094 64 416c0 88.375 28.688 192 64 192 39.031-0.125 75 0.438 109 1.406C209.656 562.438 192 493.688 192 416 192 392.688 194.062 370.562 197 349.062zM261.312 346.062C258.125 368.312 256 391.625 256 416c0 79.5 18.438 149.5 46.906 196.219 155.156 8.312 251.906 28.469 319.031 50.188C593.625 595.531 576 510.344 576 416c0-40 3.875-78 9.5-114.312C513.344 320.375 412.812 337.406 261.312 346.062zM832 128c-12.125 0-23.688 5.062-34.812 12.125-15.25 67.312-83.438 418.344 117.438 494.188C942.125 581.5 960 503.812 960 416 960 257 902.625 128 832 128z" horiz-adv-x="1024" />
-<glyph glyph-name="mention" unicode="&#xf0be;" d="M466.697 732.899C238.66 760.898 31.1 598.735 3.102 370.698c-28-228.038 134.163-435.598 362.2-463.597 71.429-8.756 145.115 0.913 213.325 29.946l-0.016 0.032c24.404 10.357 35.788 38.538 25.431 62.939-10.359 24.403-38.538 35.787-62.94 25.43l-0.001 0.004c-52.472-22.339-109.15-29.799-164.1-23.067-175.413 21.538-300.153 181.2-278.616 356.613 21.538 175.413 181.199 300.154 356.613 278.616 175.412-21.538 300.154-181.199 278.617-356.612-4.309-35.083-21.542-55.725-61.6-55.725-42.5 0-64 45.889-64 81.222V432c0 26.51-21.49 48-48 48-9.699 0-18.72-2.887-26.269-7.833-25.684 20.259-57.437 33.87-94.349 38.402-105.246 12.923-201.045-61.924-213.967-167.17C212.508 238.15200000000004 287.354 142.35400000000004 392.6 129.43200000000002c57.379-7.045 116.216 14.707 157.871 53.13 24.959-28.124 59.866-47.624 100.121-52.567 87.707-10.769 167.537 51.602 178.307 139.309C856.898 497.34 694.734 704.899 466.697 732.899zM511.285 308.30100000000004c-6.462-52.623-54.361-90.047-106.985-83.585-52.623 6.461-90.046 54.36-83.585 106.984 6.461 52.623 54.361 90.046 106.984 83.585C480.322 408.823 517.746 360.924 511.285 308.30100000000004z" horiz-adv-x="832" />
-<glyph glyph-name="microscope" unicode="&#xf089;" d="M617-64c86.312 18.75 151 100 151 192 0 58.438-26.625 110.125-67.875 145.375C702.5 288.625 704 304.125 704 320c0 104.844-49.875 197.875-128 256l64 64v64l64 64L640 832l-64-64h-64L256 512l-128-64v-128l64-64h128l64 128 96 96c55.5-33.406 96-90.438 96-160-106.062 0-192-85.938-192-192H0v-64h192c19.125-14.25 42.062-22.125 64-32v-96H128L0-192h768L640-64H617zM512 128c0 35.375 28.625 64 64 64s64-28.625 64-64c0-35.312-28.625-64-64-64S512 92.68799999999999 512 128z" horiz-adv-x="768" />
-<glyph glyph-name="milestone" unicode="&#xf075;" d="M704 640H0v-256h704l128 128L704 640zM448 448H320V576h128V448zM448 832H320v-128h128V832zM320-192h128V320H320V-192z" horiz-adv-x="832" />
-<glyph glyph-name="mirror" unicode="&#xf024;" d="M320 512L128 320l192-192V256h384v-128l192 192L704 512v-128H320V512zM512 832L0 512v-704l512 256 512-256V512L512 832zM960-64L576 128v64H448v-64L64-64V448l384 256v-256h128V704l384-256V-64z" horiz-adv-x="1024" />
-<glyph glyph-name="mortar-board" unicode="&#xf0d7;" d="M501 244l-245 76s0-96 0-160 115-96 256-96 256 32 256 96 0 160 0 160l-245-76c-7-2-15-2-23 0h1z m18 409c-4 1-9 1-13 0l-489-152c-21-7-21-36 0-43l111-35v-113c-19-11-32-32-32-55 0-12 3-23 9-32-5-9-9-20-9-32v-165c0-35 128-35 128 0v165c0 12-3 23-9 32 5 9 9 20 9 32 0 24-13 44-32 55v93l313-98c4-1 9-1 13 0l489 152c21 7 21 36 0 43l-488 153z m-6-205c-35 0-64 14-64 32s29 32 64 32 64-14 64-32-29-32-64-32z" horiz-adv-x="1024" />
-<glyph glyph-name="move-down" unicode="&#xf0a8;" d="M640 512H448V832H192v-320H0l320-384L640 512zM0-192h640V0H0V-192z" horiz-adv-x="640" />
-<glyph glyph-name="move-left" unicode="&#xf074;" d="M0 0h192V640H0V0zM704 448V640L320 320l384-320V192h320V448H704z" horiz-adv-x="1024" />
-<glyph glyph-name="move-right" unicode="&#xf0a9;" d="M832 640v-640h192V640H832zM320 448H0v-256h320v-192l384 320L320 640V448z" horiz-adv-x="1024" />
-<glyph glyph-name="move-up" unicode="&#xf0a7;" d="M0 128h192v-320h256V128h192L320 512 0 128zM0 832v-192h640V832H0z" horiz-adv-x="640" />
-<glyph glyph-name="mute" unicode="&#xf080;" d="M128 448H0v-256h128l256-192h64V640h-64L128 448zM864 416l-64 64-96-96-96 96-63-63.5 95-96.5-96-96 64-64 96 96 96-96 64 64-96 96L864 416z" horiz-adv-x="896" />
-<glyph glyph-name="no-newline" unicode="&#xf09c;" d="M896 512v-128H768V512L576 320l192-192V256h192c0 0 64 0.375 64 64s0 192 0 192H896zM224 544C100.281 544 0 443.719 0 320c0-123.75 100.281-224 224-224s224 100.25 224 224C448 443.719 347.719 544 224 544zM96 320c0 70.656 57.344 128 128 128 18.75 0 36.406-4.219 52.469-11.531L107.531 267.5C100.219 283.625 96 301.25 96 320zM224 192c-18.75 0-36.406 4.25-52.469 11.5l168.938 168.969C347.781 356.406 352 338.75 352 320 352 249.375 294.656 192 224 192z" horiz-adv-x="1024" />
-<glyph glyph-name="octoface" unicode="&#xf008;" d="M940.812 554.312c8.25 20.219 35.375 101.75-8.562 211.906 0 0-67.375 21.312-219.875-82.906C648.5 700.875 579.875 703.5 512 703.5c-67.906 0-136.438-2.625-200.5-20.25C159.031 787.531 91.719 766.219 91.719 766.219 47.812 656 74.938 574.531 83.188 554.312 31.5 498.438 0 427.125 0 339.656 0 10.437999999999988 213.25-64 510.844-64 808.562-64 1024 10.437999999999988 1024 339.656 1024 427.125 992.5 498.438 940.812 554.312zM512-1c-211.406 0-382.781 9.875-382.781 214.688 0 48.938 24.062 94.595 65.344 132.312 68.75 62.969 185.281 29.688 317.438 29.688 132.25 0 248.625 33.281 317.438-29.625 41.312-37.78 65.438-83.312 65.438-132.312C894.875 8.875 723.375-1 512-1zM351.156 319.562c-42.469 0-76.906-51.062-76.906-114.188s34.438-114.312 76.906-114.312c42.375 0 76.812 51.188 76.812 114.312S393.531 319.562 351.156 319.562zM672.875 319.562C630.5 319.562 596 268.5 596 205.375s34.5-114.312 76.875-114.312 76.812 51.188 76.812 114.312C749.75 268.5 715.312 319.562 672.875 319.562z" horiz-adv-x="1024" />
-<glyph glyph-name="organization" unicode="&#xf037;" d="M768 448h-64H576h-64-64-64-64H192h-64C57.344 448 0 390.656 0 320v-64c0-47.25 25.844-88.062 64-110.25V-64h256v-128h256V-64h256V145.75c38.125 22.188 64 62.938 64 110.25v64C896 390.656 838.625 448 768 448zM256 0H128V256H64v64c0 35.312 28.688 64 64 64h81.719c-11-18.875-17.719-40.562-17.719-64v-128c0-47.25 25.844-88.062 64-110.25V0zM576 128V256h-64v-384H384V256h-64v-128c-35.312 0-64 28.625-64 64V320c0 35.312 28.688 64 64 64h256c35.375 0 64-28.688 64-64v-128C640 156.625 611.375 128 576 128zM832 256h-64v-256H640v81.75c38.125 22.188 64 62.938 64 110.25V320c0 23.438-6.75 45.125-17.75 64H768c35.375 0 64-28.688 64-64V256zM303.688 514.625C338.875 474.125 390.156 448 448 448c57.875 0 109.125 26.125 144.312 66.625C614.125 475.062 655.688 448 704 448c70.625 0 128 57.344 128 128s-57.375 128-128 128c-25.625 0-49.375-7.688-69.375-20.688C614.875 768.438 539.062 832 448 832S281.094 768.438 261.375 683.312C241.344 696.312 217.594 704 192 704c-70.656 0-128-57.344-128-128s57.344-128 128-128C240.312 448 281.844 475.062 303.688 514.625zM704 640c35.375 0 64-28.594 64-64s-28.625-64-64-64c-35.312 0-64 28.594-64 64S668.688 640 704 640zM448 768c70.625 0 128-57.344 128-128s-57.375-128-128-128c-70.656 0-128 57.344-128 128S377.344 768 448 768zM192 512c-35.312 0-64 28.594-64 64s28.688 64 64 64c35.406 0 64-28.594 64-64S227.406 512 192 512z" horiz-adv-x="896" />
-<glyph glyph-name="package" unicode="&#xf0c4;" d="M480 768L0 640v-576l480-128 480 128V640L480 768zM63.875 111.06600000000003L63.5 544l384.498-102.533 0.001-432.833L63.875 111.06600000000003zM63.5 608l160.254 42.734L640 539.735v-0.135l-160-42.667L63.5 608zM896.125 111.06600000000003L512.001 8.634000000000015l0.001 432.833L640 475.6v-156l128 34.135V509.733L896.5 544 896.125 111.06600000000003zM768 573.733v0.125L351.734 684.862 480 719.066 896.5 608 768 573.733z" horiz-adv-x="1024" />
-<glyph glyph-name="paintcan" unicode="&#xf0d1;" d="M384 832C171.923 832 0 660.077 0 448v-64c0-35.346 28.654-64 64-64v-320c0-70.692 143.269-128 320-128s320 57.308 320 128V320c35.346 0 64 28.654 64 64v64C768 660.077 596.077 832 384 832zM576 192v-32c0-17.673-14.327-32-32-32s-32 14.327-32 32v32c0 17.673-14.327 32-32 32s-32-14.327-32-32v-160c0-17.673-14.327-32-32-32s-32 14.327-32 32V160c0 17.673-14.327 32-32 32s-32-14.327-32-32v-32c0-35.346-28.654-64-64-64s-64 28.654-64 64v64c-35.346 0-64 28.654-64 64V371.193C186.382 340.108 279.318 320 384 320s197.618 20.108 256 51.193V256C640 220.654 611.346 192 576 192zM384 384c-107.433 0-199.393 26.474-237.372 64 37.979 37.526 129.939 64 237.372 64s199.393-26.474 237.372-64C583.393 410.474 491.433 384 384 384zM384 576c-176.62 0-319.816-57.236-319.996-127.867-0.001 0.001-0.002 0.001-0.003 0.002C64.075 624.804 207.314 768 384 768c176.731 0 320-143.269 320-320C704 518.692 560.731 576 384 576z" horiz-adv-x="768" />
-<glyph glyph-name="pencil" unicode="&#xf058;" d="M704 768L576 640l192-192 128 128L704 768zM0 64l0.688-192.562L192-128l512 512L512 576 0 64zM192-64H64V64h64v-64h64V-64z" horiz-adv-x="896" />
-<glyph glyph-name="person" unicode="&#xf018;" d="M448 640C448 746 362.062 832 256 832S64 746 64 640c0-106.062 85.938-192 192-192S448 533.938 448 640zM256 512c-70.656 0-128 57.344-128 128S185.344 768 256 768c70.625 0 128-57.344 128-128S326.625 512 256 512zM384 448H256 128C57.344 448 0 390.656 0 320v-128c0-70.625 57.344-128 128-128v-256h256V64c70.625 0 128 57.375 128 128V320C512 390.656 454.625 448 384 448zM448 192c0-35.375-28.625-64-64-64V256h-64v-384H192V256h-64v-128c-35.312 0-64 28.625-64 64V320c0 35.312 28.688 64 64 64h256c35.375 0 64-28.688 64-64V192z" horiz-adv-x="512" />
-<glyph glyph-name="pin" unicode="&#xf041;" d="M196 128l64-320 64 320c-20-2-43-3-64-3s-44 1-64 3z m254 299c-33 17-62 59-62 85v64c0 22 12 39 23 52 15 13 24 29 24 45 0 53-61 95-175 95s-175-42-175-95c0-16 9-32 24-45 11-13 23-30 23-52v-64c0-26-29-68-62-85-38-19-70-54-70-88 0-74 101-148 260-148s260 73 260 148c0 33-31 68-70 88z" horiz-adv-x="519.657" />
-<glyph glyph-name="playback-fast-forward" unicode="&#xf0bd;" d="M0 64l384 256L0 576V64zM768 320L384 576v-256-256L768 320z" horiz-adv-x="768" />
-<glyph glyph-name="playback-pause" unicode="&#xf0bb;" d="M0 0h192V640H0V0zM320 640v-640h192V640H320z" horiz-adv-x="512" />
-<glyph glyph-name="playback-play" unicode="&#xf0bf;" d="M0 640l512-320L0 0V640z" horiz-adv-x="512" />
-<glyph glyph-name="playback-rewind" unicode="&#xf0bc;" d="M384 320l384-256V576L384 320zM0 320l384-256V320 576L0 320z" horiz-adv-x="768" />
-<glyph glyph-name="plug" unicode="&#xf0d4;" d="M1003.386 627.336l-0.905 0.905c-24.744 24.744-64.861 24.744-89.605 0l-45.707-45.707-90.51 90.51 45.707 45.707c24.744 24.744 24.744 64.861 0 89.605l-0.905 0.905c-24.744 24.744-64.861 24.744-89.605 0l-47.973-47.973C621.76 802.446 537.237 795.66 482.502 740.926l-24.89-24.89c-109.011-109.011-121.948-277.692-38.854-400.892l-4.138-4.138c-62.392-62.392-62.484-163.493-0.275-225.999 12.41-12.469 12.642-33.327 0.121-45.683-12.509-12.343-32.655-12.292-45.101 0.153l-89.427 89.427c-62.637 62.638-164.63 63.747-227.299 1.141-62.542-62.479-62.562-163.829-0.058-226.332l8.763-8.763c24.744-24.744 64.861-24.744 89.605 0l0.905 0.905c24.744 24.744 24.744 64.861 0 89.605l-8.292 8.292c-12.329 12.329-13.085 32.418-1.098 45.081 12.437 13.138 33.174 13.353 45.882 0.645l89.328-89.328c62.92-62.92 165.504-63.814 228.081-0.553 61.793 62.468 61.65 163.161-0.431 225.451-12.55 12.592-12.777 32.866-0.207 45.437l4.151 4.151c123.2-83.095 291.881-70.158 400.892 38.854l24.89 24.89c54.734 54.735 61.52 139.258 20.362 201.382l47.973 47.973C1028.129 562.475 1028.129 602.593 1003.386 627.336zM889.796 333.632c-37.49-37.49-98.274-37.49-135.765 0L527.757 559.906c-37.49 37.49-37.49 98.274 0 135.765 29.556 29.556 73.585 35.804 109.269 18.759l-41.839-41.839c-24.744-24.744-24.744-64.861 0-89.604l0.905-0.905c24.744-24.744 64.861-24.744 89.605 0l45.707 45.707 90.51-90.51-45.707-45.707c-24.744-24.744-24.744-64.861 0-89.605l0.905-0.905c24.744-24.744 64.861-24.744 89.604 0l41.839 41.839C925.6 407.218 919.351 363.188 889.796 333.632z" horiz-adv-x="1024" />
-<glyph glyph-name="plus" unicode="&#xf05d;" d="M384 384V640H256v-256H0v-128h256v-256h128V256h256V384H384z" horiz-adv-x="640" />
-<glyph glyph-name="podium" unicode="&#xf0af;" d="M320 832c-32 0-64-32-64-64s0-64 0-64h-64l-192-192v-128h192l64-384-128-64v-64h512v64l-128 64 64 384h192v128l-192 192h-256v64s14 0 32 0 32 17 32 32-16 32-32 32 0 0-32 0z m0-832l-53 320h118l-1-320h-64z m-224 512l128 128h32v-64h64v64h224l128-128h-576z" horiz-adv-x="768" />
-<glyph glyph-name="primitive-dot" unicode="&#xf052;" d="M-0.088 320c0 141.5 114.5 256 256 256 141.438 0 256-114.5 256-256s-114.562-256-256-256C114.413 64-0.088 178.5-0.088 320z" horiz-adv-x="511.825" />
-<glyph glyph-name="primitive-square" unicode="&#xf053;" d="M512 64H0V576h512V64z" horiz-adv-x="512" />
-<glyph glyph-name="pulse" unicode="&#xf085;" d="M736 320.062L563.188 486.406 422.406 288 352 729.594 152.438 320.062H0V192h230.406L288 307.188l57.594-345.562L576 288l102.375-96H896V320.062H736z" horiz-adv-x="896" />
-<glyph glyph-name="puzzle" unicode="&#xf0c0;" d="M755.75 256.85c-13.95 9.96-28.52 16.59-43.47 19.92-8.84 1.69-18.06 2.33-27.57 1.81-8.99-0.5-17.56-1.68-25.69-3.52-6.1-1.69-12.22-3.89-18.35-6.59-18.18-8.02-33.89-18.12-46.79-30.33-12.22-12.9-22.32-28.62-30.34-46.79-2.7-6.12-4.9-12.24-6.59-18.34-1.84-8.14-3.03-16.7-3.52-25.69-0.52-9.51 0.12-18.73 1.81-27.57 3.33-14.95 9.96-29.52 19.92-43.47 3.89-5.44 8.08-10.4 12.56-14.88 20.06-20.03 45.83-30.7 75.42-34.11 8.92-1.02 18.12-1.68 26.53-4.48 5.12-1.7 9.16-4.08 12.08-7.02 6.65-6.6 7.63-16.1 2.5-27.24-3.15-6.84-7.7-13.45-12.96-18.84l-2.79-2.86c-3.93-3.92-6.41-6.4-7.05-7.04-3.13-3.16-6.1-6.15-9.06-9.15l-2.96-2.92c-10.52-10.58-21.09-21.12-31.66-31.65-22.76-22.82-45.57-45.58-68.38-68.36-7.5-7.5-15-15-22.5-22.49-3.46-3.45-7.07-6.38-10.78-8.79-1.8-1.22-3.49-2.24-5.18-3.16-19.6-9.89-41.43-5.92-59.24 11.88-5.4 5.4-10.62 10.62-15.85 15.84-30.25 30.25-60.48 60.52-90.77 90.73-8.59 8.57-17.13 17.08-25.68 25.59-6.12 6.09-12.67 11.85-19.56 17.06-5.72 4.33-11.59 7.56-17.46 9.73-21.16 7.32-41.41 2.01-54.67-13.26-3.81-4.8-7-10.47-9.39-16.94-3.43-9.26-4.6-19.47-5.9-29.36-4.9-37.53-25.8-68.43-55.98-82.65-7.48-3.65-15.49-6.29-23.9-7.78-7.95-1.41-15.95-1.71-23.85-1.04-26.61 1.35-49.48 13.09-68.51 32.57-1.68 1.67-2.1 2.09-2.51 2.51-19.48 19.02-31.22 41.9-32.57 68.5-0.68 7.9-0.37 15.9 1.04 23.85 1.49 8.41 4.13 16.43 7.78 23.9 14.22 30.18 45.13 51.07 82.65 55.97 9.89 1.29 20.1 2.47 29.36 5.9 6.94 2.56 12.96 6.05 17.97 10.23 14.54 13.15 19.59 32.63 12.84 52.34-2.78 7.35-6 13.22-10.33 18.94-5.21 6.88-10.97 13.43-17.06 19.55-8.51 8.55-17.03 17.09-25.55 25.63-26.92 26.98-53.84 53.88-80.75 80.78l-10.03 10.03c-5.22 5.22-10.45 10.45-15.26 15.27-18.39 18.4-22.35 40.22-12.46 59.82 0.92 1.69 1.94 3.37 3.08 5.05 2.49 3.84 5.42 7.45 8.87 10.91 7.49 7.5 14.99 15 22.49 22.5 22.77 22.81 45.54 45.62 68.36 68.38 10.53 10.57 21.06 21.14 31.65 31.66l2.92 2.96c2.99 2.97 5.99 5.93 8.98 8.9 0.8 0.81 3.28 3.29 7.2 7.22l2.86 2.79c5.39 5.26 12 9.8 18.84 12.96 11.14 5.13 20.63 4.15 27.24-2.5 2.94-2.92 5.32-6.96 7.02-12.08 2.79-8.41 3.45-17.61 4.48-26.53 3.41-29.59 14.08-55.35 34.11-75.41 4.49-4.48 9.44-8.67 14.88-12.56 13.95-9.96 28.52-16.59 43.47-19.92 8.84-1.69 18.06-2.33 27.57-1.81 8.99 0.5 17.56 1.68 25.69 3.52 6.1 1.69 12.22 3.89 18.35 6.59 18.18 8.02 33.89 18.12 46.79 30.33 12.22 12.9 22.32 28.62 30.34 46.79 2.7 6.12 4.9 12.24 6.59 18.34 1.84 8.14 3.03 16.7 3.52 25.69 0.52 9.51-0.12 18.73-1.81 27.57-3.33 14.95-9.96 29.52-19.92 43.47-3.89 5.44-8.08 10.4-12.56 14.88-20.06 20.03-45.83 30.7-75.42 34.11-8.92 1.02-18.12 1.68-26.53 4.48-5.12 1.7-9.16 4.08-12.08 7.02-6.65 6.6-7.63 16.1-2.5 27.24 3.15 6.84 7.7 13.45 12.96 18.84l2.79 2.86c3.93 3.92 6.41 6.4 7.05 7.04 3.13 3.16 6.1 6.15 9.06 9.15l2.96 2.92c10.52 10.58 21.09 21.12 31.66 31.65 22.76 22.82 45.57 45.58 68.38 68.35 7.5 7.5 15 15 22.5 22.49 3.46 3.45 7.07 6.38 10.78 8.79 1.8 1.22 3.49 2.24 5.18 3.16 19.6 9.89 41.43 5.92 59.24-11.88 5.4-5.4 10.62-10.62 15.85-15.84 30.25-30.25 60.48-60.52 90.77-90.73 8.59-8.57 17.13-17.08 25.68-25.59 6.12-6.09 12.67-11.85 19.56-17.06 5.72-4.33 11.59-7.56 17.46-9.73 21.16-7.32 41.41-2.01 54.67 13.26 3.81 4.8 7 10.47 9.39 16.94 3.43 9.26 4.6 19.47 5.9 29.36 4.9 37.53 25.8 68.43 55.98 82.65 7.48 3.65 15.49 6.28 23.9 7.78 7.95 1.41 15.95 1.71 23.85 1.04 26.61-1.35 49.48-13.09 68.51-32.57 1.68-1.67 2.1-2.09 2.51-2.51 19.48-19.02 31.22-41.9 32.57-68.5 0.68-7.9 0.37-15.9-1.04-23.85-1.49-8.41-4.13-16.43-7.78-23.9-14.22-30.18-45.13-51.07-82.65-55.97-9.89-1.29-20.1-2.47-29.36-5.9-6.94-2.56-12.96-6.05-17.97-10.23-14.54-13.15-19.59-32.63-12.84-52.34 2.78-7.35 6-13.22 10.33-18.94 5.21-6.88 10.97-13.43 17.06-19.55 8.51-8.55 17.03-17.09 25.55-25.63 30.26-30.33 60.54-60.56 90.78-90.81 5.22-5.22 10.45-10.45 15.26-15.27 18.39-18.4 22.35-40.22 12.46-59.82-0.92-1.69-1.94-3.37-3.08-5.05-2.49-3.84-5.42-7.45-8.87-10.91-7.49-7.5-14.99-15-22.49-22.5-22.77-22.81-45.54-45.62-68.36-68.38-10.53-10.57-21.06-21.14-31.65-31.66l-2.92-2.96c-2.99-2.97-5.99-5.93-8.98-8.9-0.8-0.81-3.28-3.29-7.2-7.22l-2.86-2.79c-5.39-5.26-12-9.8-18.84-12.96-11.14-5.13-20.63-4.15-27.24 2.5-2.94 2.92-5.32 6.96-7.02 12.08-2.79 8.41-3.45 17.61-4.48 26.53-3.41 29.59-14.08 55.35-34.11 75.41C766.15 248.76999999999998 761.19 252.97000000000003 755.75 256.85z" horiz-adv-x="1024" />
-<glyph glyph-name="question" unicode="&#xf02c;" d="M448 64h128v128h-128v-128z m64 512c-96 0-192-96-192-192h128c0 32 32 64 64 64s64-32 64-64c0-64-128-64-128-128h128c64 22 128 64 128 160s-96 160-192 160z m0 256c-283 0-512-229-512-512s229-512 512-512 512 229 512 512-229 512-512 512z m0-896c-212 0-384 172-384 384s172 384 384 384 384-172 384-384-172-384-384-384z" horiz-adv-x="1024" />
-<glyph glyph-name="quote" unicode="&#xf063;" d="M0 320v-256h256V320H128c0 0 0 128 128 128V576C256 576 0 576 0 320zM640 448V576c0 0-256 0-256-256v-256h256V320H512C512 320 512 448 640 448z" horiz-adv-x="640" />
-<glyph glyph-name="radio-tower" unicode="&#xf030;" d="M306.838 441.261c15.868 16.306 15.868 42.731 0 59.037-20.521 21.116-30.643 48.417-30.705 76.124 0.062 27.77 10.183 55.039 30.705 76.186 15.868 16.337 15.868 42.764 0 59.069-7.934 8.184-18.272 12.275-28.706 12.275-10.371 0-20.804-4.029-28.738-12.213-36.266-37.297-54.633-86.433-54.57-135.317-0.062-48.792 18.305-97.927 54.57-135.161C265.262 424.955 290.97 424.955 306.838 441.261zM149.093 798.858c-8.121 8.309-18.68 12.463-29.3 12.463-10.558 0-21.179-4.154-29.237-12.463C30.8 737.509 0.751 656.856 0.813 576.422 0.751 496.081 30.8 415.272 90.494 353.985c16.181-16.618 42.356-16.618 58.537 0 16.118 16.587 16.118 43.513 0 60.067-43.7 44.98-65.44 103.456-65.44 162.368s21.74 117.449 65.44 162.368C165.149 755.439 165.149 782.365 149.093 798.858zM513.031 472.153c57.351 0 103.956 46.574 103.956 103.956 0 57.382-46.605 103.955-103.956 103.955-57.381 0-103.956-46.573-103.956-103.955C409.076 518.727 455.65 472.153 513.031 472.153zM933.539 798.233c-16.181 16.618-42.355 16.618-58.475 0-16.181-16.587-16.181-43.513 0-60.068 43.668-44.918 65.409-103.456 65.409-162.368 0-58.85-21.805-117.387-65.473-162.306-16.117-16.618-16.117-43.575 0.062-60.068 8.059-8.309 18.616-12.463 29.237-12.463 10.558 0 21.178 4.154 29.236 12.463 59.726 61.287 89.774 142.096 89.649 222.437C1023.313 656.138 993.264 736.947 933.539 798.233zM513.281 389.127L513.281 389.127c-26.489-0.062-53.04 6.466-77.091 19.429L235.057-127.59000000000003h95.209l54.819 63.973h255.891l53.977-63.973h95.272L589.124 408.431C565.384 395.655 539.395 389.127 513.281 389.127zM512.656 358.483L577.004 128.29999999999995H449.059L512.656 358.483zM385.086 0.3550000000000182l63.974 63.973h127.944l63.974-63.973H385.086zM717.194 710.958c-15.868-16.306-15.868-42.731 0-59.037 20.491-21.116 30.611-48.511 30.674-76.124-0.062-27.77-10.183-55.102-30.674-76.187-15.868-16.336-15.868-42.763 0-59.068 7.871-8.184 18.242-12.213 28.737-12.213 10.309 0 20.741 4.029 28.675 12.213 36.298 37.234 54.665 86.433 54.54 135.255 0.125 48.792-18.181 97.927-54.54 135.161C758.801 727.264 733.062 727.264 717.194 710.958z" horiz-adv-x="1024" />
-<glyph glyph-name="repo" unicode="&#xf001;" d="M320 576h-64v-64h64v64z m0 128h-64v-64h64v64z m384 128c-32 0-608 0-640 0s-64-32-64-64 0-736 0-768 32-64 64-64 128 0 128 0v-128l96 96 96-96v128s288 0 320 0 64 32 64 64 0 736 0 768-32 64-64 64z m0-800c0-16-15-32-32-32s-288 0-288 0v64h-192v-64s-79 0-96 0-32 17-32 32 0 96 0 96h640s0-80 0-96z m0 160h-512v576h513l-1-576z m-384 128h-64v-64h64v64z m0 128h-64v-64h64v64z" horiz-adv-x="768" />
-<glyph glyph-name="repo-clone" unicode="&#xf04c;" d="M320 448h-64v-64h64v64z m-128 320h256v64s-352 0-384 0-64-32-64-64 0-736 0-768 32-64 64-64 128 0 128 0v-128l96 96 96-96v128s286 0 320 0 64 32 64 64 0 192 0 192h-576v576z m512-640s0-79 0-96-14-32-32-32-288 0-288 0v64h-192v-64s-80 0-96 0-32 16-32 32 0 96 0 96h640z m-384 448h-64v-64h64v64z m-64-320h64v64h-64v-64z m704 576c-32 0-288 0-320 0s-64-32-64-64 0-352 0-384 32-64 64-64 64 0 64 0v-64l32 32 32-32v64s160 0 192 0 64 32 64 64 0 352 0 384-32 64-64 64z m-256-448s-15 0-32 0-32 15-32 32 0 32 0 32h64v-64z m256 32c0-16-15-32-32-32s-160 0-160 0v64h192s0-16 0-32z m0 96h-256v256h224s32 0 32-32 0-224 0-224z m-640 192h-64v-64h64v64z" horiz-adv-x="1024" />
-<glyph glyph-name="repo-force-push" unicode="&#xf04a;" d="M768 768c0 32-32 64-64 64s-608 0-640 0-64-32-64-64 0-768 0-768 0 32 0 0 32-64 64-64 128 0 128 0v-128l128 128v128h-128v-64s-79 0-96 0-32 15-32 32 0 96 0 96h256v64h-128v576h512v-576h-128v-64h128s0-80 0-96-15-32-32-32-96 0-96 0v-64s96 0 128 0 64 32 64 64 0 736 0 768z m-272-320h144l-192 256-192-256h144l-144-192h128v-448h128v448h128l-144 192z" horiz-adv-x="767.896" />
-<glyph glyph-name="repo-forked" unicode="&#xf002;" d="M768 704c0 71-57 128-128 128s-128-57-128-128c0-47 26-89 64-111v-106l-192-212-192 212v106c38 22 64 63 64 111 0 71-57 128-128 128s-128-57-128-128c0-47 26-89 64-111v-156l256-282v-109c-38-22-64-63-64-111 0-71 57-128 128-128s128 57 128 128c0 47-26 89-64 111v109l256 282v156c38 22 64 63 64 111z m-640 63c34 0 62-28 62-62s-28-62-62-62-62 28-62 62 28 62 62 62z m256-891c-34 0-62 28-62 62s28 62 62 62 62-28 62-62-28-62-62-62z m256 891c34 0 62-28 62-62s-28-62-62-62-62 28-62 62 28 62 62 62z" horiz-adv-x="768" />
-<glyph glyph-name="repo-pull" unicode="&#xf006;" d="M1024 512l-192 192v-128h-384v-128h384v-128l192 192z m-320-320h-512v576h512v-128h64s0 96 0 128-32 64-64 64-608 0-640 0-64-32-64-64 0-736 0-768 32-64 64-64 128 0 128 0v-128l96 96 96-96v128s288 0 320 0 64 32 64 64 0 384 0 384h-64v-192z m0-160c0-15-15-32-32-32s-288 0-288 0v64h-192v-64s-79 0-96 0-32 16-32 32 0 96 0 96h640s0-81 0-96z m-384 544h-64v-64h64v64z m0 128h-64v-64h64v64z m0-256h-64v-64h64v64z m-64-192h64v64h-64v-64z" horiz-adv-x="1024" />
-<glyph glyph-name="repo-push" unicode="&#xf005;" d="M448 512l-192-256h128v-448h128v448h128l-192 256z m-192 0h64v64h-64v-64z m64 192h-64v-64h64v64z m384 128c-32 0-608 0-640 0s-64-32-64-64 0-736 0-768 32-64 64-64 128 0 128 0v-128l128 128v128h-128v-64s-79 0-96 0-32 14-32 32 0 96 0 96h256v64h-128v576h513l-1-576h-128v-64h128s0-79 0-96-15-32-32-32-96 0-96 0v-64s96 0 128 0 64 32 64 64 0 736 0 768-32 64-64 64z" horiz-adv-x="768" />
-<glyph glyph-name="rocket" unicode="&#xf033;" d="M716.737 707.944c-71.926-41.686-148.041-96.13-218.436-166.555-45-45.031-81.213-88.78-110.39-129.778L209.538 378.65 0.047 169.00300000000004l186.818-5.815 131.562 131.562c-46.439-96.224-50.536-160.019-50.536-160.019l58.854-58.792c0 0 65.827 6.255 162.737 53.163L355.107-5.119000000000028l5.88-186.881 209.585 209.521 33.086 179.252c41.403 29.02 85.185 65.046 129.716 109.545 70.425 70.455 124.837 146.541 166.555 218.466-45.97 9.351-88.125 28.488-121.397 61.668C745.257 619.819 725.994 661.975 716.737 707.944zM786.161 745.157c5.004-45 19.952-81.274 44.78-105.98 24.769-24.985 60.98-39.902 106.138-44.844C1003.063 727.677 1023.953 832 1023.953 832S919.63 811.142 786.161 745.157z" horiz-adv-x="1024" />
-<glyph glyph-name="rss" unicode="&#xf034;" d="M128 192C57.344 192 0 134.625 0 64s57.344-128 128-128 128 57.375 128 128S198.656 192 128 192zM128 448c0 0-64-2-64-64s64-64 64-64c141.375 0 256-114.625 256-256 0 0 0-64 64-64s64 64 64 64C512 276 340.031 448 128 448zM128 704c0 0-64 0-64-64s64-64 64-64c282.75 0 512-229.25 512-512 0 0 0-64 64-64s64 64 64 64C768 417.406 481.5 704 128 704z" horiz-adv-x="768" />
-<glyph glyph-name="ruby" unicode="&#xf047;" d="M768 704H256L0 448l512-512 512 512L768 704zM128 448l192 192h384l192-192L512 64 128 448zM704 576H512v-448l320 320L704 576z" horiz-adv-x="1024" />
-<glyph glyph-name="screen-full" unicode="&#xf066;" d="M128 64h639.875V576H128V64zM255.938 448h384v-256h-384V448zM64 639.938h191.938v64H0V448h64V639.938zM64 192H0v-255.938h255.938V0H64V192zM639.938 703.938v-64h191.938V448h64V703.938H639.938zM831.875 0H639.938v-63.938h255.938V192h-64V0z" horiz-adv-x="895.875" />
-<glyph glyph-name="screen-normal" unicode="&#xf067;" d="M127.938 640.062H0v-64h191.938V768h-64V640.062zM0-0.06200000000001182h127.938V-128h64V63.93799999999999H0V-0.06200000000001182zM768.062 640.062V768h-64v-191.938H896v64H768.062zM704.062-128h64V-0.06200000000001182H896v64H704.062V-128zM192.062 128H704V512H192.062V128zM320 384h256v-128H320V384z" horiz-adv-x="896" />
-<glyph glyph-name="search" unicode="&#xf02e;" d="M960 0L710.875 249.125C746.438 307.188 768 374.844 768 448 768 660.031 596 832 384 832 171.969 832 0 660.031 0 448c0-212 171.969-384 384-384 73.156 0 140.812 21.562 198.875 57L832-128c17.5-17.5 46.5-17.375 64 0l64 64C977.5-46.5 977.5-17.5 960 0zM384 192c-141.375 0-256 114.625-256 256s114.625 256 256 256 256-114.625 256-256S525.375 192 384 192z" horiz-adv-x="973.125" />
-<glyph glyph-name="server" unicode="&#xf097;" d="M704 448h-640c-35 0-64-32-64-64v-128c0-32 32-64 64-64h640c32 0 64 32 64 64v128c0 32-32 64-64 64z m-576-192h-64v128h64v-128z m128 0h-64v128h64v-128z m128 0h-64v128h64v-128z m128 0h-64v128h64v-128z m192-128h-640c-35 0-64-32-64-64v-128c0-32 32-64 64-64h640c32 0 64 32 64 64v128c0 32-32 64-64 64z m-576-192h-64v128h64v-128z m128 0h-64v128h64v-128z m128 0h-64v128h64v-128z m128 0h-64v128h64v-128z m192 832h-640c-35 0-64-32-64-64v-128c0-32 32-64 64-64h640c32 0 64 32 64 64v128c0 32-32 64-64 64z m-576-192h-64v128h64v-128z m128 0h-64v128h64v-128z m128 0h-64v128h64v-128z m128 0h-64v128h64v-128z m192 64h-64v64h64v-64z" horiz-adv-x="768" />
-<glyph glyph-name="settings" unicode="&#xf07c;" d="M64-64h128V128H64V-64zM192 704H64v-320h128V704zM512 704H384v-128h128V704zM0 192h256V320H0V192zM384-64h128V320H384V-64zM320 384h256V512H320V384zM832 704H704v-384h128V704zM640 256v-128h256V256H640zM704-64h128V64H704V-64z" horiz-adv-x="896" />
-<glyph glyph-name="sign-in" unicode="&#xf036;" d="M640 256L640 384 896 384 896 512 640 512 640 640 448 496 448 640 192 768 704 768 704 576 768 576 768 832 64 832 64 0 448-192 448 0 768 0 768 320 704 320 704 64 448 64 448 400z" horiz-adv-x="896" />
-<glyph glyph-name="sign-out" unicode="&#xf032;" d="M640 64H384V640L128 768h512v-192h64V832H0v-832l384-192V0h320V320h-64V64zM1024 448L768 640v-128H512v-128h256v-128L1024 448z" horiz-adv-x="1024" />
-<glyph glyph-name="split" unicode="&#xf0c6;" d="M448 576l-256 256-192-192 311-300c15 81 43 136 133 230l5 6z m128 256l133-133-197-197c-99-99-128-162-128-309v-384h256v384c0 52 19 94 53 128l197 197 133-133v448h-448z" horiz-adv-x="1024" />
-<glyph glyph-name="squirrel" unicode="&#xf0b2;" d="M768 768c-141.385 0-256-83.75-256-186.875C512 457.25 544 387 512 192c0 288-177 405.783-256 405.783 3.266 32.17-30.955 42.217-30.955 42.217s-14-7.124-19.354-21.583c-17.231 20.053-36.154 17.54-36.154 17.54l-8.491-37.081c0 0-117.045-40.876-118.635-206.292C56 371 141.311 353.898 201.887 364.882c57.157-2.956 42.991-50.648 30.193-63.446C178.083 247.438 128 320 64 320s-64-64 0-64 64-64 192-64c-198-77 0-256 0-256h-64c-64 0-64-64-64-64s256 0 384 0c192 0 320 64 320 222.182 0 54.34-27.699 114.629-64 162.228C697.057 349.433 782.453 427.566 832 384s192-64 192 128C1024 653.385 909.385 768 768 768zM160 448c-17.674 0-32 14.327-32 32 0 17.674 14.326 32 32 32 17.673 0 32-14.326 32-32C192 462.327 177.673 448 160 448z" horiz-adv-x="1024" />
-<glyph glyph-name="star" unicode="&#xf02a;" d="M896 448l-313.5 40.781L448 768 313.469 488.781 0 448l230.469-208.875L171-63.93799999999999l277 148.812 277.062-148.812L665.5 239.125 896 448z" horiz-adv-x="896" />
-<glyph glyph-name="steps" unicode="&#xf0c7;" d="M136 768C60.89 768 0 667.71 0 544c0-68.83 17.02-141.84 34-254.54C47.3 201.16999999999996 79.67 128 136 128s94.08 48.79 94.08 137.97c0 30.37-24.97 78.75-26.08 120.03-2.02 74.46 49.93 104.17 49.93 173C253.93 682.71 211.1 768 136 768zM502.97 512c-75.1 0-117.93-85.29-117.93-209 0-68.83 51.95-98.54 49.93-173-1.109-41.28-26.08-89.66-26.08-120.03 0-89.18 37.75-137.97 94.08-137.97s88.7 73.17 102 161.46c16.98 112.7 34 185.71 34 254.54C638.97 411.71 578.08 512 502.97 512z" horiz-adv-x="640" />
-<glyph glyph-name="stop" unicode="&#xf08f;" d="M704 832H320L0 512v-384l320-320h384l320 320V512L704 832zM896 192L640-64H384L128 192V448l256 256h256l256-256V192zM448 256h128V576H448V256zM448 64h128V192H448V64z" horiz-adv-x="1024" />
-<glyph glyph-name="sync" unicode="&#xf087;" d="M655.461 358.531c11.875-81.719-13.062-167.781-76.812-230.594-94.188-92.938-239.5-104.375-346.375-34.562l74.875 73L31.96 204.75 70.367-64l84.031 80.5c150.907-111.25 364.938-100.75 502.063 34.562 79.5 78.438 115.75 182.562 111.25 285.312L655.461 358.531zM189.46 511.938c94.156 92.938 239.438 104.438 346.313 34.562l-75-72.969 275.188-38.406L697.586 704l-83.938-80.688C462.711 734.656 248.742 724.031 111.585 588.75 32.085 510.344-4.133 406.219 0.335 303.5l112.25-22.125C100.71 363.125 125.71 449.094 189.46 511.938z" horiz-adv-x="768.051" />
-<glyph glyph-name="tag" unicode="&#xf015;" d="M384 768H128L0 640v-256l512-512 384 384L384 768zM64 416V608l96 96h192l448-448L512-32 64 416zM448 512L256 320l256-256 192 192L448 512zM352 320l96 96 160-160-96-96L352 320zM320 544c0 53-43 96-96 96s-96-43-96-96 43-96 96-96S320 491 320 544zM224 512c-17.656 0-32 14.344-32 32s14.344 32 32 32 32-14.344 32-32S241.656 512 224 512z" horiz-adv-x="896" />
-<glyph glyph-name="telescope" unicode="&#xf088;" d="M76 409c32 8 229 59 229 59-1-6-2-19-2-19 0-71 49-128 128-128s128 59 128 128c0 11-8 22-19 32l49-3s7 2 31 8c-51-14-108 31-126 99s8 135 60 149c-24-6-31-8-31-8l-168-110c-34-9-55-46-46-80 2-9 7-17 12-23-7-12-12-26-15-40-27 1-51 19-59 46-9 34 11 69 45 78l-245-65c-34-9-54-43-45-77s41-54 73-46z m419-153h-128v-64l-320-320h128l192 128v-128h128v128l192-128h128l-320 320v64z m429 448c-18 68-70 110-122 96-69-18-98-28-186-51-51-14-79-80-61-148s74-115 125-102c87 23 117 33 186 51 51 14 76 85 58 154z m-70-90c-17-5-42 17-51 51s-4 66 13 70 42-17 51-51 4-66-13-70z" horiz-adv-x="929.875" />
-<glyph glyph-name="terminal" unicode="&#xf0c8;" d="M831 705H63c-35.35 0-64-28.65-64-64v-640c0-35.35 28.65-64 64-64h768c35.35 0 64 28.65 64 64V641C895 676.35 866.35 705 831 705zM127 257l128 128L127 513l64 64 192-192L191 193 127 257zM639 193H383v64h256V193z" horiz-adv-x="896" />
-<glyph glyph-name="three-bars" unicode="&#xf05e;" d="M0 640v-128h768v128h-768z m0-384h768v128h-768v-128z m0-256h768v128h-768v-128z" horiz-adv-x="768" />
-<glyph glyph-name="thumbsdown" unicode="&#xf0db;" d="M833 258c0-38-31-68-68-68h-111c-5 0-109 4-128-8-19-11-21-101-8-139 12-34 22-100-16-150-23-30-57-25-78-17-23 8-14 50-10 86 4 35-14 93-47 123s-29 58-45 86-41 52-62 86-68 41-132 39v353s93 0 114 2c31 3 72 13 112 26 41 13 128 26 140 26 89 3 174-18 208-24 34-7 60-41 54-77-2-11-6-21-12-29 6-2 11-5 16-9 22-12 36-34 36-60 0-21-9-39-24-52 4-1 8-3 12-5 27-9 47-35 47-65 0-27-16-51-40-62 2-1 4-2 6-4 15-9 26-23 31-40 2-6 3-11 3-18 0-1 0-1 0-2z" horiz-adv-x="1024" />
-<glyph glyph-name="thumbsup" unicode="&#xf0da;" d="M833 381c0 38-31 68-68 68h-111c-5 0-109-4-128 8-19 11-21 101-8 139 12 34 22 100-16 150-23 30-57 25-78 17-23-8-14-50-10-86 4-35-14-93-47-123s-29-58-45-86-41-52-62-86-68-41-132-39v-353s93 0 114-2c31-3 72-13 112-26 41-13 128-26 140-26 89-3 174 18 208 24s60 41 54 77c-2 11-6 21-12 29 6 2 11 5 16 9 22 12 36 34 36 60 0 21-9 39-24 52 4 1 8 3 12 5 27 9 47 35 47 65 0 27-16 51-40 62 2 1 4 2 6 4 15 9 26 23 31 40 2 6 3 11 3 18 0 1 0 1 0 2z" horiz-adv-x="1024" />
-<glyph glyph-name="tools" unicode="&#xf031;" d="M286.547 366.984c16.843-16.812 81.716-85.279 81.716-85.279l35.968 37.093-56.373 58.248L456.072 491.98c0 0-48.842 47.623-27.468 28.655 20.438 75.903 1.812 160.589-55.842 220.243C315.608 800.064 234.392 819.47 161.425 799.096l123.653-127.715-32.53-125.309-121.06-33.438L7.898 640.3820000000001c-19.718-75.436-0.969-159.339 56.311-218.556C124.302 359.703 210.83 341.453 286.547 366.984zM698.815 242.769L549.694 95.46100000000001l245.932-254.805c20.062-20.812 46.498-31.188 72.872-31.188 26.25 0 52.624 10.375 72.811 31.188 40.249 41.624 40.249 108.997 0 150.62L698.815 242.769zM1023.681 670.162L867.06 832.001 405.387 354.703l56.373-58.248L185.425 10.839000000000055l-63.154-33.749-89.217-145.559 22.719-23.562 140.839 92.247 32.655 65.312 276.336 285.554 56.404-58.248L1023.681 670.162z" horiz-adv-x="1024" />
-<glyph glyph-name="trashcan" unicode="&#xf0d0;" d="M704 704H448c0 0 0 24.057 0 32 0 17.673-14.327 32-32 32s-32-14.327-32-32c0-17.673 0-32 0-32H128c-35.346 0-64-28.654-64-64v-64c0-35.346 28.654-64 64-64v-576c0-35.346 28.654-64 64-64h448c35.346 0 64 28.654 64 64V512c35.346 0 64 28.654 64 64v64C768 675.346 739.346 704 704 704zM640-32c0-17.673-14.327-32-32-32H224c-17.673 0-32 14.327-32 32V512h64v-480c0-17.673 14.327-32 32-32s32 14.327 32 32l0.387 480H384v-480c0-17.673 14.327-32 32-32s32 14.327 32 32l0.387 480h64L512 32c0-17.673 14.327-32 32-32s32 14.327 32 32V512h64V-32zM704 592c0-8.837-7.163-16-16-16H144c-8.837 0-16 7.163-16 16v32c0 8.837 7.163 16 16 16h544c8.837 0 16-7.163 16-16V592z" horiz-adv-x="768" />
-<glyph glyph-name="triangle-down" unicode="&#xf05b;" d="M0 448l383.75-383.75L767.5 448H0z" horiz-adv-x="767.5" />
-<glyph glyph-name="triangle-left" unicode="&#xf044;" d="M0 320.125l383.75-383.75v767.5L0 320.125z" horiz-adv-x="383.75" />
-<glyph glyph-name="triangle-right" unicode="&#xf05a;" d="M0.062 703.75L383.812 320 0.062-63.75V703.75z" horiz-adv-x="383.875" />
-<glyph glyph-name="triangle-up" unicode="&#xf0aa;" d="M383.75 576L0 192.25h767.5L383.75 576z" horiz-adv-x="767.5" />
-<glyph glyph-name="unfold" unicode="&#xf039;" d="M384 448h128V640h128L448 832 256 640h128V448zM576 576v-64h224L672 384H224L96 512h224v64H0v-63.999L160 352 0 192v-64h320v64H96l128 128h448l128-128H576v-64h320v64L736 352l160 160.001V576H576zM512 256H384v-192H256l192-192 192 192H512V256z" horiz-adv-x="896" />
-<glyph glyph-name="unmute" unicode="&#xf0ba;" d="M128 448H0v-256h128l256-192h64V640h-64L128 448zM538.51 410.51c-12.496 12.497-32.758 12.497-45.255 0-12.496-12.496-12.496-32.758 0-45.255 24.994-24.993 24.994-65.516 0-90.51-12.496-12.496-12.496-32.758 0-45.255 12.497-12.496 32.759-12.496 45.255 0C588.497 279.47900000000004 588.497 360.523 538.51 410.51zM629.02 501.019c-12.495 12.497-32.758 12.497-45.255 0-12.495-12.496-12.495-32.758 0-45.255 74.981-74.98 74.981-196.548 0-271.528-12.495-12.497-12.495-32.76 0-45.256 12.497-12.496 32.76-12.496 45.255 0C728.994 238.95399999999995 728.994 401.045 629.02 501.019zM719.529 591.529c-12.497 12.497-32.76 12.497-45.255 0-12.496-12.496-12.496-32.758 0-45.255 124.968-124.968 124.968-327.58 0-452.548-12.496-12.497-12.496-32.759 0-45.255 12.495-12.497 32.758-12.497 45.255 0C869.49 198.433 869.49 441.568 719.529 591.529z" horiz-adv-x="896" />
-<glyph glyph-name="versions" unicode="&#xf064;" d="M0 128h128v64H64V448h64v64H0V128zM384 640v-640h512V640H384zM768 128H512V512h256V128zM192 64h128v64h-64V512h64v64H192V64z" horiz-adv-x="896" />
-<glyph glyph-name="x" unicode="&#xf081;" d="M640 512L512 640 320 448 128 640 0 512l192-192L0 128l128-128 192 192 192-192 128 128L448 320 640 512z" horiz-adv-x="640" />
-<glyph glyph-name="zap" unicode="&#x26A1;" d="M640 384H384L576 832 0 256h256L64-192 640 384z" horiz-adv-x="640" />
-</font>
-</defs>
-</svg>
--- a/public/css/themes/github/assets/fonts/octicons.ttf
+++ b/public/css/themes/github/assets/fonts/octicons.ttf
--- a/public/css/themes/github/assets/fonts/octicons.woff
+++ b/public/css/themes/github/assets/fonts/octicons.woff
--- a/public/css/themes/material/assets/fonts/icons.eot
+++ b/public/css/themes/material/assets/fonts/icons.eot
--- a/public/css/themes/material/assets/fonts/icons.svg
+++ b/public/css/themes/material/assets/fonts/icons.svg
--- a/public/css/themes/material/assets/fonts/icons.ttf
+++ b/public/css/themes/material/assets/fonts/icons.ttf
--- a/public/css/themes/material/assets/fonts/icons.woff
+++ b/public/css/themes/material/assets/fonts/icons.woff
--- a/public/img/avatar_default.png
+++ b/public/img/avatar_default.png
--- a/public/img/discord.png
+++ b/public/img/discord.png
--- a/public/img/favicon.png
+++ b/public/img/favicon.png
--- a/public/img/gogs-large-resize.png
+++ b/public/img/gogs-large-resize.png
--- a/public/img/gogs-lg.png
+++ b/public/img/gogs-lg.png
--- a/public/img/gogs.svg
+++ b/public/img/gogs.svg
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733332 67.733335"
+   version="1.1"
+   id="svg4576"
+   inkscape:version="0.92.0 r15299"
+   sodipodi:docname="icon.svg"
+   enable-background="new"
+   inkscape:export-filename="favicon.png"
+   inkscape:export-xdpi="96.000008"
+   inkscape:export-ydpi="96.000008">
+  <defs
+     id="defs4570">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5777">
+      <stop
+         style="stop-color:#dc493c;stop-opacity:1;"
+         offset="0"
+         id="stop5773" />
+      <stop
+         style="stop-color:#e8887f;stop-opacity:1"
+         offset="1"
+         id="stop5775" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5477">
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccscc"
+         inkscape:connector-curvature="0"
+         id="path5479"
+         d="m 33.86713,243.43265 c -10.880422,-1.1e-4 -19.700791,8.82024 -19.700666,19.70068 -1.25e-4,10.88042 8.820244,19.70077 19.700666,19.70066 6.169379,-0.0143 11.975716,-2.91813 15.688204,-7.84549 l 0.01791,0.0107 0.102743,-0.17755 c 0.918898,-1.23276 1.69033,-2.56885 2.29852,-3.98101 l -12.387966,-7.1527 c 0.01826,-0.18413 0.02739,-0.36903 0.02774,-0.55405 -1.9e-5,-3.17384 -2.572912,-5.74673 -5.746748,-5.74677 -3.173838,4e-5 -5.746734,2.57293 -5.746768,5.74677 3.4e-5,3.17384 2.57293,5.74673 5.746768,5.74677 1.179669,-0.002 2.32995,-0.36815 3.29469,-1.04706 l 7.43758,4.29458 c -2.657252,3.18291 -6.585981,5.02791 -10.73227,5.0401 -7.750976,-4e-5 -14.034355,-6.28343 -14.034391,-14.03439 3.6e-5,-7.75096 6.283415,-14.03435 14.034391,-14.03437 1.644346,0.009 3.274248,0.30783 4.815319,0.88147 0.432941,0.23108 0.919115,0.35231 1.413341,0.35241 1.619414,1.3e-4 2.932237,-1.27253 2.932112,-2.8424 -0.0013,-1.0165 -0.711451,-1.96286 -1.620721,-2.46915 0,0 -0.459666,-0.22667 -0.620453,-0.28907 -2.205641,-0.85587 -4.553725,-1.2854 -6.919582,-1.29957 z"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#be3529;stroke-width:0.66145831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5777"
+       id="linearGradient5779"
+       x1="52.65686"
+       y1="291.88074"
+       x2="9.1281252"
+       y2="234.42603"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5777"
+       id="linearGradient5874"
+       x1="58.605209"
+       y1="304.01141"
+       x2="7.1437502"
+       y2="224.76874"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4520"
+       x="-0.0024505704"
+       width="1.0049011"
+       y="-0.0023514745"
+       height="1.0047029">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.038604687"
+         id="feGaussianBlur4522" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4528"
+       x="-0.0024479733"
+       width="1.0048959"
+       y="-0.0023538708"
+       height="1.0047077">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.064072276"
+         id="feGaussianBlur4530" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="44.531899"
+     inkscape:cy="180.4412"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-page="true" />
+  <metadata
+     id="metadata4573">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="shadowed"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-229.26665)"
+     style="display:inline">
+    <g
+       id="g5745">
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#5b1a14;stroke-width:0.66145831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4528)"
+         d="m 27.626438,230.93706 -1.796274,7.39227 a 26.550438,26.550438 0 0 0 -9.959928,5.78561 l -7.2442762,-2.1237 -6.1676142,10.68233 5.4923951,5.24175 a 26.550438,26.550438 0 0 0 -0.6345185,5.68571 26.550438,26.550438 0 0 0 0.6835439,5.83648 l -5.4683514,5.21769 6.1676178,10.68233 7.3006845,-2.14037 a 26.550438,26.550438 0 0 0 9.996944,5.75973 l 1.775923,7.30808 h 12.334305 l 1.796274,-7.39133 a 26.550438,26.550438 0 0 0 9.959946,-5.78561 l 7.244271,2.12277 6.167608,-10.68233 -5.492404,-5.24081 a 26.550438,26.550438 0 0 0 0.634521,-5.68663 26.550438,26.550438 0 0 0 -0.683546,-5.83557 l 5.468366,-5.2186 -6.167627,-10.68235 -7.300689,2.14037 a 26.550438,26.550438 0 0 0 -9.996012,-5.7588 l -1.775923,-7.30902 z"
+         id="path5311" />
+      <path
+         id="circle4730"
+         d="m 27.626438,230.46936 -1.796274,7.39227 a 26.550438,26.550438 0 0 0 -9.959928,5.78561 l -7.2442762,-2.1237 -6.1676142,10.68233 5.4923951,5.24175 a 26.550438,26.550438 0 0 0 -0.6345185,5.68571 26.550438,26.550438 0 0 0 0.6835439,5.83648 l -5.4683514,5.21769 6.1676178,10.68233 7.3006845,-2.14037 a 26.550438,26.550438 0 0 0 9.996944,5.75973 l 1.775923,7.30808 h 12.334305 l 1.796274,-7.39133 a 26.550438,26.550438 0 0 0 9.959946,-5.78561 l 7.244271,2.12277 6.167608,-10.68233 -5.492404,-5.24081 a 26.550438,26.550438 0 0 0 0.634521,-5.68663 26.550438,26.550438 0 0 0 -0.683546,-5.83557 l 5.468366,-5.2186 -6.167627,-10.68235 -7.300689,2.14037 a 26.550438,26.550438 0 0 0 -9.996012,-5.7588 l -1.775923,-7.30902 z"
+         style="opacity:1;fill:url(#linearGradient5874);fill-opacity:1;stroke:#be3529;stroke-width:0.66145831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccscc"
+         inkscape:connector-curvature="0"
+         id="circle4744"
+         d="m 33.867129,243.43265 c -10.880421,-1.1e-4 -19.70079,8.82024 -19.700665,19.70068 -1.25e-4,10.88042 8.820244,19.70077 19.700665,19.70066 6.169381,-0.0143 11.975716,-2.91813 15.688205,-7.84549 l 0.0179,0.0107 0.102741,-0.17755 c 0.9189,-1.23276 1.69033,-2.56885 2.29852,-3.98101 l -12.387966,-7.1527 c 0.01826,-0.18413 0.02739,-0.36903 0.02774,-0.55405 -1.8e-5,-3.17384 -2.572913,-5.74673 -5.746749,-5.74677 -3.173837,4e-5 -5.746732,2.57293 -5.746768,5.74677 3.6e-5,3.17384 2.572931,5.74673 5.746768,5.74677 1.17967,-0.002 2.329951,-0.36815 3.29469,-1.04706 l 7.43758,4.29458 c -2.657252,3.18291 -6.58598,5.02791 -10.73227,5.0401 -7.750975,-4e-5 -14.034354,-6.28343 -14.03439,-14.03439 3.6e-5,-7.75096 6.283415,-14.03435 14.03439,-14.03437 1.644347,0.009 3.27425,0.30783 4.815319,0.88147 0.432942,0.23108 0.919115,0.35231 1.413343,0.35241 1.619414,1.3e-4 2.932235,-1.27253 2.93211,-2.8424 -0.0014,-1.0165 -0.71145,-1.96286 -1.62072,-2.46915 0,0 -0.459665,-0.22667 -0.620452,-0.28907 -2.205643,-0.85587 -4.553726,-1.2854 -6.919583,-1.29957 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.66145831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#7f231c;stroke-width:0.66145831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4520)"
+         d="m 33.94898,243.79513 c -10.88042,-1.4e-4 -19.705814,8.97349 -19.700665,19.70068 0.0049,10.72717 8.820244,19.70077 19.700665,19.70066 6.169381,-0.0143 11.976514,-2.94246 15.688205,-7.84549 l 0.0179,0.0107 0.102741,-0.17755 c 0.9187,-1.22666 1.690687,-2.57973 2.29852,-3.98101 l -12.387966,-7.1527 c 0.01795,-0.17465 0.02771,-0.37872 0.02774,-0.55405 -0.0055,-3.00718 -2.572913,-5.74673 -5.746749,-5.74677 -3.173837,4e-5 -5.752196,2.73959 -5.746768,5.74677 0.0055,3.00719 2.572931,5.74674 5.746768,5.74677 1.179664,-0.002 2.330958,-0.39886 3.29469,-1.04706 l 7.43758,4.29458 c -2.654987,3.11383 -6.586003,5.02861 -10.73227,5.0401 -7.750975,-3e-5 -14.026256,-6.5304 -14.03439,-14.03439 -0.0081,-7.50398 6.283415,-14.03434 14.03439,-14.03437 1.644325,0.01 3.27333,0.33588 4.815319,0.88147 0.43305,0.22778 0.918249,0.37874 1.413343,0.35241 1.622253,-0.0865 2.928924,-1.17153 2.93211,-2.8424 7.41e-4,-1.08181 -0.711334,-1.96639 -1.62072,-2.46915 0,0 -0.459602,-0.22859 -0.620452,-0.28907 -2.206511,-0.8294 -4.553766,-1.28416 -6.919583,-1.29957 z"
+         id="path5473"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccscc"
+         clip-path="url(#clipPath5477)" />
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#be3529;stroke-width:0.66145831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 33.867129,243.43265 c -10.880421,-1.1e-4 -19.70079,8.82024 -19.700665,19.70068 -1.25e-4,10.88042 8.820244,19.70077 19.700665,19.70066 6.169381,-0.0143 11.975716,-2.91813 15.688205,-7.84549 l 0.0179,0.0107 0.102741,-0.17755 c 0.9189,-1.23276 1.69033,-2.56885 2.29852,-3.98101 l -12.387966,-7.1527 c 0.01826,-0.18413 0.02739,-0.36903 0.02774,-0.55405 -1.8e-5,-3.17384 -2.572913,-5.74673 -5.746749,-5.74677 -3.173837,4e-5 -5.746732,2.57293 -5.746768,5.74677 3.6e-5,3.17384 2.572931,5.74673 5.746768,5.74677 1.17967,-0.002 2.329951,-0.36815 3.29469,-1.04706 l 7.43758,4.29458 c -2.657252,3.18291 -6.58598,5.02791 -10.73227,5.0401 -7.750975,-4e-5 -14.034354,-6.28343 -14.03439,-14.03439 3.6e-5,-7.75096 6.283415,-14.03435 14.03439,-14.03437 1.644347,0.009 3.27425,0.30783 4.815319,0.88147 0.432942,0.23108 0.919115,0.35231 1.413343,0.35241 1.619414,1.3e-4 2.932235,-1.27253 2.93211,-2.8424 -0.0014,-1.0165 -0.71145,-1.96286 -1.62072,-2.46915 0,0 -0.459665,-0.22667 -0.620452,-0.28907 -2.205643,-0.85587 -4.553726,-1.2854 -6.919583,-1.29957 z"
+         id="path5733"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccscc" />
+    </g>
+  </g>
+  <g
+     transform="translate(0,-229.26665)"
+     id="g5771"
+     inkscape:groupmode="layer"
+     inkscape:label="plain"
+     style="display:none">
+    <g
+       id="g5769">
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:url(#linearGradient5779);fill-opacity:1;stroke:#be3529;stroke-width:0.66145831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 27.626438,230.46936 -1.796274,7.39227 a 26.550438,26.550438 0 0 0 -9.959928,5.78561 l -7.2442762,-2.1237 -6.1676142,10.68233 5.4923951,5.24175 a 26.550438,26.550438 0 0 0 -0.6345185,5.68571 26.550438,26.550438 0 0 0 0.6835439,5.83648 l -5.4683514,5.21769 6.1676178,10.68233 7.3006845,-2.14037 a 26.550438,26.550438 0 0 0 9.996944,5.75973 l 1.775923,7.30808 h 12.334305 l 1.796274,-7.39133 a 26.550438,26.550438 0 0 0 9.959946,-5.78561 l 7.244271,2.12277 6.167608,-10.68233 -5.492404,-5.24081 a 26.550438,26.550438 0 0 0 0.634521,-5.68663 26.550438,26.550438 0 0 0 -0.683546,-5.83557 l 5.468366,-5.2186 -6.167627,-10.68235 -7.300689,2.14037 a 26.550438,26.550438 0 0 0 -9.996012,-5.7588 l -1.775923,-7.30902 z"
+         id="path5761" />
+      <path
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.66145831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 33.867129,243.43265 c -10.880421,-1.1e-4 -19.70079,8.82024 -19.700665,19.70068 -1.25e-4,10.88042 8.820244,19.70077 19.700665,19.70066 6.169381,-0.0143 11.975716,-2.91813 15.688205,-7.84549 l 0.0179,0.0107 0.102741,-0.17755 c 0.9189,-1.23276 1.69033,-2.56885 2.29852,-3.98101 l -12.387966,-7.1527 c 0.01826,-0.18413 0.02739,-0.36903 0.02774,-0.55405 -1.8e-5,-3.17384 -2.572913,-5.74673 -5.746749,-5.74677 -3.173837,4e-5 -5.746732,2.57293 -5.746768,5.74677 3.6e-5,3.17384 2.572931,5.74673 5.746768,5.74677 1.17967,-0.002 2.329951,-0.36815 3.29469,-1.04706 l 7.43758,4.29458 c -2.657252,3.18291 -6.58598,5.02791 -10.73227,5.0401 -7.750975,-4e-5 -14.034354,-6.28343 -14.03439,-14.03439 3.6e-5,-7.75096 6.283415,-14.03435 14.03439,-14.03437 1.644347,0.009 3.27425,0.30783 4.815319,0.88147 0.432942,0.23108 0.919115,0.35231 1.413343,0.35241 1.619414,1.3e-4 2.932235,-1.27253 2.93211,-2.8424 -0.0014,-1.0165 -0.71145,-1.96286 -1.62072,-2.46915 0,0 -0.459665,-0.22667 -0.620452,-0.28907 -2.205643,-0.85587 -4.553726,-1.2854 -6.919583,-1.29957 z"
+         id="path5763"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccscc" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccscc"
+         inkscape:connector-curvature="0"
+         id="path5767"
+         d="m 33.867129,243.43265 c -10.880421,-1.1e-4 -19.70079,8.82024 -19.700665,19.70068 -1.25e-4,10.88042 8.820244,19.70077 19.700665,19.70066 6.169381,-0.0143 11.975716,-2.91813 15.688205,-7.84549 l 0.0179,0.0107 0.102741,-0.17755 c 0.9189,-1.23276 1.69033,-2.56885 2.29852,-3.98101 l -12.387966,-7.1527 c 0.01826,-0.18413 0.02739,-0.36903 0.02774,-0.55405 -1.8e-5,-3.17384 -2.572913,-5.74673 -5.746749,-5.74677 -3.173837,4e-5 -5.746732,2.57293 -5.746768,5.74677 3.6e-5,3.17384 2.572931,5.74673 5.746768,5.74677 1.17967,-0.002 2.329951,-0.36815 3.29469,-1.04706 l 7.43758,4.29458 c -2.657252,3.18291 -6.58598,5.02791 -10.73227,5.0401 -7.750975,-4e-5 -14.034354,-6.28343 -14.03439,-14.03439 3.6e-5,-7.75096 6.283415,-14.03435 14.03439,-14.03437 1.644347,0.009 3.27425,0.30783 4.815319,0.88147 0.432942,0.23108 0.919115,0.35231 1.413343,0.35241 1.619414,1.3e-4 2.932235,-1.27253 2.93211,-2.8424 -0.0014,-1.0165 -0.71145,-1.96286 -1.62072,-2.46915 0,0 -0.459665,-0.22667 -0.620452,-0.28907 -2.205643,-0.85587 -4.553726,-1.2854 -6.919583,-1.29957 z"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#be3529;stroke-width:0.66145831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
--- a/public/js/gogs.js
+++ b/public/js/gogs.js
@@ -212,38 +212,34 @@ function initInstall() {
    // Database type change detection.
    $("#db_type").change(function () {
        var sqliteDefault = 'data/gogs.db';
-        var tidbDefault = 'data/gogs_tidb';

        var dbType = $(this).val();
-        if (dbType === "SQLite3" || dbType === "TiDB") {
+        if (dbType === "SQLite3") {
            $('#sql_settings').hide();
            $('#pgsql_settings').hide();
            $('#sqlite_settings').show();

-            if (dbType === "SQLite3" && $('#db_path').val() == tidbDefault) {
+            if (dbType === "SQLite3") {
                $('#db_path').val(sqliteDefault);
-            } else if (dbType === "TiDB" && $('#db_path').val() == sqliteDefault) {
-                $('#db_path').val(tidbDefault);
            }
            return;
        }

-        var mysqlDefault = '127.0.0.1:3306';
-        var postgresDefault = '127.0.0.1:5432';
+        var dbDefaults = {
+            "MySQL": "127.0.0.1:3306",
+            "PostgreSQL": "127.0.0.1:5432",
+            "MSSQL": "127.0.0.1, 1433"
+        };

        $('#sqlite_settings').hide();
        $('#sql_settings').show();
-        if (dbType === "PostgreSQL") {
-            $('#pgsql_settings').show();
-            if ($('#db_host').val() == mysqlDefault) {
-                $('#db_host').val(postgresDefault);
+        $('#pgsql_settings').toggle(dbType === "PostgreSQL");
+        $.each(dbDefaults, function(type, defaultHost) {
+            if ($('#db_host').val() == defaultHost) {
+                $('#db_host').val(dbDefaults[dbType]);
+                return false;
            }
-        } else {
-            $('#pgsql_settings').hide();
-            if ($('#db_host').val() == postgresDefault) {
-                $('#db_host').val(mysqlDefault);
-            }
-        }
+        });
    });

    // TODO: better handling of exclusive relations.
@@ -342,6 +338,18 @@ function initRepository() {
        });
    }

+    // Branches
+    if ($('.repository.settings.branches').length > 0) {
+        initFilterSearchDropdown('.protected-branches .dropdown');
+        $('.enable-protection, .enable-whitelist').change(function () {
+            if (this.checked) {
+                $($(this).data('target')).removeClass('disabled');
+            } else {
+                $($(this).data('target')).addClass('disabled');
+            }
+        });
+    }
+
    // Labels
    if ($('.repository.labels').length > 0) {
        // Create label
@@ -534,6 +542,20 @@ function initRepository() {
                $item.find(".bar .add").css("width", addPercent + "%");
            });
        }
+
+        $('.diff-file-box .lines-num').click(function () {
+            if ($(this).attr('id')) {
+                window.location.href = '#' + $(this).attr('id');
+            }
+        });
+
+        $(window).on('hashchange', function (e) {
+            $('.diff-file-box .lines-code.active').removeClass('active');
+            var m = window.location.hash.match(/^#diff-.+$/);
+            if (m) {
+                $(m[0]).siblings('.lines-code').addClass('active');
+            }
+        }).trigger('hashchange');
    }

    // Quick start and repository home
@@ -908,6 +930,15 @@ function initWebhook() {
        }
    });

+    // Highlight payload on first click
+    $('.hook.history.list .toggle.button').click(function () {
+        $($(this).data('target') + ' .nohighlight').each(function () {
+            var $this = $(this);
+            $this.removeClass('nohighlight');
+            setTimeout(function(){ hljs.highlightBlock($this[0]) }, 500);
+        })
+    })
+
    // Test delivery
    $('#test-delivery').click(function () {
        var $this = $(this);
@@ -1142,7 +1173,7 @@ function searchRepositories() {
                if (response.ok && response.data.length) {
                    var html = '';
                    $.each(response.data, function (i, item) {
-                        html += '<div class="item"><i class="icon octicon octicon-repo"></i> <span class="fullname">' + item.full_name + '</span></div>';
+                        html += '<div class="item"><i class="octicon octicon-repo"></i> <span class="fullname">' + item.full_name + '</span></div>';
                    });
                    $results.html(html);
                    $this.find('.results .item').click(function () {
@@ -1201,7 +1232,9 @@ $(document).ready(function () {
    });

    // Semantic UI modules.
-    $('.dropdown').dropdown();
+    $('.ui.dropdown').dropdown({
+        forceSelection: false
+    });
    $('.jump.dropdown').dropdown({
        action: 'hide',
        onShow: function () {
--- a/public/less/_dashboard.less
+++ b/public/less/_dashboard.less
@@ -78,7 +78,7 @@
 				margin-bottom: -2px;
 			}
 			.text.truncate {
-				width: 80%;
+				width: 60%;
 				margin-bottom: -5px;
 			}
 		}
--- a/public/less/_form.less
+++ b/public/less/_form.less
@@ -4,7 +4,7 @@
 	  padding-top: .6em;
 	  padding-bottom: .6em;
 	  display: inline-block;
-	  word-break: break-all;
+	  word-break: break-word;
 	}
 }
 .ui.attached.header {
--- a/public/less/_home.less
+++ b/public/less/_home.less
@@ -1,17 +1,15 @@
 .home {
 	padding-bottom: @footer-margin * 2;
 	.logo {
-		max-width: 220px;
+		margin-bottom: 20px;
 	}
 	.hero {
-		h1, h2 {
-			font-family: 'PT Sans Narrow', sans-serif, 'Microsoft YaHei';
-		}
 		h1 {
-			font-size: 5.5em;
+			font-size: 4.5em;
 		}
 		h2 {
-			font-size: 3em;
+			margin-top: 0;
+			font-size: 2em;
 		}
 		.octicon {
 			color: #d9453d;
--- a/public/less/_install.less
+++ b/public/less/_install.less
@@ -28,4 +28,9 @@
 			}
 		}
 	}
+	#use-builtin-ssh-server {
+		margin-top: -1em;
+		margin-left: -15px !important;
+		margin-bottom: 2em;
+	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Unknwon	9d40b8a83c	Bump version	2017-02-28 05:45:50 -05:00
Unknwon	9ace35ee8b	repo_branch: fix inapproriate logic	2017-02-28 05:33:30 -05:00
Unknwon	b3757e424f	Prepare release	2017-02-27 18:38:16 -05:00
Unknwon	2381fe72cb	base/tool: downgrade error to warning	2017-02-26 20:44:53 -05:00
Unknwon	e28bc7023f	modes/org: code format for PR #4194	2017-02-26 15:29:16 -05:00
dlob	aff8fb28bd	models/org: use XORM chain operations instead of raw SQL (#4194 ) This also solved MSSQL pagination query syntax problem reported in #4176.	2017-02-26 15:19:34 -05:00
Unknwon	6a543c8066	Update README	2017-02-25 21:21:12 -05:00
Unknwon	4d90527a6e	repo: does not allow fork to original owner (#4182 ) But can still fork to organizations.	2017-02-25 03:52:54 -05:00
Unknwon	c64b842df9	templates: able to inject content to head and footer (#1286 )	2017-02-24 18:26:41 -05:00
Unknwon	27c4252548	dashboard: fix commits CSS	2017-02-24 14:55:07 -05:00
Unknwon	10b93efc4a	repo: able to add organization member as repository collaborator	2017-02-24 13:56:02 -05:00
Unknwon	0696d430c9	protect_branch: only list teams have write access List teams without write access to the repository cause confusion to make users think members of team could push to the branch.	2017-02-24 13:19:42 -05:00
Unknwon	68b231bd89	template: use DisplayName of users when possible (#4187 )	2017-02-24 12:43:49 -05:00
Unknwon	6ec859f2b0	webhook: send secret with SHA256 HMAC hex digest (#3692 )	2017-02-24 12:23:19 -05:00
Unknwon	452551fa23	webhook: highlight delivery response on click This decreases page load time for webhook edit page.	2017-02-24 12:22:22 -05:00
Kyle Filz	ec05c64ead	docker: update Dockerfile for Raspberry Pi (#4185 )	2017-02-24 00:37:21 -05:00
Unknwon	cd15a17970	models/repo: delete protect branch options when delete repository	2017-02-23 18:42:03 -05:00
Unknwon	6072e9a52c	repo: add protect branch whitelist (#4177 ) Add options to add users and teams to whitelist of a protected branch. This is only available for organizational repositories.	2017-02-23 18:25:12 -05:00
Unknwon	b78e03934d	models/access: hasAccess only need userID not user object	2017-02-23 16:15:25 -05:00
Cyril Rohr	3c0d162961	packager: update files (#4181 ) * Fix packaging * Fix macaron vendor sha Revision 8be5635c28f40a85ce8e8f65c6118b4ee4e548e9 does not exist * Add build dependency for centos	2017-02-23 15:33:58 -05:00
Unknwon	48cf9edcf5	templates/repo/diff: fix tag-code doesn't display in split view	2017-02-23 13:24:59 -05:00
Unknwon	0c8c1ee96f	pull: fix split view on pull request page (#3695 )	2017-02-23 13:12:28 -05:00
Unknwon	7d80c5a722	mirror: does not allow create releases	2017-02-23 13:09:26 -05:00
Unknwon	5ec21d56ef	editor: fix cannot redirect to correct pull request URL Was only possible to correctly redirect to pull request page within same repository. And didn't take care of case when upstream has disabled pull request. Also add a new method 'PullRequestURL' to unify the code.	2017-02-23 13:05:29 -05:00
Unknwon	266c8f5a85	release: fix unable to edit release of a fork repository	2017-02-23 11:35:33 -05:00
Unknwon	162504e90c	repo/setting: fix admin cannot delete organizational repository	2017-02-22 23:16:23 -05:00
Unknwon	5ea0592f61	webhook: fix organizational webhook last delivery status cannot be updated	2017-02-22 22:55:28 -05:00
Unknwon	054e97d614	csrf: able to set custom cookie name Add new config option '[session] CSRF_COOKIE_NAME'.	2017-02-22 21:46:43 -05:00
Unknwon	28983c94ff	comment: only show title of commit message from a commit ref (#3206 )	2017-02-22 08:25:26 -05:00
Unknwon	0cfa489cf0	models/git_diff: add bound check	2017-02-22 06:59:45 -05:00
Anders H	e0af5c280d	locale: update TRANSLATORS (#4170 )	2017-02-22 06:17:08 -05:00
Unknwon	d21dc0da78	migrate: fix unexpected removal of repository when wiki is detected	2017-02-21 22:00:45 -05:00
Unknwon	60aca9ea18	webhook: also only enable certain types (#3356 ) Add new config option '[webhook] TYPES’.	2017-02-21 20:21:25 -05:00
Argentumbolo	6a8ad0b357	locale: changes relates to Ukrainian language (#4168 ) - Add Ukrainian translation into templates/home.tmpl - Fix Ukrainian language name in conf/app.ini because on Ukrainian 'language' is female. - Add me as translator into conf/locale/TRANSLATORS	2017-02-21 17:57:27 -05:00
Unknwon	bd970b8b27	webhook: only trigger specific webhook for test delivery (#3030 )	2017-02-21 15:44:35 -05:00
Unknwon	0f3155660e	webhook: minor improvements on Discord	2017-02-21 13:58:00 -05:00
Unknwon	437df04d8c	Prepare release	2017-02-21 12:17:39 -05:00
Unknwon	8216360da8	webhook: support color for Discord	2017-02-21 11:36:19 -05:00
Unknwon	c5b85f2733	models/repo: fix repository files weren't cleaned up (#4167 )	2017-02-21 11:12:46 -05:00
Orion	ba88bb5f5f	locale: update translators (#4166 )	2017-02-21 09:11:44 -05:00
Unknwon	5895d43574	editor: redirect to new pull request page after create new branch	2017-02-20 22:29:15 -05:00
Unknwon	e78f252713	webhook: blank page for organization Discord type	2017-02-20 22:13:34 -05:00
Oscar Quisbert	6a78580429	locale: update TRANSLATORS (#4161 )	2017-02-20 21:12:29 -05:00
Unknwon	6002d72603	router: fix 404 when repository name contains dot E.g. atomi.github.io	2017-02-20 18:05:34 -05:00
Unknwon	934734a85a	diff: able to highlight line with hashtag URL	2017-02-20 16:16:32 -05:00
Óscar García Amor	491934784f	locale: add new translator (#4158 )	2017-02-20 13:47:38 -05:00
Alexey Agafonov	fe69a7b116	Update home.tmpl (#4159 ) Russian lang. Small fix.	2017-02-20 13:46:56 -05:00
Unknwon	0bef74d499	vendor: update github.com/go-macaron/toolbox (#2857 ) Support HEAD requests of '/healthcheck' for service monitoring.	2017-02-20 13:39:46 -05:00
Unknwon	2322de653c	models/webhook: fix bad query	2017-02-20 01:04:02 -05:00
Unknwon	95b94b2166	bindata: generate data for PR #4155	2017-02-19 20:12:21 -05:00
Tyler	dd4d623612	Update 'disable_register_mail' verbiage (#4155 )	2017-02-19 19:55:19 -05:00
Unknwon	41a2632ae7	webhook: minor text change on Discord	2017-02-19 16:07:28 -05:00
Unknwon	f3a228ed61	vendor: update gopkg.in/macaron.v1	2017-02-19 15:51:10 -05:00
Unknwon	c4fdc26fa5	migration: drop 0.6.x support	2017-02-19 14:42:06 -05:00
Unknwon	7de71333c6	repo: several minor improvements 1. Fix sample content didn't show up when hook doesn't exist. 2. Fix CSS 'word-break' to use 'break-word' not 'break-all'. 3. Fix single quote in 'locale_en-US.ini' file.	2017-02-19 13:18:16 -05:00
Unknwon	cd9b29ff3f	api: add list user and organization's repositories (#3984 )	2017-02-18 23:37:16 -05:00
Unknwon	50a7c3c20d	repo: able to fork own repository (#1791 )	2017-02-18 23:04:11 -05:00
huqiangit	c3f52ab52d	this fix #3958 (#4153 ) Deal with '/' in Wiki page title.	2017-02-18 22:51:21 -05:00
Unknwon	40fbe7fa8e	models/repo: handle deletion on Windows (#4152 )	2017-02-18 22:47:32 -05:00
Unknwon	ef922ff757	css: cleanup unused files	2017-02-18 21:06:43 -05:00
yaourt	1841316f18	Provide an updated Dockerfile where Gogs is build with Go 1.8 (#4151 ) In order to have an up to date Docker image based on alpine 3.5 and having Gogs built with Go 1.8 Refs: [ #4145 ]	2017-02-18 20:43:27 -05:00
Unknwon	0a2f87f941	cron: add repository archive cleanup (#4061 )	2017-02-18 19:35:59 -05:00
Unknwon	c69900325d	commits: able to specify pageSize dynamically (#3965 ) Usage: <url>?page={page}&pageSize={pageSize} Also avoid/removed getting total commits count for pagination, users are only allowed navigation by 'newer' and 'older'.	2017-02-18 18:37:47 -05:00
Unknwon	685737b816	locale: add Ukrainian support	2017-02-18 15:00:11 -05:00
Unknwon	5d766bc4d6	docker: improve README [CI SKIP]	2017-02-18 13:53:58 -05:00
Unknwon	1083c0cd9a	admin/config: display repository related settings (#3816 )	2017-02-18 13:29:43 -05:00
Unknwon	7b8f086f72	repo/settings: add description and link to personal SSH keys (#3936 )	2017-02-18 12:56:06 -05:00
Unknwon	21d538a738	install: able to enable builtin SSH server (#3773 )	2017-02-18 12:47:35 -05:00
Unknwon	36f448f47f	footer: update Twitter handle [CI SKIP]	2017-02-18 11:55:59 -05:00
Unknwon	dbd9f05c06	vendor: update github.com/go-xorm/*	2017-02-18 11:22:44 -05:00
app	77757f6d39	I've got Translation Credits message from 无闻 (joe2010xtmf) (#4144 )	2017-02-18 11:06:06 -05:00
Ganesha	018614cdf0	Update TRANSLATORS (#4146 )	2017-02-18 11:05:44 -05:00
Jonas De Kegel	5d9680b00d	Update TRANSLATORS (#4147 )	2017-02-18 11:05:23 -05:00
Unknwon	c8982f4165	settings: fix organization panel CSS	2017-02-18 02:22:59 -05:00
wp-src	71f0dd858b	Update TRANSLATORS (#4143 )	2017-02-18 02:07:46 -05:00
火文狼	956bdb18c9	Update TRANSLATORS (#4142 )	2017-02-18 01:33:20 -05:00
Unknwon	a07b1f630a	webhook: add native Discord support	2017-02-18 00:54:56 -05:00
Unknwon	266586e866	repo: assignee can be anyone who has read access (#3739 )	2017-02-17 22:17:27 -05:00
Unknwon	b481927d5e	Improve error handling	2017-02-17 18:23:35 -05:00
Unknwon	7bd6052efe	vendor: update gopkg.in/clog.v1	2017-02-17 18:05:41 -05:00
Unknwon	07801cbf09	repo/release: add pagination (#2164 )	2017-02-17 17:41:55 -05:00
Pierre Prinetti	81e74858d8	Update TRANSLATORS (#4140 )	2017-02-17 16:19:11 -05:00
Olexander Yermakov	f4e714d54a	Update TRANSLATORS (#4139 )	2017-02-17 15:41:23 -05:00
Alexandre Espinosa Menor	edccbc0481	Added myself (#4138 )	2017-02-17 15:14:45 -05:00
Unknwon	7e09d210ba	Initial version of protected branches (#776 ) - Able to restrict force push and deletion - Able to restrict direct push	2017-02-17 15:10:50 -05:00
Riste Risafov	dab768212a	Update TRANSLATORS (#4137 )	2017-02-17 14:07:43 -05:00
javydreamercsw	c033cfc684	Update TRANSLATORS (#4136 )	2017-02-17 14:07:28 -05:00
sergystepanov	89593a82c1	Update TRANSLATORS (#4135 )	2017-02-17 13:54:06 -05:00
Unknwon	ba93504804	setting: check mailService.From only if it has value (#4134 )	2017-02-17 12:28:23 -05:00
Unknwon	57cb23ac81	Security: fix XSS attack on alert	2017-02-17 08:16:27 -05:00
Unknwon	5155f026b4	Security: fix XSS attack on milestone Reported by Miguel Ángel Jimeno.	2017-02-17 08:06:48 -05:00
Unknwon	d521e716dd	refactoring: SSH and HTTP push procees is now unified We used to handle SSH and HTTP push separately which produces duplicated code, but now with post-receive hook, the process is unified to one single place and much cleaner. Thus, UpdateTask struct is removed. Narrow down the range of Git HTTP routes to reduce condufsing HTTP Basic Authentication window popup on browser. By detecting <old-commit, new-commit, ref-name> inside post-receive hook, Git HTTP doesn't need to read the whole content body anymore, which completely solve the RAM problem reported in #636.	2017-02-16 16:33:49 -05:00
Unknwon	3b49a99b60	wiki: fix crash with blob name contains tab (#3916 )	2017-02-16 11:47:54 -05:00
Unknwon	f129e0ecb5	repo/editor: fix breadcrumb path cuts parent dirs (#3859 )	2017-02-16 08:34:49 -05:00
Unknwon	88143f1934	models/repo: UpdateLocalCopy should always aceept valid branch name	2017-02-16 06:28:37 -05:00
Unknwon	3137665e6e	Simplify description	2017-02-15 22:29:31 -05:00
Unknwon	f35bd34002	models/repo: use reset --hard to align with remote branch (#4123 ) If user has force pushed to a branch, git pull will fail.	2017-02-15 21:00:46 -05:00
Unknwon	b9560ec9cb	vendor: update git-module (#4128 )	2017-02-15 18:34:02 -05:00
Unknwon	189924cabf	repo/branch: force delete merged branch (#4128 )	2017-02-15 18:24:32 -05:00
Unknwon	c2277796e4	wiki: remove redundant string replace (#3754 )	2017-02-15 18:18:33 -05:00
Unknwon	f97b250509	Security: prevent XSS attach on wiki page Reported by Miguel Ángel Jimeno.	2017-02-15 18:05:02 -05:00
Mourad Boufarguine	59981b8818	Enable syntax highlighting for CMakeLists.txt files #2199 (#4130 )	2017-02-15 12:38:54 -05:00
Unknwon	40bce6310c	Improve error handling	2017-02-15 12:35:24 -05:00
Unknwon	a4f9e5031f	migration.v15: don't generate hook file if wiki not exist (#1623 )	2017-02-15 05:45:15 -05:00
Unknwon	4da325a45c	user/profile: paging doesn't respect private repository count (#4082 )	2017-02-15 05:39:36 -05:00
Unknwon	fd5881fb64	migration: minor code fix (#1623 )	2017-02-15 05:28:05 -05:00
Unknwon	0f6e464126	migration: should regenerate wiki hook files (#1623 )	2017-02-15 05:25:51 -05:00
Unknwon	6132a82287	admin: sync wiki's hook files as well	2017-02-15 05:15:39 -05:00
Unknwon	32a868d431	wiki: handle '#' in edit page (#3767 )	2017-02-15 05:10:00 -05:00
Unknwon	94f91543b6	Fix compilation error	2017-02-15 04:09:07 -05:00
Unknwon	3d52ef6e39	Solve conflicts (#3837 )	2017-02-15 04:01:59 -05:00
Thibault Meyer	a45205b988	Commits fetch concurrency (#3837 )	2017-02-15 03:59:53 -05:00
Unknwon	ec9c14c09d	vendor: update dependency	2017-02-14 18:47:09 -05:00
Kim "BKC" Carlbäcker	b6fc35f637	Implement list/check/delete Repo Collaborator (#3689 )	2017-02-14 18:45:08 -05:00
Unknwon	e24d62e583	modules/ssh: SSH_KEYGEN_PATH not used for exec ssh-keygen (#4124 )	2017-02-14 18:08:26 -05:00
Unknwon	0386b5ae54	cmd/hook: check existence before call custom hook	2017-02-14 18:06:54 -05:00
Unknwon	a0253cab62	vendor: update git-module	2017-02-14 17:21:55 -05:00
Unknwon	0f32aeec70	migration: adjust rule to prevent migrate wrong hook file	2017-02-14 16:50:16 -05:00
Unknwon	78145cd166	migration: handle edge case	2017-02-14 16:40:49 -05:00
Unknwon	904f0ebec3	migration: add trace log	2017-02-14 16:30:49 -05:00
Unknwon	039dc33367	git: delegate all server-side Git hooks (#1623 )	2017-02-14 16:22:16 -05:00
Christian Höppner	859009259a	Typo in LocalCopyPath (#4122 ) This won't fix any bugs, but a typo is a typo.	2017-02-14 07:39:55 -05:00
Unknwon	4c5255f5ad	cookie: enhance cookie security (#3525 )	2017-02-14 03:52:20 -05:00
Unknwon	279e475b89	webhook: match email with real user in database for test delivery (#3652 )	2017-02-14 03:32:13 -05:00
Unknwon	f4aedda13a	org/team: make 'new' as reserved for team name (#3789 )	2017-02-14 03:16:02 -05:00
Unknwon	1381f0f28e	vendor: check in missing dependency	2017-02-13 20:58:53 -05:00
Unknwon	f967e9d021	vendor: add new dependency (#3772 )	2017-02-13 20:52:35 -05:00
dlob	5179063e71	Added mssql support. (#3772 )	2017-02-13 20:50:00 -05:00
Unknwon	ad4bbf5173	Update new logo [CI SKIP]	2017-02-13 19:11:31 -05:00
Egon Elbre	35f30a306b	Icon redesign. (#4121 )	2017-02-13 18:20:30 -05:00
Unknwon	c37d3f6486	vendor: remove unnecessary sublime files	2017-02-13 14:09:08 -05:00
Unknwon	bd786b8ef0	auth: remove MD5 for secure cookie secret (#4117 ) Update vendor accordingly	2017-02-13 14:05:49 -05:00
Unknwon	d02e7d9e6a	install: no need to check SMTPFrom is not set (#4118 )	2017-02-13 04:20:03 -05:00
Unknwon	1c87b082c1	api/issue: minor code refactor (#3688 )	2017-02-12 19:46:38 -05:00
Kim "BKC" Carlbäcker	99d86c7175	Implement more issue-endpoints (#3688 )	2017-02-12 19:42:28 -05:00
Aaron Wood	68ead67a63	Use very strong ciphers (#4116 ) * Use very strong ciphers * Remove TLS_RSA_WITH_AES_256_GCM_SHA384 to be compatible with Go 1.5	2017-02-12 19:12:07 -05:00
Unknwon	2d38b75400	diff: fix can't show compare page for fork repository (#4110 )	2017-02-12 18:43:26 -05:00
Unknwon	f59a607361	install: allow sender's username to be non-email (#3717 )	2017-02-12 18:35:25 -05:00
Unknwon	d21767dc9f	routers/repo: allow shorter SHA to download archive (#3834 ) SHA length from 7-40 is now supported.	2017-02-12 18:28:42 -05:00
Unknwon	ab78d4e2b7	base/tool: reduce unnecessary report	2017-02-12 16:13:30 -05:00
Unknwon	127005d733	webhook: remove bad characters of Slack-type webhook for Discord (#4088 )	2017-02-11 16:31:58 -05:00
Unknwon	0ae666f3e6	auth: few security improvements	2017-02-11 07:12:06 -05:00