ci: mirror lint config from main

# Conflicts:
#	go.mod
#	go.sum

.bra.toml

@@ -1,21 +0,0 @@
-[run]
-init_cmds = [
-	["make", "build-dev"],
-	["./gogs", "web"]
-]
-watch_all = true
-watch_dirs = [
-	"$WORKDIR/cmd",
-	"$WORKDIR/models",
-	"$WORKDIR/pkg",
-	"$WORKDIR/routes"
-]
-watch_exts = [".go"]
-ignore_files = [".+_test.go"]
-build_delay = 1500
-interrupt_timout = 1
-graceful_kill = true
-cmds = [
-	["make", "build-dev"], # TAGS=sqlite cert pam tidb
-	["./gogs", "web"]
-]

.codebeatignore

@@ -1,7 +0,0 @@
-conf/**
-docker/**
-modules/bindata/**
-packager/**
-public/**
-scripts/**
-templates/**

.codebeatsettings

@@ -1,7 +0,0 @@
-{
-	"GOLANG": {
-		"TOTAL_LOC": [500, 999, 1999, 9999],
-		"TOO_MANY_FUNCTIONS": [50, 99, 199, 999],
-		"TOO_MANY_IVARS": [20, 50, 70, 99]
-	}
-}

.dockerignore

@@ -1,7 +1,5 @@
-.git
-.git/**
-packager
-packager/**
+.packager
+.packager/**
 scripts
 scripts/**
 .github/
@@ -10,7 +8,6 @@ config.codekit
 .dockerignore
 *.yml
 *.md
-.bra.toml
 .editorconfig
 .gitignore
 Dockerfile*

.editorconfig

@@ -16,10 +16,9 @@ indent_size = 4
 indent_style = tab
 indent_size = 2
 
-[*.{less,yml}]
+[*.{less, yml}]
 indent_style = space
 indent_size = 2
 
 [*.js]
-indent_style = tab
-indent_size = 4
+indent_size = 2

.gitattributes

@@ -3,8 +3,7 @@ conf/license/* linguist-vendored
 public/assets/* linguist-vendored
 public/plugins/* linguist-vendored
 public/css/themes/* linguist-vendored
-public/css/github.min.css linguist-vendored
-public/css/semantic-2.2.10.min.css linguist-vendored
+public/css/semantic-2.4.2.min.css linguist-vendored
 public/js/libs/* linguist-vendored
-public/js/jquery-1.11.3.min.js linguist-vendored
-public/js/semantic-2.2.10.min.js linguist-vendored
+public/js/jquery-3.4.1.min.js linguist-vendored
+public/js/semantic-2.4.2.min.js linguist-vendored

.github/CONTRIBUTING.md

@@ -15,26 +15,7 @@ Depends on the situation, you will:
 
 ### Bug Report
 
-If you find something you consider a bug, please create a issue on [GitHub](https://github.com/gogits/gogs/issues). To avoid wasting time and reduce back-and-forth communication with team members, please include at least the following information in a form comfortable for you:
-
-- Bug Description
-- Gogs Version
-- Git Version
-- System Type
-- Error Log
-- Other information
-
-Please take a moment to check that an issue on [GitHub](https://github.com/gogits/gogs/issues) doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
-
-#### Bug Report Example
-
-Gogs crashed when creating a repository with a license, using v0.5.13.0207, SQLite3, Git 1.9.0, Ubuntu 12.04.
-
-Error log:
-
-```
-2014/09/01 07:21:49 [E] nil pointer
-```
+If you find something you consider a bug, please create an issue on [GitHub](https://github.com/gogits/gogs/issues). To avoid wasting time and reduce back-and-forth communication with team members, please be respect to [Issue Template](ISSUE_TEMPLATE.md).
 
 ### Feature Request
 

.github/ISSUE_TEMPLATE.md

@@ -1,26 +0,0 @@
-The issue will be closed without any reasons if it does not satisfy any of following requirements:
-
-1. Please speak English, we have forum in [Chinese](https://discuss.gogs.io/c/getting-help/getting-help-chinese).
-2. Please post questions or config/deploy problems on our forum: https://discuss.gogs.io, here are bugs and feature requests only.
-3. Please take a moment to search that an issue doesn't already exist.
-4. Please give all relevant information below for bug reports; incomplete details considered invalid report.
-
-**You MUST delete above content including this line before posting; too lazy to take this action considered invalid report.**
-
-- Gogs version (or commit ref): 
-- Git version: 
-- Operating system: 
-- Database (use `[x]`):
-  - [ ] PostgreSQL
-  - [ ] MySQL
-  - [ ] MSSQL
-  - [ ] SQLite
-- Can you reproduce the bug at https://try.gogs.io:
-  - [ ] Yes (provide example URL)
-  - [ ] No
-  - [ ] Not relevant
-- Log gist (usually found in `log/gogs.log`):
-
-## Description
-
-...

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,65 @@
+---
+name: Bug report
+about: Report problems and unexpected behavior
+
+---
+
+<!--
+
+First of all, please read https://www.chiark.greenend.org.uk/~sgtatham/bugs.html.
+
+If you don't want to read, it's up to you. But don't waste your time continue reporting.
+
+The issue will be closed without any explanation if it does not satisfy any of following requirements:
+
+1. Please speak English, we have forum in 中文: https://discuss.gogs.io/c/getting-help/getting-help-chinese.
+2. Please post any questions, configuration or deploy problems on our forum: https://discuss.gogs.io.
+3. Please do not end your title with a question mark or period.
+4. Please take a moment to search and make sure the issue doesn't already exist.
+5. Please give all relevant information below for bug reports; incomplete details are considered invalid report.
+
+-->
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is -->
+
+**Gogs version and commit**
+<!-- 
+  The version number or the commit SHA of the Gogs instance you use.
+  You can find these information in the admin dashboard ("/admin").
+-->
+
+**Git version**
+
+```
+$ git version
+
+```
+
+**Operating system**
+<!-- The name and version of your operating system -->
+
+**Database**
+<!-- The database and version you use -->
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Can you reproduce the bug at https://try.gogs.io?**
+<!-- If yes, please provide the example URL; if no, please explain why -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen -->
+
+**Actual behavior**
+<!-- A clear and concise description of what you see instead -->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem -->
+
+**Additional context**
+<!-- Please include any error logs found in `log/gogs.log` -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Gogs Community Forum
+    url: https://discuss.gogs.io/
+    about: Please ask and answer questions here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,32 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+<!--
+
+First of all, please read https://www.chiark.greenend.org.uk/~sgtatham/bugs.html.
+
+If you don't want to read, it's up to you. But don't waste your time continue reporting.
+
+The issue will be closed without any explanation if it does not satisfy any of following requirements:
+
+1. Please speak English, we have forum in 中文: https://discuss.gogs.io/c/getting-help/getting-help-chinese.
+2. Please post any questions, configuration or deploy problems on our forum: https://discuss.gogs.io.
+3. Please do not end your title with a question mark or period.
+4. Please take a moment to search and make sure the issue doesn't already exist.
+
+-->
+
+**Describe the feature**
+<!-- A description of what feature you would like -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here -->

.github/ISSUE_TEMPLATE/security.md

@@ -0,0 +1,12 @@
+---
+name: Security vulnerability
+about: Report security vulnerability for this project
+
+---
+
+<!--
+
+Please create a dummy issue with high-level description of the security vulnerability,
+then report details to u@gogs.io privately, thank you!
+
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,8 @@
 The pull request will be closed without any reasons if it does not satisfy any of following requirements:
 
-1. Please make sure you are targeting the `develop` branch.
-2. Please read contributing guidelines:
+1. Please read contributing guidelines:
 https://github.com/gogits/gogs/wiki/Contributing-Code
-3. Please describe what your pull request does and which issue you're targeting
-4. ... if it is not related to any particular issues, explain why we should not reject your pull request.
+2. Please describe what your pull request does and which issue you're targeting
+3. ... if it is not related to any particular issues, explain why we should not reject your pull request.
 
 **You MUST delete above content including this line before posting; too lazy to take this action considered invalid pull request.**

.github/workflows/codeql.yml

@@ -0,0 +1,52 @@
+name: "Code scanning - action"
+
+on:
+  push:
+    branches: [master]
+  schedule:
+    - cron: '0 19 * * 0'
+
+jobs:
+  CodeQL-Build:
+
+    # CodeQL runs on ubuntu-latest and windows-latest
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+      
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/docker.yml

@@ -0,0 +1,212 @@
+name: Docker
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    paths:
+      - 'Dockerfile'
+      - 'docker/**'
+      - '.github/workflows/docker.yml'
+  release:
+    types: [ published ]
+
+jobs:
+  buildx:
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      contents: read
+      packages: write
+    steps:
+      - name: Canel previous runs
+        uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          all_but_latest: true
+          access_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          config-inline: |
+            [worker.oci]
+              max-parallelism = 2
+      - name: Inspect builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to GitHub Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push images
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            gogs/gogs:latest
+            ghcr.io/gogs/gogs:latest
+      - name: Send email on failure
+        uses: dawidd6/action-send-mail@v3
+        if: ${{ failure() }}
+        with:
+          server_address: smtp.mailgun.org
+          server_port: 465
+          username: ${{ secrets.SMTP_USERNAME }}
+          password: ${{ secrets.SMTP_PASSWORD }}
+          subject: GitHub Actions (${{ github.repository }}) job result
+          to: github-actions-8ce6454@unknwon.io
+          from: GitHub Actions (${{ github.repository }})
+          reply_to: noreply@unknwon.io
+          body: |
+            The job "${{ github.job }}" of ${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }} completed with "${{ job.status }}".
+
+            View the job run at: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+  buildx-pull-request:
+    if: ${{ github.event_name == 'pull_request' && github.repository == 'gogs/gogs' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          config-inline: |
+            [worker.oci]
+              max-parallelism = 2
+      - name: Inspect builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Compute short commit SHA
+        uses: benjlevesque/short-sha@v1.2
+      - name: Build and push images
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: |
+            gogs/gogs:commit-${{ env.SHA }}
+
+  buildx-pull-request-fork:
+    if: ${{ github.event_name == 'pull_request' && github.repository != 'gogs/gogs' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          config-inline: |
+            [worker.oci]
+              max-parallelism = 2
+      - name: Inspect builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
+      - name: Build images
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64
+
+  buildx-release:
+    if: ${{ github.event_name == 'release' }}
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      contents: read
+      packages: write
+    steps:
+      - name: Compute image tag name
+        run: echo "IMAGE_TAG=$(echo $GITHUB_REF_NAME | cut -c 2-)" >> $GITHUB_ENV
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          config-inline: |
+            [worker.oci]
+              max-parallelism = 2
+      - name: Inspect builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to GitHub Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push images
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            gogs/gogs:${{ env.IMAGE_TAG }}
+            ghcr.io/gogs/gogs:${{ env.IMAGE_TAG }}
+      - name: Send email on failure
+        uses: dawidd6/action-send-mail@v3
+        if: ${{ failure() }}
+        with:
+          server_address: smtp.mailgun.org
+          server_port: 465
+          username: ${{ secrets.SMTP_USERNAME }}
+          password: ${{ secrets.SMTP_PASSWORD }}
+          subject: GitHub Actions (${{ github.repository }}) job result
+          to: github-actions-8ce6454@unknwon.io
+          from: GitHub Actions (${{ github.repository }})
+          reply_to: noreply@unknwon.io
+          body: |
+            The job "${{ github.job }}" of ${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }} completed with "${{ job.status }}".
+
+            View the job run at: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/go.yml

@@ -0,0 +1,88 @@
+name: Go
+on:
+  push:
+    branches:
+      - main
+      - 'release/**'
+    paths:
+      - '**.go'
+      - 'go.mod'
+      - '.golangci.yml'
+      - '.github/workflows/go.yml'
+  pull_request:
+    paths:
+      - '**.go'
+      - 'go.mod'
+      - '.golangci.yml'
+      - '.github/workflows/go.yml'
+env:
+  GOPROXY: "https://proxy.golang.org"
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: latest
+          args: --timeout=30m
+      - name: Install Task
+        uses: arduino/setup-task@v1
+      - name: Install go-bindata
+        shell: bash
+        run: |
+          curl --silent --location --output /usr/local/bin/go-bindata https://github.com/kevinburke/go-bindata/releases/download/v3.23.0/go-bindata-linux-amd64
+          chmod +x /usr/local/bin/go-bindata
+      - name: Check Go module tidiness
+        shell: bash
+        run: |
+          go mod tidy
+          STATUS=$(git status --porcelain)
+          if [ ! -z "$STATUS" ]; then
+            echo "Unstaged files:"
+            echo $STATUS
+            echo "Run 'go mod tidy' and commit them"
+            exit 1
+          fi
+
+  test:
+    name: Test
+    strategy:
+      matrix:
+        go-version: [ 1.14.x, 1.15.x, 1.16.x, 1.17.x, 1.18.x ]
+        platform: [ ubuntu-latest, macos-latest, windows-latest ]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Run tests with coverage
+        run: go test -v -race -coverprofile=coverage -covermode=atomic ./...
+      - name: Upload coverage report to Codecov
+        uses: codecov/codecov-action@v1.5.0
+        with:
+          file: ./coverage
+          flags: unittests
+      - name: Send email on failure
+        uses: dawidd6/action-send-mail@v3
+        if: ${{ failure() && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        with:
+          server_address: smtp.mailgun.org
+          server_port: 465
+          username: ${{ secrets.SMTP_USERNAME }}
+          password: ${{ secrets.SMTP_PASSWORD }}
+          subject: GitHub Actions (${{ github.repository }}) job result
+          to: github-actions-8ce6454@unknwon.io
+          from: GitHub Actions (${{ github.repository }})
+          reply_to: noreply@unknwon.io
+          body: |
+            The job "${{ github.job }}" of ${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }} completed with "${{ job.status }}".
+
+            View the job run at: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/lsif.yml

@@ -0,0 +1,28 @@
+name: LSIF
+on:
+  push:
+    paths:
+      - '**.go'
+      - 'go.mod'
+      - '.github/workflows/lsif.yml'
+env:
+  GOPROXY: "https://proxy.golang.org"
+
+jobs:
+  lsif-go:
+    if: github.repository == 'gogs/gogs'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Generate LSIF data
+        uses: sourcegraph/lsif-go-action@master
+      - name: Upload LSIF data to sourcegraph.com
+        continue-on-error: true
+        uses: docker://sourcegraph/src-cli:latest
+        with:
+          args: lsif upload -github-token=${{ secrets.GITHUB_TOKEN }}
+      - name: Upload LSIF data to sourcegraph.unknwon.cn
+        continue-on-error: true
+        uses: docker://sourcegraph/src-cli:latest
+        with:
+          args: -endpoint=https://sourcegraph.unknwon.cn lsif upload -github-token=${{ secrets.GITHUB_TOKEN }}

.github/workflows/shell.yml

@@ -0,0 +1,14 @@
+name: Shell
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+jobs:
+  shellcheck:
+    name: Shellcheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run ShellCheck
+        uses: ludeeus/action-shellcheck@master

.gitignore

@@ -4,7 +4,6 @@
 log/
 custom/
 data/
-.vendor/
 .idea/
 *.iml
 public/img/avatar/
@@ -17,3 +16,4 @@ output*
 *.sublime-project
 *.sublime-workspace
 /release
+.task

.golangci.yml

@@ -0,0 +1,26 @@
+linters-settings:
+  staticcheck:
+    checks: [
+      "all",
+      "-SA1019" # There are valid use cases of strings.Title
+    ]
+  nakedret:
+    max-func-lines: 0 # Disallow any unnamed return statement
+
+linters:
+  enable:
+    - deadcode
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - nakedret
+    - gofmt
+    - rowserrcheck
+    - unconvert
+    - goimports

.gopmfile

@@ -1,64 +0,0 @@
-[target]
-path = github.com/gogits/gogs
-
-[deps]
-github.com/bradfitz/gomemcache = commit:2fafb84
-github.com/urfave/cli = commit:347a988
-github.com/go-macaron/binding = commit:4892016
-github.com/go-macaron/cache = commit:5617353
-github.com/go-macaron/captcha = commit:8aa5919
-github.com/go-macaron/csrf = commit:6a9a7df
-github.com/go-macaron/gzip = commit:cad1c65
-github.com/go-macaron/i18n = commit:ef57533
-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: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: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
-github.com/kardianos/minwinsvc = commit:cad6b2b
-github.com/klauspost/compress = commit:461e8fd
-github.com/klauspost/cpuid = commit:09cded8
-github.com/klauspost/crc32 = commit:cb6bfca
-github.com/lib/pq = commit:67c3f2a
-github.com/mattn/go-colorable = commit:d228849
-github.com/mattn/go-isatty = commit:30a891c
-github.com/mattn/go-sqlite3 = commit:ce9149a
-github.com/mcuadros/go-version = commit:257f7b9
-github.com/microcosm-cc/bluemonday = commit:e797637
-github.com/msteinert/pam = commit:02ccfbf
-github.com/nfnt/resize = commit:891127d
-github.com/russross/blackfriday = commit:5f33e7b
-github.com/satori/go.uuid = commit:b061729
-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:e0eb0ce
-github.com/Unknwon/paginater = commit:701c23f
-github.com/fatih/color = commit:42c364b
-golang.org/x/crypto = commit:dc137be
-golang.org/x/net = commit:f249948
-golang.org/x/sys = commit:d75a526
-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: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:8be5635
-gopkg.in/redis.v2 = commit:e617904
-
-[res]
-include = public|scripts|templates

.packager/hooks/postinst

@@ -8,10 +8,10 @@ APP_USER=$(${CLI} config:get APP_USER)
 APP_GROUP=$(${CLI} config:get APP_GROUP)
 APP_CONFIG="/etc/${APP_NAME}/conf/app.ini"
 
-mkdir -p $(dirname ${APP_CONFIG})
-chown ${APP_USER}.${APP_GROUP} $(dirname ${APP_CONFIG})
+mkdir -p "$(dirname ${APP_CONFIG})"
+chown "${APP_USER}"."${APP_GROUP}" "$(dirname ${APP_CONFIG})"
 [ -f ${APP_CONFIG} ] || ${CLI} run cp conf/app.ini ${APP_CONFIG}
-${CLI} config:set USER=${APP_USER}
+${CLI} config:set USER="${APP_USER}"
 sed -i "s|RUN_USER = git|RUN_USER = ${APP_USER}|" ${APP_CONFIG}
 sed -i "s|RUN_MODE = dev|RUN_MODE = prod|" ${APP_CONFIG}
 

.pkgr.yml

@@ -1,13 +1,15 @@
 targets:
-  debian-7: &debian
+  debian-8: &debian
     build_dependencies:
       - libpam0g-dev
     dependencies:
       - libpam0g
       - git
-  debian-8:
+  debian-9:
     <<: *debian
-  ubuntu-12.04:
+  debian-10:
+    <<: *debian
+  debian-11:
     <<: *debian
   ubuntu-14.04:
     <<: *debian
@@ -16,19 +18,19 @@ targets:
     build_dependencies:
       - bzr
       - mercurial
-  centos-6: &el
+  ubuntu-18.04:
+    <<: *debian
+  centos-7:
     build_dependencies:
       - pam-devel
-      # required for go buildpack
+      # required for Go buildpack
       - perl-Digest-SHA
     dependencies:
       - pam
       - git
-  centos-7:
-    <<: *el
 before:
-  - mv packager/Procfile .
+  - mv .packager/Procfile .
 after:
   - mv bin/gogs gogs
-after_install: ./packager/hooks/postinst
-buildpack: https://github.com/heroku/heroku-buildpack-go.git#v62
+after_install: ./.packager/hooks/postinst
+buildpack: https://github.com/heroku/heroku-buildpack-go.git

.travis.yml

@@ -1,18 +0,0 @@
-language: go
-go:
-  - 1.6.x
-  - 1.7.x
-  - 1.8.x
-  - 1.9.x
-  - master
-
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y libpam-dev
-
-env:
-  - GO15VENDOREXPERIMENT=1
-
-script: 
-  - go build -v -tags "pam"
-  - go test -v -cover -race ./...

CHANGELOG.md

@@ -0,0 +1,144 @@
+# Changelog
+
+All notable changes to Gogs are documented in this file.
+
+## 0.13.0+dev (`main`)
+
+### Added
+
+- An unlisted option is added when create or migrate a repository. Unlisted repositories are public but not being listed for users without direct access in the UI. [#5733](https://github.com/gogs/gogs/issues/5733)
+- New configuration option `[git.timeout] DIFF` for customizing operation timeout of `git diff`. [#6315](https://github.com/gogs/gogs/issues/6315)
+- New configuration option `[server] SSH_SERVER_MACS` for setting list of accepted MACs for connections to builtin SSH server. [#6434](https://github.com/gogs/gogs/issues/6434)
+- Support specifying custom schema for PostgreSQL. [#6695](https://github.com/gogs/gogs/pull/6695)
+- New languages support: Mongolian. [#6510](https://github.com/gogs/gogs/pull/6510)
+
+### Changed
+
+- The default branch has been changed to `main`. [#6285](https://github.com/gogs/gogs/pull/6285)
+- MSSQL as database backend is deprecated, installation page no longer shows it as an option. Existing installations and manually craft configuration file continue to work. [#6295](https://github.com/gogs/gogs/pull/6295)
+- Use [Task](https://github.com/go-task/task) as the default build tool for development. [#6297](https://github.com/gogs/gogs/pull/6297)
+
+### Fixed
+
+- Add `X-Frame-Options` header to prevent Clickjacking. [#6409](https://github.com/gogs/gogs/issues/6409)
+- _Regression:_ Fixed smart links for issues stops rendering. [#6506](https://github.com/gogs/gogs/issues/6506)
+- _Security:_ Potential SSRF attack by CRLF injection via repository migration. [#6413](https://github.com/gogs/gogs/issues/6413)
+
+### Removed
+
+- ⚠️ Migrations before 0.12 are removed, installations not on 0.12 should upgrade to it to run the migrations and then upgrade to 0.13.
+- Configuration section `[mailer]` is no longer used, please use `[email]`.
+- Configuration section `[service]` is no longer used, please use `[auth]`.
+- Configuration option `APP_NAME` is no longer used, please use `BRAND_NAME`.
+- Configuration option `[security] REVERSE_PROXY_AUTHENTICATION_USER` is no longer used, please use `[auth] REVERSE_PROXY_AUTHENTICATION_HEADER`.
+- Configuration option `[auth] ACTIVE_CODE_LIVE_MINUTES` is no longer used, please use `[auth] ACTIVATE_CODE_LIVES`.
+- Configuration option `[auth] RESET_PASSWD_CODE_LIVE_MINUTES` is no longer used, please use `[auth] RESET_PASSWORD_CODE_LIVES`.
+- Configuration option `[auth] ENABLE_CAPTCHA` is no longer used, please use `[auth] ENABLE_REGISTRATION_CAPTCHA`.
+- Configuration option `[auth] ENABLE_NOTIFY_MAIL` is no longer used, please use `[user] ENABLE_EMAIL_NOTIFICATION`.
+- Configuration option `[auth] REGISTER_EMAIL_CONFIRM` is no longer used, please use `[auth] REQUIRE_EMAIL_CONFIRMATION`.
+- Configuration option `[session] GC_INTERVAL_TIME` is no longer used, please use `[session] GC_INTERVAL`.
+- Configuration option `[session] SESSION_LIFE_TIME` is no longer used, please use `[session] MAX_LIFE_TIME`.
+- Configuration option `[server] ROOT_URL` is no longer used, please use `[server] EXTERNAL_URL`.
+- Configuration option `[server] LANDING_PAGE` is no longer used, please use `[server] LANDING_URL`.
+- Configuration option `[database] DB_TYPE` is no longer used, please use `[database] TYPE`.
+- Configuration option `[database] PASSWD` is no longer used, please use `[database] PASSWORD`.
+
+## 0.12.3
+
+### Fixed
+
+- _Regression:_ When running Gogs on Windows, push commits no longer fail on a daily basis with the error "pre-receive hook declined". [#6316](https://github.com/gogs/gogs/issues/6316)
+- Auto-linked commit SHAs now have correct links. [#6300](https://github.com/gogs/gogs/issues/6300)
+- Git LFS client (with version >= 2.5.0) wasn't able to upload files with known format (e.g. PNG, JPEG), and the server is expecting the HTTP Header `Content-Type` to be `application/octet-stream`. The server now tells the LFS client to always use `Content-Type: application/octet-stream` when upload files.
+
+## 0.12.2
+
+### Fixed
+
+- _Regression:_ Pages are correctly rendered when requesting `?go-get=1` for subdirectories. [#6314](https://github.com/gogs/gogs/issues/6314)
+- _Regression:_ Submodule with a relative path is linked correctly. [#6319](https://github.com/gogs/gogs/issues/6319)
+- Backup can be processed when `--target` is specified on Windows. [#6339](https://github.com/gogs/gogs/issues/6339)
+- Commit message contains keywords look like an issue reference no longer fails the push entirely. [#6289](https://github.com/gogs/gogs/issues/6289)
+
+## 0.12.1
+
+### Fixed
+
+- The `updated_at` field is now correctly updated when updates an issue. [#6209](https://github.com/gogs/gogs/issues/6209)
+- Fixed a regression which created `login_source.cfg` column to have `VARCHAR(255)` instead of `TEXT` in MySQL. [#6280](https://github.com/gogs/gogs/issues/6280)
+
+## 0.12.0
+
+### Added
+
+- Support for Git LFS, you can read documentation for both [user](https://github.com/gogs/gogs/blob/main/docs/user/lfs.md) and [admin](https://github.com/gogs/gogs/blob/main/docs/admin/lfs.md). [#1322](https://github.com/gogs/gogs/issues/1322)
+- Allow admin to remove observers from the repository. [#5803](https://github.com/gogs/gogs/pull/5803)
+- Use `Last-Modified` HTTP header for raw files. [#5811](https://github.com/gogs/gogs/issues/5811)
+- Support syntax highlighting for SAS code files (i.e. `.r`, `.sas`, `.tex`, `.yaml`). [#5856](https://github.com/gogs/gogs/pull/5856)
+- Able to fill in pull request title with a template. [#5901](https://github.com/gogs/gogs/pull/5901)
+- Able to override static files under `public/` directory, please refer to [documentation](https://gogs.io/docs/features/custom_template) for usage. [#5920](https://github.com/gogs/gogs/pull/5920)
+- New API endpoint `GET /admin/teams/:teamid/members` to list members of a team. [#5877](https://github.com/gogs/gogs/issues/5877)
+- Support backup with retention policy for Docker deployments. [#6140](https://github.com/gogs/gogs/pull/6140)
+
+### Changed
+
+- The organization profile page has changed to display at most 12 members. [#5506](https://github.com/gogs/gogs/issues/5506)
+- The required Go version to compile source code changed to 1.14.
+- All assets are now embedded into binary and served from memory by default. Set `[server] LOAD_ASSETS_FROM_DISK = true` to load them from disk. [#5920](https://github.com/gogs/gogs/pull/5920)
+- Application and Go versions are removed from page footer and only show in the admin dashboard.
+- Build tag for running as Windows Service has been changed from `miniwinsvc` to `minwinsvc`.
+- Configuration option `APP_NAME` is deprecated and will end support in 0.13.0, please start using `BRAND_NAME`.
+- Configuration option `[server] ROOT_URL` is deprecated and will end support in 0.13.0, please start using `[server] EXTERNAL_URL`.
+- Configuration option `[server] LANDING_PAGE` is deprecated and will end support in 0.13.0, please start using `[server] LANDING_URL`.
+- Configuration option `[database] DB_TYPE` is deprecated and will end support in 0.13.0, please start using `[database] TYPE`.
+- Configuration option `[database] PASSWD` is deprecated and will end support in 0.13.0, please start using `[database] PASSWORD`.
+- Configuration option `[security] REVERSE_PROXY_AUTHENTICATION_USER` is deprecated and will end support in 0.13.0, please start using `[auth] REVERSE_PROXY_AUTHENTICATION_HEADER`.
+- Configuration section `[mailer]` is deprecated and will end support in 0.13.0, please start using `[email]`.
+- Configuration section `[service]` is deprecated and will end support in 0.13.0, please start using `[auth]`.
+- Configuration option `[auth] ACTIVE_CODE_LIVE_MINUTES` is deprecated and will end support in 0.13.0, please start using `[auth] ACTIVATE_CODE_LIVES`.
+- Configuration option `[auth] RESET_PASSWD_CODE_LIVE_MINUTES` is deprecated and will end support in 0.13.0, please start using `[auth] RESET_PASSWORD_CODE_LIVES`.
+- Configuration option `[auth] REGISTER_EMAIL_CONFIRM` is deprecated and will end support in 0.13.0, please start using `[auth] REQUIRE_EMAIL_CONFIRMATION`.
+- Configuration option `[auth] ENABLE_CAPTCHA` is deprecated and will end support in 0.13.0, please start using `[auth] ENABLE_REGISTRATION_CAPTCHA`.
+- Configuration option `[auth] ENABLE_NOTIFY_MAIL` is deprecated and will end support in 0.13.0, please start using `[user] ENABLE_EMAIL_NOTIFICATION`.
+- Configuration option `[session] GC_INTERVAL_TIME` is deprecated and will end support in 0.13.0, please start using `[session] GC_INTERVAL`.
+- Configuration option `[session] SESSION_LIFE_TIME` is deprecated and will end support in 0.13.0, please start using `[session] MAX_LIFE_TIME`.
+- The name `-` is reserved and cannot be used for users or organizations.
+
+### Fixed
+
+- [Security] Potential open redirection with i18n.
+- [Security] Potential ability to delete files outside a repository.
+- [Security] Potential ability to set primary email on others' behalf from their verified emails.
+- [Security] Potential XSS attack via `.ipynb`. [#5170](https://github.com/gogs/gogs/issues/5170)
+- [Security] Potential SSRF attack via webhooks. [#5366](https://github.com/gogs/gogs/issues/5366)
+- [Security] Potential CSRF attack in admin panel. [#5367](https://github.com/gogs/gogs/issues/5367)
+- [Security] Potential stored XSS attack in some browsers. [#5397](https://github.com/gogs/gogs/issues/5397)
+- [Security] Potential RCE on mirror repositories. [#5767](https://github.com/gogs/gogs/issues/5767)
+- [Security] Potential XSS attack with raw markdown API. [#5907](https://github.com/gogs/gogs/pull/5907)
+- File both modified and renamed within a commit treated as separate files. [#5056](https://github.com/gogs/gogs/issues/5056)
+- Unable to restore the database backup to MySQL 8.0 with syntax error. [#5602](https://github.com/gogs/gogs/issues/5602)
+- Open/close milestone redirects to a 404 page. [#5677](https://github.com/gogs/gogs/issues/5677)
+- Disallow multiple tokens with same name. [#5587](https://github.com/gogs/gogs/issues/5587) [#5820](https://github.com/gogs/gogs/pull/5820)
+- Enable Federated Avatar Lookup could cause server to crash. [#5848](https://github.com/gogs/gogs/issues/5848)
+- Private repositories are hidden in the organization's view. [#5869](https://github.com/gogs/gogs/issues/5869)
+- Users have access to base repository cannot view commits in forks. [#5878](https://github.com/gogs/gogs/issues/5878)
+- Server error when changing email address in user settings page. [#5899](https://github.com/gogs/gogs/issues/5899)
+- Fall back to use RFC 3339 as time layout when misconfigured. [#6098](https://github.com/gogs/gogs/issues/6098)
+- Unable to update team with server error. [#6185](https://github.com/gogs/gogs/issues/6185)
+- Webhooks are not fired after push when `[service] REQUIRE_SIGNIN_VIEW = true`.
+- Files with identical content are randomly displayed one of them.
+
+### Removed
+
+- Configuration option `[other] SHOW_FOOTER_VERSION`
+- Configuration option `[server] STATIC_ROOT_PATH`
+- Configuration option `[repository] MIRROR_QUEUE_LENGTH`
+- Configuration option `[repository] PULL_REQUEST_QUEUE_LENGTH`
+- Configuration option `[session] ENABLE_SET_COOKIE`
+- Configuration option `[release.attachment] PATH`
+- Configuration option `[webhook] QUEUE_LENGTH`
+- Build tag `sqlite`, which means CGO is now required.
+
+---
+
+**Older change logs can be found on [GitHub](https://github.com/gogs/gogs/releases?after=v0.12.0).**

Dockerfile

@@ -1,38 +1,51 @@
-FROM alpine:3.5
+FROM golang:alpine3.14 AS binarybuilder
+RUN apk --no-cache --no-progress add --virtual \
+  build-deps \
+  build-base \
+  git \
+  linux-pam-dev
 
-# Install system utils & Gogs runtime dependencies
-ADD https://github.com/tianon/gosu/releases/download/1.9/gosu-amd64 /usr/sbin/gosu
-RUN chmod +x /usr/sbin/gosu \
+WORKDIR /gogs.io/gogs
+COPY . .
+RUN make build TAGS="cert pam"
+
+FROM alpine:3.14
+RUN if [ `uname -m` == "aarch64" ] ; then \
+      export arch="arm64" ; \
+  elif [ `uname -m` == "armv7l" ] ; then \
+      export arch="armhf"; \
+  else \
+      export arch="amd64" ; \
+  fi \
+  && wget https://github.com/tianon/gosu/releases/download/1.11/gosu-$arch -O /usr/sbin/gosu \
+  && chmod +x /usr/sbin/gosu \
   && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \
   && apk --no-cache --no-progress add \
-    bash \
-    ca-certificates \
-    curl \
-    git \
-    linux-pam \
-    openssh \
-    s6 \
-    shadow \
-    socat \
-    tzdata
+  bash \
+  ca-certificates \
+  curl \
+  git \
+  linux-pam \
+  openssh \
+  s6 \
+  shadow \
+  socat \
+  tzdata \
+  rsync
 
 ENV GOGS_CUSTOM /data/gogs
 
-# Configure LibC Name Service
+# Configure LibC Name Service
 COPY docker/nsswitch.conf /etc/nsswitch.conf
-COPY docker /app/gogs/docker
-COPY templates /app/gogs/templates
-COPY public /app/gogs/public
 
-WORKDIR /app/gogs/build
-COPY . .
+WORKDIR /app/gogs
+COPY docker ./docker
+COPY --from=binarybuilder /gogs.io/gogs/gogs .
 
-RUN    ./docker/build-go.sh \
-    && ./docker/build.sh \
-    && ./docker/finalize.sh
+RUN ./docker/finalize.sh
 
-# Configure Docker Container
-VOLUME ["/data"]
+# Configure Docker Container
+VOLUME ["/data", "/backup"]
 EXPOSE 22 3000
 ENTRYPOINT ["/app/gogs/docker/start.sh"]
 CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]

Dockerfile.aarch64

@@ -1,38 +0,0 @@
-FROM aarch64/alpine:3.5
-
-# Install system utils & Gogs runtime dependencies
-ADD https://github.com/tianon/gosu/releases/download/1.9/gosu-arm64 /usr/sbin/gosu
-RUN chmod +x /usr/sbin/gosu \
-  && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \
-  && apk --no-cache --no-progress add \
-    bash \
-    ca-certificates \
-    curl \
-    git \
-    linux-pam \
-    openssh \
-    s6 \
-    shadow \
-    socat \
-    tzdata
-
-ENV GOGS_CUSTOM /data/gogs
-
-# Configure LibC Name Service
-COPY docker/nsswitch.conf /etc/nsswitch.conf
-COPY docker /app/gogs/docker
-COPY templates /app/gogs/templates
-COPY public /app/gogs/public
-
-WORKDIR /app/gogs/build
-COPY . .
-
-RUN    ./docker/build-go.sh \
-    && ./docker/build.sh \
-    && ./docker/finalize.sh
-
-# Configure Docker Container
-VOLUME ["/data"]
-EXPOSE 22 3000
-ENTRYPOINT ["/app/gogs/docker/start.sh"]
-CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]

Dockerfile.rpi

@@ -1,38 +0,0 @@
-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-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \
-  && apk --no-cache --no-progress add \
-    bash \
-    ca-certificates \
-    curl \
-    git \
-    linux-pam \
-    openssh \
-    s6 \
-    shadow \
-    socat \
-    tzdata
-
-ENV GOGS_CUSTOM /data/gogs
-
-# Configure LibC Name Service
-COPY docker/nsswitch.conf /etc/nsswitch.conf
-COPY docker /app/gogs/docker
-COPY templates /app/gogs/templates
-COPY public /app/gogs/public
-
-WORKDIR /app/gogs/build
-COPY . .
-
-RUN    ./docker/build-go.sh \
-    && ./docker/build.sh \
-    && ./docker/finalize.sh
-
-# Configure Docker Container
-VOLUME ["/data"]
-EXPOSE 22 3000
-ENTRYPOINT ["/app/gogs/docker/start.sh"]
-CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]

Dockerfile.rpihub

@@ -1,58 +0,0 @@
-FROM armhf/alpine:3.5
-
-ENV GOGS_CUSTOM /data/gogs
-ENV QEMU_EXECVE 1
-
-# For cross compile on dockerhub
-################################
-
-COPY ./docker/armhf/qemu-arm-static /usr/bin/
-COPY ./docker/armhf/resin-xbuild /usr/bin/
-
-RUN [ "/usr/bin/qemu-arm-static", "/bin/sh", "-c", "ln -s resin-xbuild /usr/bin/cross-build-start; ln -s resin-xbuild /usr/bin/cross-build-end; ln /bin/sh /bin/sh.real" ]
-
-RUN [ "cross-build-start" ]
-
-# Prepare the container
-#######################
-
-# 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-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \
-  && apk --no-cache --no-progress add \
-    bash \
-    ca-certificates \
-    curl \
-    git \
-    linux-pam \
-    openssh \
-    s6 \
-    shadow \
-    socat \
-    tzdata
-
-# Configure LibC Name Service
-COPY docker/nsswitch.conf /etc/nsswitch.conf
-COPY docker /app/gogs/docker
-COPY templates /app/gogs/templates
-COPY public /app/gogs/public
-
-WORKDIR /app/gogs/build
-COPY . .
-
-RUN    ./docker/build-go.sh \
-    && ./docker/build.sh \
-    && ./docker/finalize.sh
-
-# For cross compile on dockerhub
-################################
-
-RUN [ "cross-build-end" ]
-
-# Configure Docker Container
-############################
-VOLUME ["/data"]
-EXPOSE 22 3000
-ENTRYPOINT ["/app/gogs/docker/start.sh"]
-CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]

Makefile

@@ -1,11 +1,10 @@
-LDFLAGS += -X "github.com/gogits/gogs/pkg/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
-LDFLAGS += -X "github.com/gogits/gogs/pkg/setting.BuildGitHash=$(shell git rev-parse HEAD)"
+LDFLAGS += -X "gogs.io/gogs/internal/conf.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
+LDFLAGS += -X "gogs.io/gogs/internal/conf.BuildCommit=$(shell git rev-parse HEAD)"
 
-DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
-LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)
-GENERATED  := pkg/bindata/bindata.go public/css/gogs.css
-
-OS := $(shell uname)
+CONF_FILES := $(shell find conf | sed 's/ /\\ /g')
+TEMPLATES_FILES := $(shell find templates | sed 's/ /\\ /g')
+PUBLIC_FILES := $(shell find public | sed 's/ /\\ /g')
+LESS_FILES := $(wildcard public/less/*.less)
 
 TAGS = ""
 BUILD_FLAGS = "-v"
@@ -13,9 +12,8 @@ BUILD_FLAGS = "-v"
 RELEASE_ROOT = "release"
 RELEASE_GOGS = "release/gogs"
 NOW = $(shell date -u '+%Y%m%d%I%M%S')
-GOVET = go tool vet -composites=false -methods=false -structtags=false
 
-.PHONY: build pack release bindata clean
+.PHONY: check dist build build-no-gen pack release generate less clean test fixme todo legacy
 
 .IGNORE: public/css/gogs.css
 
@@ -28,56 +26,39 @@ dist: release
 web: build
 	./gogs web
 
-govet:
-	$(GOVET) gogs.go
-	$(GOVET) models pkg routes
-
-build: $(GENERATED)
-	go install $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(TAGS)'
-	cp '$(GOPATH)/bin/gogs' .
-
-build-dev: $(GENERATED) govet
-	go install $(BUILD_FLAGS) -tags '$(TAGS)'
-	cp '$(GOPATH)/bin/gogs' .
-
-build-dev-race: $(GENERATED) govet
-	go install $(BUILD_FLAGS) -race -tags '$(TAGS)'
-	cp '$(GOPATH)/bin/gogs' .
+build:
+	go build $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(TAGS)' -trimpath -o gogs
 
 pack:
 	rm -rf $(RELEASE_GOGS)
 	mkdir -p $(RELEASE_GOGS)
-	cp -r gogs LICENSE README.md README_ZH.md templates public scripts $(RELEASE_GOGS)
-	rm -rf $(RELEASE_GOGS)/public/config.codekit $(RELEASE_GOGS)/public/less
+	cp -r gogs LICENSE README.md README_ZH.md scripts $(RELEASE_GOGS)
 	cd $(RELEASE_ROOT) && zip -r gogs.$(NOW).zip "gogs"
 
 release: build pack
 
-bindata: pkg/bindata/bindata.go
+generate: clean
+	go generate internal/assets/conf/conf.go
+	go generate internal/assets/templates/templates.go
+	go generate internal/assets/public/public.go
 
-pkg/bindata/bindata.go: $(DATA_FILES)
-	go-bindata -o=$@ -ignore="\\.DS_Store|README.md|TRANSLATORS" -pkg=bindata conf/...
+less: clean public/css/gogs.min.css
 
-less: public/css/gogs.css
-
-public/css/gogs.css: $(LESS_FILES)
-	lessc $< $@
+public/css/gogs.min.css: $(LESS_FILES)
+	@type lessc >/dev/null 2>&1 && lessc --clean-css --source-map "public/less/gogs.less" $@ || echo "lessc command not found or failed"
 
 clean:
-	go clean -i ./...
-
-clean-mac: clean
-	find . -name ".DS_Store" -print0 | xargs -0 rm
+	find . -name "*.DS_Store" -type f -delete
 
 test:
 	go test -cover -race ./...
 
 fixme:
-	grep -rnw "FIXME" cmd routers models pkg
+	grep -rnw "FIXME" internal
 
 todo:
-	grep -rnw "TODO" cmd routers models pkg
+	grep -rnw "TODO" internal
 
-# Legacy code should be remove by the time of release
+# Legacy code should be removed by the time of release
 legacy:
-	grep -rnw "LEGACY" cmd routes models pkg
+	grep -rnw "\(LEGACY\|Deprecated\)" internal

README.md

@@ -1,81 +1,74 @@
-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)
-=====================
+# <img src="https://github.com/gogs/gogs/raw/master/public/img/favicon.png" width="45" align="left">Gogs - A painless self-hosted Git service
 
-![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/gogs/gogs/Go?logo=github&style=for-the-badge)](https://github.com/gogs/gogs/actions?query=workflow%3AGo) [![Discord](https://img.shields.io/discord/382595433060499458.svg?style=for-the-badge&logo=discord)](https://discord.gg/9aqdHU7) [![Sourcegraph](https://img.shields.io/badge/view%20on-Sourcegraph-brightgreen.svg?style=for-the-badge&logo=sourcegraph)](https://sourcegraph.com/github.com/gogs/gogs)
 
-##### Current tip version: [`.VERSION`](templates/.VERSION) (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
-
-| Web | UI  | Preview  |
-|:-------------:|:-------:|:-------:|
-|![Dashboard](https://gogs.io/img/screenshots/1.png)|![Repository](https://gogs.io/img/screenshots/2.png)|![Editor](https://gogs.io/img/screenshots/3.png)|
-|![Profile](https://gogs.io/img/screenshots/4.png)|![Diff](https://gogs.io/img/screenshots/5.png)|![Repository Settings](https://gogs.io/img/screenshots/6.png?ts=20170322)|
-|![Webhook](https://gogs.io/img/screenshots/7.png)|![Organization](https://gogs.io/img/screenshots/8.png)|![Admin Dashboard](https://gogs.io/img/screenshots/9.png)|
-
-### Important Notes
-
-1. **YOU MUST READ [Contributing Code](https://github.com/gogits/gogs/wiki/Contributing-Code) BEFORE STARTING TO WORK ON A PULL REQUEST**.
-2. Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) was reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site.
-3. The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch.
-4. If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**, and the name you want to be credited as. Thanks!
-5. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki).
-6. If your team/company is using Gogs and would like to put your logo on [our website](https://gogs.io), contact us by any means.
+![Repository](https://gogs.io/img/screenshots/2.png)
 
 [简体中文](README_ZH.md)
 
-## Purpose
+## 🔮 Vision
 
-The goal of this project is to make the easiest, fastest, and most painless way of setting up a self-hosted Git service. With Go, this can be done with an independent binary distribution across **ALL platforms** that Go supports, including Linux, Mac OS X, Windows and ARM.
+The Gogs (`/gɑgz/`) project aims to build a simple, stable and extensible self-hosted Git service that can be setup in the most painless way. With Go, this can be done with an independent binary distribution across **ALL platforms** that Go supports, including Linux, macOS, Windows and ARM.
 
-## Overview
+## 📡 Overview
 
-- Please see the [Documentation](https://gogs.io/docs/intro) for common usages and change log.
+- Please visit [our home page](https://gogs.io) for user documentation.
+- Please refer to [CHANGELOG.md](CHANGELOG.md) for list of changes in each releases.
 - Want to try it before doing anything else? Do it [online](https://try.gogs.io/gogs/gogs)!
-- Having trouble? Get help with [Troubleshooting](https://gogs.io/docs/intro/troubleshooting.html) or [User Forum](https://discuss.gogs.io/).
-- Want to help with localization? Check out the [guide](https://gogs.io/docs/features/i18n.html)!
+- Having trouble? Help yourself with [troubleshooting](https://gogs.io/docs/intro/troubleshooting.html) or ask questions on [user forum](https://discuss.gogs.io/).
+- Want to help with localization? Check out the [localization documentation](https://gogs.io/docs/features/i18n.html).
+- Ready to get hands dirty? Read our guide to [set up your development environment](docs/dev/local_development.md).
+- Hmm... What about APIs? We have experimental support with [documentation](https://github.com/gogs/docs-api).
 
-## Features
+## 💌 Features
 
-- Activity timeline
-- SSH and HTTP/HTTPS protocols
-- SMTP/LDAP/Reverse proxy authentication
-- Reverse proxy with sub-path
-- Account/Organization/Repository management
-- Add/Remove repository collaborators
-- Repository/Organization webhooks (including Slack and Discord)
-- Repository Git hooks/deploy keys
-- Repository issues, pull requests, wiki and protected branches
-- Migrate and mirror repository and its wiki
-- Web editor for repository files and wiki
-- Jupyter Notebook
-- Two-factor authentication
-- Gravatar and Federated avatar with custom source
-- Mail service
-- Administration panel
-- Supports MySQL, PostgreSQL, SQLite3, MSSQL and [TiDB](https://github.com/pingcap/tidb) (via MySQL protocol)
-- Multi-language support ([26 languages](https://crowdin.com/project/gogs))
+- User dashboard, user profile and activity timeline.
+- Access repositories via SSH, HTTP and HTTPS protocols.
+- User, organization and repository management.
+- Repository and organization webhooks, including Slack, Discord and Dingtalk.
+- Repository Git hooks, deploy keys and Git LFS.
+- Repository issues, pull requests, wiki, protected branches and collaboration.
+- Migrate and mirror repositories with wiki from other code hosts.
+- Web editor for quick editing repository files and wiki.
+- Jupyter Notebook and PDF rendering.
+- Authentication via SMTP, LDAP, reverse proxy, GitHub.com and GitHub Enterprise with 2FA.
+- Customize HTML templates, static files and many others.
+- Rich database backend, including PostgreSQL, MySQL, SQLite3 and [TiDB](https://github.com/pingcap/tidb).
+- Have localization over [30 languages](https://crowdin.com/project/gogs).
 
-## Hardware Requirements
+## 💾 Hardware requirements
 
 - 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
+## 💻 Browser support
 
 - Please see [Semantic UI](https://github.com/Semantic-Org/Semantic-UI#browser-support) for specific versions of supported browsers.
 - The smallest resolution officially supported is **1024*768**, however the UI may still look right in smaller resolutions, but no promises or fixes.
 
-## Installation
+## 📜 Installation
 
 Make sure you install the [prerequisites](https://gogs.io/docs/installation) first.
 
-There are 5 ways to install Gogs:
+There are 6 ways to install Gogs:
 
 - [Install from binary](https://gogs.io/docs/installation/install_from_binary.html)
 - [Install from source](https://gogs.io/docs/installation/install_from_source.html)
 - [Install from packages](https://gogs.io/docs/installation/install_from_packages.html)
-- [Ship with Docker](https://github.com/gogits/gogs/tree/master/docker)
+- [Ship with Docker](https://github.com/gogs/gogs/tree/master/docker)
 - [Install with Vagrant](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
+- [Install with Kubernetes Using Helm Charts](https://github.com/helm/charts/tree/master/incubator/gogs)
+
+### Deploy to cloud
+
+- [Cloudron](https://cloudron.io/appstore.html#io.gogs.cloudronapp)
+- [Scaleway](https://www.scaleway.com/imagehub/gogs/)
+- [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)
+- [DPlatform](https://github.com/j8r/DPlatform)
+- [LunaNode](https://github.com/LunaNode/launchgogs)
 
 ### Tutorials
 
@@ -83,56 +76,37 @@ There are 5 ways to install Gogs:
 - [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](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)
+- [使用 Gogs 搭建自己的 Git 服务器](https://blog.mynook.info/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 using NGINX](http://www.listekconsulting.com/articles/cloudflare-full-ssl-with-gogs-go-git-service-using-nginx/)
-
-### Screencasts
-
 - [How to install Gogs on a Linux Server (DigitalOcean)](https://www.youtube.com/watch?v=deSfX0gqefE)
-- [Instalando Gogs no Ubuntu](https://www.youtube.com/watch?v=4UkHAR1F7ZA) (Português)
 
-### Deploy to Cloud
+## 📦 Software, service and product support
 
-- [OpenShift](https://github.com/tkisme/gogs-openshift)
-- [Cloudron](https://cloudron.io/appstore.html#io.gogs.cloudronapp)
-- [Scaleway](https://www.scaleway.com/imagehub/gogs/)
-- [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)
-- [DPlatform](https://github.com/j8r/DPlatform)
-
-## 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)
+- [Jenkins](https://plugins.jenkins.io/gogs-webhook/) (CI)
 - [Taiga](https://taiga.io/) (Project Management)
-- [Puppet](https://forge.puppetlabs.com/Siteminds/gogs) (IT)
-- [Kanboard](http://kanboard.net/plugin/gogs-webhook) (Project Management)
+- [Puppet](https://forge.puppet.com/Siteminds/gogs) (IT)
+- [Kanboard](https://github.com/kanboard/plugin-gogs-webhook) (Project Management)
 - [BearyChat](https://bearychat.com/) (Team Communication)
-- [HiWork](http://www.hiwork.cc/) (Team Communication)
 - [GitPitch](https://gitpitch.com/) (Markdown Presentations)
-
-### Product Support
-
 - [Synology](https://www.synology.com) (Docker)
-- [One Space](http://www.onespace.cc) (App Store)
+- [Syncloud](https://syncloud.org/) (App Store)
 
-## Acknowledgments
+## 🙇‍♂️ Acknowledgments
 
-- 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.
+- Thanks [Egon Elbre](https://twitter.com/egonelbre) for designing the original version of the logo.
+- Thanks [Crowdin](https://crowdin.com/project/gogs) for sponsoring open source translation plan.
+- Thanks [DigitalOcean](https://www.digitalocean.com), [VPSServer](https://www.vpsserver.com/), [Hosted.nl](https://www.hosted.nl/) and [BitLaunch](https://bitlaunch.io) for sponsoring VPS services.
+- Thanks [KeyCDN](https://www.keycdn.com/) for sponsoring CDN service.
+- Thanks [Buildkite](https://buildkite.com) for sponsoring open source CI/CD plan.
 
-## Contributors
+## 👋 Contributors
 
-- See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for top 100 contributors.
+- See [contributors page](https://github.com/gogs/gogs/graphs/contributors) for top 100 contributors.
 - See [TRANSLATORS](conf/locale/TRANSLATORS) for public list of translators.
 
 ## License
 
-This project is under the MIT License. See the [LICENSE](https://github.com/gogits/gogs/blob/master/LICENSE) file for the full license text.
+This project is under the MIT License. See the [LICENSE](https://github.com/gogs/gogs/blob/master/LICENSE) file for the full license text.

README_ZH.md

@@ -1,39 +1,37 @@
-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
 
 Gogs 是一款极易搭建的自助 Git 服务。
 
-## 开发目的
+## 项目愿景
 
-Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自助 Git 服务。使用 Go 语言开发使得 Gogs 能够通过独立的二进制分发，并且支持 Go 语言支持的 **所有平台**，包括 Linux、Mac OS X、Windows 以及 ARM 平台。
+Gogs（`/gɑgz/`）项目旨在打造一个以最简便的方式搭建简单、稳定和可扩展的自助 Git 服务。使用 Go 语言开发使得 Gogs 能够通过独立的二进制分发，并且支持 Go 语言支持的 **所有平台**，包括 Linux、macOS、Windows 以及 ARM 平台。
 
-## 项目概览
+## 概览
 
-- 有关基本用法和变更日志，请通过 [使用手册](https://gogs.io/docs/intro) 查看。
-- 想要先睹为快？直接去 [在线体验](https://try.gogs.io/gogs/gogs) 。
-- 使用过程中遇到问题？尝试从 [故障排查](https://gogs.io/docs/intro/troubleshooting.html) 页面或 [用户论坛](https://discuss.gogs.io/) 获取帮助。
-- 希望帮助多国语言界面的翻译吗？请立即访问 [详情页面](https://gogs.io/docs/features/i18n.html)！
+- 请移步[官网](https://gogs.io)查看用户使用文档
+- 请通过 [CHANGELOG.md](CHANGELOG.md) 文件查看各个版本的变更历史
+- 想要先睹为快？直接去[在线体验](https://try.gogs.io/gogs/gogs)吧！
+- 使用过程中遇到问题？尝试[故障排查](https://gogs.io/docs/intro/troubleshooting.html)或者前往[用户论坛](https://discuss.gogs.io/)获取帮助
+- 希望帮助多国语言的翻译吗？请查看[本地化文档](https://gogs.io/docs/features/i18n.html)
+- 准备搞点事情？请阅读[开发指南](docs/local_development.md)配置开发环境
+- 想调用 API 吗？请查看[文档](https://github.com/gogs/docs-api)吧
 
-## 功能特性
+## 主要特性
 
-- 支持活动时间线
-- 支持 SSH 以及 HTTP/HTTPS 协议
-- 支持 SMTP、LDAP 和反向代理的用户认证
-- 支持反向代理子路径
-- 支持用户、组织和仓库管理系统
-- 支持添加和删除仓库协作者
-- 支持仓库和组织级别 Web 钩子（包括 Slack 和 Discord 集成）
-- 支持仓库 Git 钩子和部署密钥
-- 支持仓库工单（Issue）、合并请求（Pull Request）、Wiki 和保护分支
-- 支持迁移和镜像仓库以及它的 Wiki
-- 支持在线编辑仓库文件和 Wiki
-- 支持自定义源的 Gravatar 和 Federated Avatar
-- 支持 Jupyter Notebook
-- 支持两步验证登录
-- 支持邮件服务
-- 支持后台管理面板
-- 支持 MySQL、PostgreSQL、SQLite3、MSSQL 和 [TiDB](https://github.com/pingcap/tidb)（通过 MySQL 协议）数据库
-- 支持多语言本地化（[26 种语言]([more](https://crowdin.com/project/gogs))）
+- 控制面板、用户页面以及活动时间线
+- 通过 SSH、HTTP 和 HTTPS 协议操作仓库
+- 管理用户、组织和仓库
+- 仓库和组织级 Webhook，包括 Slack、Discord 和钉钉
+- 仓库 Git 钩子、部署密钥和 Git LFS
+- 仓库工单（Issue）、合并请求（Pull Request）、Wiki、保护分支和多人协作
+- 从其它代码平台迁移和镜像仓库以及 Wiki
+- 在线编辑仓库文件和 Wiki
+- Jupyter Notebook 和 PDF 的渲染
+- 通过 SMTP、LDAP、反向代理、GitHub.com 和 GitHub 企业版进行用户认证
+- 开启两步验证（2FA）登录
+- 自定义 HTML 模板、静态文件和许多其它组件
+- 多样的数据库后端，包括 PostgreSQL、MySQL、SQLite3 和 [TiDB](https://github.com/pingcap/tidb)
+- 超过[30 种语言](https://crowdin.com/project/gogs)的本地化
 
 ## 硬件要求
 
@@ -50,18 +48,14 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 
 在安装 Gogs 之前，您需要先安装 [基本环境](https://gogs.io/docs/installation)。
 
-然后，您可以通过以下 5 种方式来安装 Gogs：
+然后，您可以通过以下 6 种方式来安装 Gogs：
 
 - [二进制安装](https://gogs.io/docs/installation/install_from_binary.html)
 - [源码安装](https://gogs.io/docs/installation/install_from_source.html)
 - [包管理安装](https://gogs.io/docs/installation/install_from_packages.html)
-- [采用 Docker 部署](https://github.com/gogits/gogs/tree/master/docker)
+- [采用 Docker 部署](https://github.com/gogs/gogs/tree/master/docker)
 - [通过 Vagrant 安装](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
-
-### 使用教程
-
-- [使用 Gogs 搭建自己的 Git 服务器](https://mynook.info/blog/post/host-your-own-git-server-using-gogs)
-- [阿里云上 Ubuntu 14.04 64 位安装 Gogs](http://my.oschina.net/luyao/blog/375654)
+- [通过基于 Kubernetes 的 Helm Charts](https://github.com/helm/charts/tree/master/incubator/gogs)
 
 ### 云端部署
 
@@ -72,36 +66,38 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - [sloppy.io](https://github.com/sloppyio/quickstarters/tree/master/gogs)
 - [YunoHost](https://github.com/mbugeia/gogs_ynh)
 - [DPlatform](https://github.com/j8r/DPlatform)
+- [LunaNode](https://github.com/LunaNode/launchgogs)
 
-## 软件及服务支持
+### 使用教程
+
+- [使用 Gogs 搭建自己的 Git 服务器](https://blog.mynook.info/post/host-your-own-git-server-using-gogs/)
+- [阿里云上 Ubuntu 14.04 64 位安装 Gogs](http://my.oschina.net/luyao/blog/375654)
+
+## 软件、服务以及产品支持
 
-- [Drone](https://github.com/drone/drone)（CI）
-- [Jenkins](https://wiki.jenkins-ci.org/display/JENKINS/Gogs+Webhook+Plugin)（CI）
 - [Fabric8](http://fabric8.io/)（DevOps）
+- [Jenkins](https://plugins.jenkins.io/gogs-webhook/)（CI）
 - [Taiga](https://taiga.io/)（项目管理）
-- [Puppet](https://forge.puppetlabs.com/Siteminds/gogs)（IT）
-- [Kanboard](http://kanboard.net/plugin/gogs-webhook)（项目管理）
+- [Puppet](https://forge.puppet.com/Siteminds/gogs)（IT）
+- [Kanboard](https://github.com/kanboard/plugin-gogs-webhook)（项目管理）
 - [BearyChat](https://bearychat.com/)（团队交流）
-- [HiWork](http://www.hiwork.cc/)（团队交流）
 - [GitPitch](https://gitpitch.com/)（Markdown 演示）
-
-### 产品支持
-
 - [Synology](https://www.synology.com)（Docker）
-- [One Space](http://www.onespace.cc)（应用商店）
+- [Syncloud](https://syncloud.org/)（应用商店）
 
 ## 特别鸣谢
 
 - 感谢 [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 服务赞助。
+- 感谢 [DigitalOcean](https://www.digitalocean.com)、[VPSServer](https://www.vpsserver.com/)、[Hosted.nl](https://www.hosted.nl/)、[MonoVM](https://monovm.com) 和 [BitLaunch](https://bitlaunch.io) 提供服务器赞助。
+- 感谢 [KeyCDN](https://www.keycdn.com/) 提供 CDN 服务赞助。
+- 感谢 [Buildkite](https://buildkite.com) 提供免费的开源项目 CI/CD 支持。
 
 ## 贡献成员
 
-- 您可以通过查看 [贡献者页面](https://github.com/gogits/gogs/graphs/contributors) 获取 TOP 100 的贡献者列表。
+- 您可以通过查看 [贡献者页面](https://github.com/gogs/gogs/graphs/contributors) 获取 TOP 100 的贡献者列表。
 - 您可以通过查看 [TRANSLATORS](conf/locale/TRANSLATORS) 文件获取公开的翻译人员列表。
 
 ## 授权许可
 
-本项目采用 MIT 开源授权许可证，完整的授权说明已放置在 [LICENSE](https://github.com/gogits/gogs/blob/master/LICENSE) 文件中。
+本项目采用 MIT 开源授权许可证，完整的授权说明已放置在 [LICENSE](https://github.com/gogs/gogs/blob/master/LICENSE) 文件中。

SECURITY.md

@@ -0,0 +1,11 @@
+# Security policy
+
+## Supported versions
+
+Only lastest two minor version releases are supported for patching security fixes.
+
+## Reporting a vulnerability
+
+Please send report privately to [security@gogs.io](mailto:security@gogs.io), and include how would you like to be credited.
+
+Thank you!

Taskfile.yml

@@ -0,0 +1,91 @@
+version: '3'
+
+vars:
+  BINARY_EXT:
+    sh: echo '{{if eq OS "windows"}}.exe{{end}}'
+
+tasks:
+  web:
+    desc: Build the binary and start the web server.
+    deps: [build]
+    cmds:
+      - ./gogs web
+
+  build:
+    desc: Build the binary.
+    cmds:
+      - go build -v
+        -ldflags '
+        -X "{{.PKG_PATH}}.BuildTime={{.BUILD_TIME}}"
+        -X "{{.PKG_PATH}}.BuildCommit={{.BUILD_COMMIT}}"
+        '
+        -tags '{{.TAGS}}'
+        -trimpath -o gogs{{.BINARY_EXT}}
+    vars:
+      PKG_PATH: gogs.io/gogs/internal/conf
+      BUILD_TIME:
+        sh: date -u '+%Y-%m-%d %I:%M:%S %Z'
+      BUILD_COMMIT:
+        sh: git rev-parse HEAD
+    sources:
+      - gogs.go
+      - internal/**/*.go
+
+  generate-bindata:
+    desc: Generate bindata for all assets.
+    deps: [clean]
+    cmds:
+      - go generate internal/assets/conf/conf.go
+      - go generate internal/assets/templates/templates.go
+      - go generate internal/assets/public/public.go
+
+  generate-schemadoc:
+    desc: Generate database schema documentation.
+    cmds:
+      - go generate ./internal/db/schemadoc
+
+  generate:
+    desc: Run all go:generate commands.
+    deps: [generate-bindata, generate-schemadoc]
+
+  test:
+    desc: Run all tests.
+    cmds:
+      - go test -cover -race ./...
+
+  clean:
+    desc: Cleans up system meta files for code generation.
+    cmds:
+      - find . -name "*.DS_Store" -type f -delete
+
+  release:
+    desc: Build the binary and pack resources to a ZIP file.
+    deps: [build]
+    cmds:
+      - rm -rf {{.RELEASE_GOGS}}
+      - mkdir -p {{.RELEASE_GOGS}}
+      - cp -r gogs{{.BINARY_EXT}} LICENSE README.md README_ZH.md scripts {{.RELEASE_GOGS}}
+      - cd {{.RELEASE_ROOT}} && zip -r gogs.$(NOW).zip "gogs"
+    vars:
+      RELEASE_ROOT: release
+      RELEASE_GOGS: release/gogs
+
+  less:
+    desc: Generate CSS from LESS files.
+    cmds:
+      - lessc --clean-css --source-map "public/less/gogs.less" public/css/gogs.min.css
+
+  fixme:
+    desc: Show all occurrences of "FIXME".
+    cmds:
+      - grep -rnw "FIXME" internal
+
+  todo:
+    desc: Show all occurrences of "TODO".
+    cmds:
+      - grep -rnw "TODO" internal
+
+  legacy:
+    desc: Identify legacy and deprecated lines.
+    cmds:
+      - grep -rnw "\(LEGACY\|Deprecated\)" internal

appveyor.yml

@@ -1,20 +0,0 @@
-version: "{build}"
-skip_tags: true
-clone_folder: c:\gopath\src\github.com\gogits\gogs
-clone_depth: 1
-
-environment:
-  GOPATH: c:\gopath
-  GOVERSION: 1.7
-
-build: false
-deploy: false
-
-install:
-  - go build -v
-
-notifications:
-  - provider: Email
-    to:
-      - u@gogs.io
-    on_build_success: false

cmd/backup.go

@@ -1,136 +0,0 @@
-// 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 cmd
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"time"
-
-	"github.com/Unknwon/cae/zip"
-	"github.com/Unknwon/com"
-	"github.com/urfave/cli"
-	log "gopkg.in/clog.v1"
-	"gopkg.in/ini.v1"
-
-	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/pkg/setting"
-)
-
-var Backup = cli.Command{
-	Name:  "backup",
-	Usage: "Backup files and database",
-	Description: `Backup dumps and compresses all related files and database into zip file,
-which can be used for migrating Gogs to another server. The output format is meant to be
-portable among all supported database engines.`,
-	Action: runBackup,
-	Flags: []cli.Flag{
-		stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"),
-		boolFlag("verbose, v", "Show process details"),
-		stringFlag("tempdir, t", os.TempDir(), "Temporary directory path"),
-		stringFlag("target", "./", "Target directory path to save backup archive"),
-		stringFlag("archive-name", fmt.Sprintf("gogs-backup-%s.zip", time.Now().Format("20060102150405")), "Name of backup archive"),
-		boolFlag("database-only", "Only dump database"),
-		boolFlag("exclude-repos", "Exclude repositories"),
-	},
-}
-
-const _ARCHIVE_ROOT_DIR = "gogs-backup"
-
-func runBackup(c *cli.Context) error {
-	zip.Verbose = c.Bool("verbose")
-	if c.IsSet("config") {
-		setting.CustomConf = c.String("config")
-	}
-	setting.NewContext()
-	models.LoadConfigs()
-	models.SetEngine()
-
-	tmpDir := c.String("tempdir")
-	if !com.IsExist(tmpDir) {
-		log.Fatal(0, "'--tempdir' does not exist: %s", tmpDir)
-	}
-	rootDir, err := ioutil.TempDir(tmpDir, "gogs-backup-")
-	if err != nil {
-		log.Fatal(0, "Fail to create backup root directory '%s': %v", rootDir, err)
-	}
-	log.Info("Backup root directory: %s", rootDir)
-
-	// Metadata
-	metaFile := path.Join(rootDir, "metadata.ini")
-	metadata := ini.Empty()
-	metadata.Section("").Key("VERSION").SetValue("1")
-	metadata.Section("").Key("DATE_TIME").SetValue(time.Now().String())
-	metadata.Section("").Key("GOGS_VERSION").SetValue(setting.AppVer)
-	if err = metadata.SaveTo(metaFile); err != nil {
-		log.Fatal(0, "Fail to save metadata '%s': %v", metaFile, err)
-	}
-
-	archiveName := path.Join(c.String("target"), c.String("archive-name"))
-	log.Info("Packing backup files to: %s", archiveName)
-
-	z, err := zip.Create(archiveName)
-	if err != nil {
-		log.Fatal(0, "Fail to create backup archive '%s': %v", archiveName, err)
-	}
-	if err = z.AddFile(_ARCHIVE_ROOT_DIR+"/metadata.ini", metaFile); err != nil {
-		log.Fatal(0, "Fail to include 'metadata.ini': %v", err)
-	}
-
-	// Database
-	dbDir := path.Join(rootDir, "db")
-	if err = models.DumpDatabase(dbDir); err != nil {
-		log.Fatal(0, "Fail to dump database: %v", err)
-	}
-	if err = z.AddDir(_ARCHIVE_ROOT_DIR+"/db", dbDir); err != nil {
-		log.Fatal(0, "Fail to include 'db': %v", err)
-	}
-
-	// Custom files
-	if !c.Bool("database-only") {
-		if err = z.AddDir(_ARCHIVE_ROOT_DIR+"/custom", setting.CustomPath); err != nil {
-			log.Fatal(0, "Fail to include 'custom': %v", err)
-		}
-	}
-
-	// Data files
-	if !c.Bool("database-only") {
-		for _, dir := range []string{"attachments", "avatars"} {
-			dirPath := path.Join(setting.AppDataPath, dir)
-			if !com.IsDir(dirPath) {
-				continue
-			}
-
-			if err = z.AddDir(path.Join(_ARCHIVE_ROOT_DIR+"/data", dir), dirPath); err != nil {
-				log.Fatal(0, "Fail to include 'data': %v", err)
-			}
-		}
-	}
-
-	// Repositories
-	if !c.Bool("exclude-repos") && !c.Bool("database-only") {
-		reposDump := path.Join(rootDir, "repositories.zip")
-		log.Info("Dumping repositories in '%s'", setting.RepoRootPath)
-		if err = zip.PackTo(setting.RepoRootPath, reposDump, true); err != nil {
-			log.Fatal(0, "Fail to dump repositories: %v", err)
-		}
-		log.Info("Repositories dumped to: %s", reposDump)
-
-		if err = z.AddFile(_ARCHIVE_ROOT_DIR+"/repositories.zip", reposDump); err != nil {
-			log.Fatal(0, "Fail to include 'repositories.zip': %v", err)
-		}
-	}
-
-	if err = z.Close(); err != nil {
-		log.Fatal(0, "Fail to save backup archive '%s': %v", archiveName, err)
-	}
-
-	os.RemoveAll(rootDir)
-	log.Info("Backup succeed! Archive is located at: %s", archiveName)
-	log.Shutdown()
-	return nil
-}

cmd/restore.go

@@ -1,136 +0,0 @@
-// 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 cmd
-
-import (
-	"os"
-	"path"
-
-	"github.com/Unknwon/cae/zip"
-	"github.com/Unknwon/com"
-	"github.com/mcuadros/go-version"
-	"github.com/urfave/cli"
-	log "gopkg.in/clog.v1"
-	"gopkg.in/ini.v1"
-
-	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/pkg/setting"
-)
-
-var Restore = cli.Command{
-	Name:  "restore",
-	Usage: "Restore files and database from backup",
-	Description: `Restore imports all related files and database from a backup archive.
-The backup version must lower or equal to current Gogs version. You can also import
-backup from other database engines, which is useful for database migrating.
-
-If corresponding files or database tables are not presented in the archive, they will
-be skipped and remain unchanged.`,
-	Action: runRestore,
-	Flags: []cli.Flag{
-		stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"),
-		boolFlag("verbose, v", "Show process details"),
-		stringFlag("tempdir, t", os.TempDir(), "Temporary directory path"),
-		stringFlag("from", "", "Path to backup archive"),
-		boolFlag("database-only", "Only import database"),
-		boolFlag("exclude-repos", "Exclude repositories"),
-	},
-}
-
-func runRestore(c *cli.Context) error {
-	zip.Verbose = c.Bool("verbose")
-
-	tmpDir := c.String("tempdir")
-	if !com.IsExist(tmpDir) {
-		log.Fatal(0, "'--tempdir' does not exist: %s", tmpDir)
-	}
-
-	log.Info("Restore backup from: %s", c.String("from"))
-	if err := zip.ExtractTo(c.String("from"), tmpDir); err != nil {
-		log.Fatal(0, "Fail to extract backup archive: %v", err)
-	}
-	archivePath := path.Join(tmpDir, _ARCHIVE_ROOT_DIR)
-
-	// Check backup version
-	metaFile := path.Join(archivePath, "metadata.ini")
-	if !com.IsExist(metaFile) {
-		log.Fatal(0, "File 'metadata.ini' is missing")
-	}
-	metadata, err := ini.Load(metaFile)
-	if err != nil {
-		log.Fatal(0, "Fail to load metadata '%s': %v", metaFile, err)
-	}
-	backupVersion := metadata.Section("").Key("GOGS_VERSION").MustString("999.0")
-	if version.Compare(setting.AppVer, backupVersion, "<") {
-		log.Fatal(0, "Current Gogs version is lower than backup version: %s < %s", setting.AppVer, backupVersion)
-	}
-
-	// If config file is not present in backup, user must set this file via flag.
-	// Otherwise, it's optional to set config file flag.
-	configFile := path.Join(archivePath, "custom/conf/app.ini")
-	if c.IsSet("config") {
-		setting.CustomConf = c.String("config")
-	} else if !com.IsExist(configFile) {
-		log.Fatal(0, "'--config' is not specified and custom config file is not found in backup")
-	} else {
-		setting.CustomConf = configFile
-	}
-	setting.NewContext()
-	models.LoadConfigs()
-	models.SetEngine()
-
-	// Database
-	dbDir := path.Join(archivePath, "db")
-	if err = models.ImportDatabase(dbDir, c.Bool("verbose")); err != nil {
-		log.Fatal(0, "Fail to import database: %v", err)
-	}
-
-	// Custom files
-	if !c.Bool("database-only") {
-		if com.IsExist(setting.CustomPath) {
-			if err = os.Rename(setting.CustomPath, setting.CustomPath+".bak"); err != nil {
-				log.Fatal(0, "Fail to backup current 'custom': %v", err)
-			}
-		}
-		if err = os.Rename(path.Join(archivePath, "custom"), setting.CustomPath); err != nil {
-			log.Fatal(0, "Fail to import 'custom': %v", err)
-		}
-	}
-
-	// Data files
-	if !c.Bool("database-only") {
-		os.MkdirAll(setting.AppDataPath, os.ModePerm)
-		for _, dir := range []string{"attachments", "avatars"} {
-			// Skip if backup archive does not have corresponding data
-			srcPath := path.Join(archivePath, "data", dir)
-			if !com.IsDir(srcPath) {
-				continue
-			}
-
-			dirPath := path.Join(setting.AppDataPath, dir)
-			if com.IsExist(dirPath) {
-				if err = os.Rename(dirPath, dirPath+".bak"); err != nil {
-					log.Fatal(0, "Fail to backup current 'data': %v", err)
-				}
-			}
-			if err = os.Rename(srcPath, dirPath); err != nil {
-				log.Fatal(0, "Fail to import 'data': %v", err)
-			}
-		}
-	}
-
-	// Repositories
-	reposPath := path.Join(archivePath, "repositories.zip")
-	if !c.Bool("exclude-repos") && !c.Bool("database-only") && com.IsExist(reposPath) {
-		if err := zip.ExtractTo(reposPath, path.Dir(setting.RepoRootPath)); err != nil {
-			log.Fatal(0, "Fail to extract 'repositories.zip': %v", err)
-		}
-	}
-
-	os.RemoveAll(path.Join(tmpDir, _ARCHIVE_ROOT_DIR))
-	log.Info("Restore succeed!")
-	log.Shutdown()
-	return nil
-}

cmd/web.go

@@ -1,730 +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 (
-	"crypto/tls"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/http/fcgi"
-	"os"
-	"path"
-	"strings"
-
-	"github.com/Unknwon/com"
-	"github.com/go-macaron/binding"
-	"github.com/go-macaron/cache"
-	"github.com/go-macaron/captcha"
-	"github.com/go-macaron/csrf"
-	"github.com/go-macaron/gzip"
-	"github.com/go-macaron/i18n"
-	"github.com/go-macaron/session"
-	"github.com/go-macaron/toolbox"
-	"github.com/mcuadros/go-version"
-	"github.com/urfave/cli"
-	log "gopkg.in/clog.v1"
-	"gopkg.in/macaron.v1"
-
-	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/pkg/bindata"
-	"github.com/gogits/gogs/pkg/context"
-	"github.com/gogits/gogs/pkg/form"
-	"github.com/gogits/gogs/pkg/mailer"
-	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/pkg/template"
-	"github.com/gogits/gogs/routes"
-	"github.com/gogits/gogs/routes/admin"
-	apiv1 "github.com/gogits/gogs/routes/api/v1"
-	"github.com/gogits/gogs/routes/dev"
-	"github.com/gogits/gogs/routes/org"
-	"github.com/gogits/gogs/routes/repo"
-	"github.com/gogits/gogs/routes/user"
-)
-
-var Web = cli.Command{
-	Name:  "web",
-	Usage: "Start web server",
-	Description: `Gogs web server is the only thing you need to run,
-and it takes care of all the other things for you`,
-	Action: runWeb,
-	Flags: []cli.Flag{
-		stringFlag("port, p", "3000", "Temporary port number to prevent conflict"),
-		stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"),
-	},
-}
-
-// checkVersion checks if binary matches the version of templates files.
-func checkVersion() {
-	// Templates.
-	data, err := ioutil.ReadFile(setting.StaticRootPath + "/templates/.VERSION")
-	if err != nil {
-		log.Fatal(2, "Fail to read 'templates/.VERSION': %v", err)
-	}
-	tplVer := string(data)
-	if tplVer != setting.AppVer {
-		if version.Compare(tplVer, setting.AppVer, ">") {
-			log.Fatal(2, "Binary version is lower than template file version, did you forget to recompile Gogs?")
-		} else {
-			log.Fatal(2, "Binary version is higher than template file version, did you forget to update template files?")
-		}
-	}
-}
-
-// newMacaron initializes Macaron instance.
-func newMacaron() *macaron.Macaron {
-	m := macaron.New()
-	if !setting.DisableRouterLog {
-		m.Use(macaron.Logger())
-	}
-	m.Use(macaron.Recovery())
-	if setting.EnableGzip {
-		m.Use(gzip.Gziper())
-	}
-	if setting.Protocol == setting.SCHEME_FCGI {
-		m.SetURLPrefix(setting.AppSubURL)
-	}
-	m.Use(macaron.Static(
-		path.Join(setting.StaticRootPath, "public"),
-		macaron.StaticOptions{
-			SkipLogging: setting.DisableRouterLog,
-		},
-	))
-	m.Use(macaron.Static(
-		setting.AvatarUploadPath,
-		macaron.StaticOptions{
-			Prefix:      "avatars",
-			SkipLogging: setting.DisableRouterLog,
-		},
-	))
-
-	funcMap := template.NewFuncMap()
-	m.Use(macaron.Renderer(macaron.RenderOptions{
-		Directory:         path.Join(setting.StaticRootPath, "templates"),
-		AppendDirectories: []string{path.Join(setting.CustomPath, "templates")},
-		Funcs:             funcMap,
-		IndentJSON:        macaron.Env != macaron.PROD,
-	}))
-	mailer.InitMailRender(path.Join(setting.StaticRootPath, "templates/mail"),
-		path.Join(setting.CustomPath, "templates/mail"), funcMap)
-
-	localeNames, err := bindata.AssetDir("conf/locale")
-	if err != nil {
-		log.Fatal(4, "Fail to list locale files: %v", err)
-	}
-	localFiles := make(map[string][]byte)
-	for _, name := range localeNames {
-		localFiles[name] = bindata.MustAsset("conf/locale/" + name)
-	}
-	m.Use(i18n.I18n(i18n.Options{
-		SubURL:          setting.AppSubURL,
-		Files:           localFiles,
-		CustomDirectory: path.Join(setting.CustomPath, "conf/locale"),
-		Langs:           setting.Langs,
-		Names:           setting.Names,
-		DefaultLang:     "en-US",
-		Redirect:        true,
-	}))
-	m.Use(cache.Cacher(cache.Options{
-		Adapter:       setting.CacheAdapter,
-		AdapterConfig: setting.CacheConn,
-		Interval:      setting.CacheInterval,
-	}))
-	m.Use(captcha.Captchaer(captcha.Options{
-		SubURL: setting.AppSubURL,
-	}))
-	m.Use(session.Sessioner(setting.SessionConfig))
-	m.Use(csrf.Csrfer(csrf.Options{
-		Secret:     setting.SecretKey,
-		Cookie:     setting.CSRFCookieName,
-		SetCookie:  true,
-		Header:     "X-Csrf-Token",
-		CookiePath: setting.AppSubURL,
-	}))
-	m.Use(toolbox.Toolboxer(m, toolbox.Options{
-		HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{
-			&toolbox.HealthCheckFuncDesc{
-				Desc: "Database connection",
-				Func: models.Ping,
-			},
-		},
-	}))
-	m.Use(context.Contexter())
-	return m
-}
-
-func runWeb(c *cli.Context) error {
-	if c.IsSet("config") {
-		setting.CustomConf = c.String("config")
-	}
-	routes.GlobalInit()
-	checkVersion()
-
-	m := newMacaron()
-
-	reqSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: true})
-	ignSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: setting.Service.RequireSignInView})
-	ignSignInAndCsrf := context.Toggle(&context.ToggleOptions{DisableCSRF: true})
-	reqSignOut := context.Toggle(&context.ToggleOptions{SignOutRequired: true})
-
-	bindIgnErr := binding.BindIgnErr
-
-	// FIXME: not all routes need go through same middlewares.
-	// Especially some AJAX requests, we can reduce middleware number to improve performance.
-	// Routers.
-	m.Get("/", ignSignIn, routes.Home)
-	m.Group("/explore", func() {
-		m.Get("", func(c *context.Context) {
-			c.Redirect(setting.AppSubURL + "/explore/repos")
-		})
-		m.Get("/repos", routes.ExploreRepos)
-		m.Get("/users", routes.ExploreUsers)
-		m.Get("/organizations", routes.ExploreOrganizations)
-	}, ignSignIn)
-	m.Combo("/install", routes.InstallInit).Get(routes.Install).
-		Post(bindIgnErr(form.Install{}), routes.InstallPost)
-	m.Get("/^:type(issues|pulls)$", reqSignIn, user.Issues)
-
-	// ***** START: User *****
-	m.Group("/user", func() {
-		m.Group("/login", func() {
-			m.Combo("").Get(user.Login).
-				Post(bindIgnErr(form.SignIn{}), user.LoginPost)
-			m.Combo("/two_factor").Get(user.LoginTwoFactor).Post(user.LoginTwoFactorPost)
-			m.Combo("/two_factor_recovery_code").Get(user.LoginTwoFactorRecoveryCode).Post(user.LoginTwoFactorRecoveryCodePost)
-		})
-
-		m.Get("/sign_up", user.SignUp)
-		m.Post("/sign_up", bindIgnErr(form.Register{}), user.SignUpPost)
-		m.Get("/reset_password", user.ResetPasswd)
-		m.Post("/reset_password", user.ResetPasswdPost)
-	}, reqSignOut)
-
-	m.Group("/user/settings", func() {
-		m.Get("", user.Settings)
-		m.Post("", bindIgnErr(form.UpdateProfile{}), user.SettingsPost)
-		m.Combo("/avatar").Get(user.SettingsAvatar).
-			Post(binding.MultipartForm(form.Avatar{}), user.SettingsAvatarPost)
-		m.Post("/avatar/delete", user.SettingsDeleteAvatar)
-		m.Combo("/email").Get(user.SettingsEmails).
-			Post(bindIgnErr(form.AddEmail{}), user.SettingsEmailPost)
-		m.Post("/email/delete", user.DeleteEmail)
-		m.Get("/password", user.SettingsPassword)
-		m.Post("/password", bindIgnErr(form.ChangePassword{}), user.SettingsPasswordPost)
-		m.Combo("/ssh").Get(user.SettingsSSHKeys).
-			Post(bindIgnErr(form.AddSSHKey{}), user.SettingsSSHKeysPost)
-		m.Post("/ssh/delete", user.DeleteSSHKey)
-		m.Group("/security", func() {
-			m.Get("", user.SettingsSecurity)
-			m.Combo("/two_factor_enable").Get(user.SettingsTwoFactorEnable).
-				Post(user.SettingsTwoFactorEnablePost)
-			m.Combo("/two_factor_recovery_codes").Get(user.SettingsTwoFactorRecoveryCodes).
-				Post(user.SettingsTwoFactorRecoveryCodesPost)
-			m.Post("/two_factor_disable", user.SettingsTwoFactorDisable)
-		})
-		m.Group("/repositories", func() {
-			m.Get("", user.SettingsRepos)
-			m.Post("/leave", user.SettingsLeaveRepo)
-		})
-		m.Group("/organizations", func() {
-			m.Get("", user.SettingsOrganizations)
-			m.Post("/leave", user.SettingsLeaveOrganization)
-		})
-		m.Combo("/applications").Get(user.SettingsApplications).
-			Post(bindIgnErr(form.NewAccessToken{}), user.SettingsApplicationsPost)
-		m.Post("/applications/delete", user.SettingsDeleteApplication)
-		m.Route("/delete", "GET,POST", user.SettingsDelete)
-	}, reqSignIn, func(c *context.Context) {
-		c.Data["PageIsUserSettings"] = true
-	})
-
-	m.Group("/user", func() {
-		m.Any("/activate", user.Activate)
-		m.Any("/activate_email", user.ActivateEmail)
-		m.Get("/email2user", user.Email2User)
-		m.Get("/forget_password", user.ForgotPasswd)
-		m.Post("/forget_password", user.ForgotPasswdPost)
-		m.Get("/logout", user.SignOut)
-	})
-	// ***** END: User *****
-
-	adminReq := context.Toggle(&context.ToggleOptions{SignInRequired: true, AdminRequired: true})
-
-	// ***** START: Admin *****
-	m.Group("/admin", func() {
-		m.Get("", adminReq, admin.Dashboard)
-		m.Get("/config", admin.Config)
-		m.Post("/config/test_mail", admin.SendTestMail)
-		m.Get("/monitor", admin.Monitor)
-
-		m.Group("/users", func() {
-			m.Get("", admin.Users)
-			m.Combo("/new").Get(admin.NewUser).Post(bindIgnErr(form.AdminCrateUser{}), admin.NewUserPost)
-			m.Combo("/:userid").Get(admin.EditUser).Post(bindIgnErr(form.AdminEditUser{}), admin.EditUserPost)
-			m.Post("/:userid/delete", admin.DeleteUser)
-		})
-
-		m.Group("/orgs", func() {
-			m.Get("", admin.Organizations)
-		})
-
-		m.Group("/repos", func() {
-			m.Get("", admin.Repos)
-			m.Post("/delete", admin.DeleteRepo)
-		})
-
-		m.Group("/auths", func() {
-			m.Get("", admin.Authentications)
-			m.Combo("/new").Get(admin.NewAuthSource).Post(bindIgnErr(form.Authentication{}), admin.NewAuthSourcePost)
-			m.Combo("/:authid").Get(admin.EditAuthSource).
-				Post(bindIgnErr(form.Authentication{}), admin.EditAuthSourcePost)
-			m.Post("/:authid/delete", admin.DeleteAuthSource)
-		})
-
-		m.Group("/notices", func() {
-			m.Get("", admin.Notices)
-			m.Post("/delete", admin.DeleteNotices)
-			m.Get("/empty", admin.EmptyNotices)
-		})
-	}, adminReq)
-	// ***** END: Admin *****
-
-	m.Group("", func() {
-		m.Group("/:username", func() {
-			m.Get("", user.Profile)
-			m.Get("/followers", user.Followers)
-			m.Get("/following", user.Following)
-			m.Get("/stars", user.Stars)
-		})
-
-		m.Get("/attachments/:uuid", func(c *context.Context) {
-			attach, err := models.GetAttachmentByUUID(c.Params(":uuid"))
-			if err != nil {
-				c.NotFoundOrServerError("GetAttachmentByUUID", models.IsErrAttachmentNotExist, err)
-				return
-			} else if !com.IsFile(attach.LocalPath()) {
-				c.NotFound()
-				return
-			}
-
-			fr, err := os.Open(attach.LocalPath())
-			if err != nil {
-				c.Handle(500, "Open", err)
-				return
-			}
-			defer fr.Close()
-
-			c.Header().Set("Cache-Control", "public,max-age=86400")
-			fmt.Println("attach.Name:", attach.Name)
-			c.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, attach.Name))
-			if err = repo.ServeData(c, attach.Name, fr); err != nil {
-				c.Handle(500, "ServeData", err)
-				return
-			}
-		})
-		m.Post("/issues/attachments", repo.UploadIssueAttachment)
-		m.Post("/releases/attachments", repo.UploadReleaseAttachment)
-	}, ignSignIn)
-
-	m.Group("/:username", func() {
-		m.Get("/action/:action", user.Action)
-	}, reqSignIn)
-
-	if macaron.Env == macaron.DEV {
-		m.Get("/template/*", dev.TemplatePreview)
-	}
-
-	reqRepoAdmin := context.RequireRepoAdmin()
-	reqRepoWriter := context.RequireRepoWriter()
-
-	// ***** START: Organization *****
-	m.Group("/org", func() {
-		m.Group("", func() {
-			m.Get("/create", org.Create)
-			m.Post("/create", bindIgnErr(form.CreateOrg{}), org.CreatePost)
-		}, func(c *context.Context) {
-			if !c.User.CanCreateOrganization() {
-				c.NotFound()
-			}
-		})
-
-		m.Group("/:org", func() {
-			m.Get("/dashboard", user.Dashboard)
-			m.Get("/^:type(issues|pulls)$", user.Issues)
-			m.Get("/members", org.Members)
-			m.Get("/members/action/:action", org.MembersAction)
-
-			m.Get("/teams", org.Teams)
-		}, context.OrgAssignment(true))
-
-		m.Group("/:org", func() {
-			m.Get("/teams/:team", org.TeamMembers)
-			m.Get("/teams/:team/repositories", org.TeamRepositories)
-			m.Route("/teams/:team/action/:action", "GET,POST", org.TeamsAction)
-			m.Route("/teams/:team/action/repo/:action", "GET,POST", org.TeamsRepoAction)
-		}, context.OrgAssignment(true, false, true))
-
-		m.Group("/:org", func() {
-			m.Get("/teams/new", org.NewTeam)
-			m.Post("/teams/new", bindIgnErr(form.CreateTeam{}), org.NewTeamPost)
-			m.Get("/teams/:team/edit", org.EditTeam)
-			m.Post("/teams/:team/edit", bindIgnErr(form.CreateTeam{}), org.EditTeamPost)
-			m.Post("/teams/:team/delete", org.DeleteTeam)
-
-			m.Group("/settings", func() {
-				m.Combo("").Get(org.Settings).
-					Post(bindIgnErr(form.UpdateOrgSetting{}), org.SettingsPost)
-				m.Post("/avatar", binding.MultipartForm(form.Avatar{}), org.SettingsAvatar)
-				m.Post("/avatar/delete", org.SettingsDeleteAvatar)
-
-				m.Group("/hooks", func() {
-					m.Get("", org.Webhooks)
-					m.Post("/delete", org.DeleteWebhook)
-					m.Get("/:type/new", repo.WebhooksNew)
-					m.Post("/gogs/new", bindIgnErr(form.NewWebhook{}), repo.WebHooksNewPost)
-					m.Post("/slack/new", bindIgnErr(form.NewSlackHook{}), repo.SlackHooksNewPost)
-					m.Post("/discord/new", bindIgnErr(form.NewDiscordHook{}), repo.DiscordHooksNewPost)
-					m.Post("/dingtalk/new", bindIgnErr(form.NewDingtalkHook{}), repo.DingtalkHooksNewPost)
-					m.Get("/:id", repo.WebHooksEdit)
-					m.Post("/gogs/:id", bindIgnErr(form.NewWebhook{}), repo.WebHooksEditPost)
-					m.Post("/slack/:id", bindIgnErr(form.NewSlackHook{}), repo.SlackHooksEditPost)
-					m.Post("/discord/:id", bindIgnErr(form.NewDiscordHook{}), repo.DiscordHooksEditPost)
-					m.Post("/dingtalk/:id", bindIgnErr(form.NewDingtalkHook{}), repo.DingtalkHooksEditPost)
-				})
-
-				m.Route("/delete", "GET,POST", org.SettingsDelete)
-			})
-
-			m.Route("/invitations/new", "GET,POST", org.Invitation)
-		}, context.OrgAssignment(true, true))
-	}, reqSignIn)
-	// ***** END: Organization *****
-
-	// ***** START: Repository *****
-	m.Group("/repo", func() {
-		m.Get("/create", repo.Create)
-		m.Post("/create", bindIgnErr(form.CreateRepo{}), repo.CreatePost)
-		m.Get("/migrate", repo.Migrate)
-		m.Post("/migrate", bindIgnErr(form.MigrateRepo{}), repo.MigratePost)
-		m.Combo("/fork/:repoid").Get(repo.Fork).
-			Post(bindIgnErr(form.CreateRepo{}), repo.ForkPost)
-	}, reqSignIn)
-
-	m.Group("/:username/:reponame", func() {
-		m.Group("/settings", func() {
-			m.Combo("").Get(repo.Settings).
-				Post(bindIgnErr(form.RepoSetting{}), repo.SettingsPost)
-			m.Group("/collaboration", func() {
-				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(form.ProtectBranch{}), repo.SettingsProtectedBranchPost)
-			}, func(c *context.Context) {
-				if c.Repo.Repository.IsMirror {
-					c.NotFound()
-					return
-				}
-			})
-
-			m.Group("/hooks", func() {
-				m.Get("", repo.Webhooks)
-				m.Post("/delete", repo.DeleteWebhook)
-				m.Get("/:type/new", repo.WebhooksNew)
-				m.Post("/gogs/new", bindIgnErr(form.NewWebhook{}), repo.WebHooksNewPost)
-				m.Post("/slack/new", bindIgnErr(form.NewSlackHook{}), repo.SlackHooksNewPost)
-				m.Post("/discord/new", bindIgnErr(form.NewDiscordHook{}), repo.DiscordHooksNewPost)
-				m.Post("/dingtalk/new", bindIgnErr(form.NewDingtalkHook{}), repo.DingtalkHooksNewPost)
-				m.Post("/gogs/:id", bindIgnErr(form.NewWebhook{}), repo.WebHooksEditPost)
-				m.Post("/slack/:id", bindIgnErr(form.NewSlackHook{}), repo.SlackHooksEditPost)
-				m.Post("/discord/:id", bindIgnErr(form.NewDiscordHook{}), repo.DiscordHooksEditPost)
-				m.Post("/dingtalk/:id", bindIgnErr(form.NewDingtalkHook{}), repo.DingtalkHooksEditPost)
-
-				m.Group("/:id", func() {
-					m.Get("", repo.WebHooksEdit)
-					m.Post("/test", repo.TestWebhook)
-					m.Post("/redelivery", repo.RedeliveryWebhook)
-				})
-
-				m.Group("/git", func() {
-					m.Get("", repo.SettingsGitHooks)
-					m.Combo("/:name").Get(repo.SettingsGitHooksEdit).
-						Post(repo.SettingsGitHooksEditPost)
-				}, context.GitHookService())
-			})
-
-			m.Group("/keys", func() {
-				m.Combo("").Get(repo.SettingsDeployKeys).
-					Post(bindIgnErr(form.AddSSHKey{}), repo.SettingsDeployKeysPost)
-				m.Post("/delete", repo.DeleteDeployKey)
-			})
-
-		}, func(c *context.Context) {
-			c.Data["PageIsSettings"] = true
-		})
-	}, reqSignIn, context.RepoAssignment(), reqRepoAdmin, context.RepoRef())
-
-	m.Get("/:username/:reponame/action/:action", reqSignIn, context.RepoAssignment(), repo.Action)
-	m.Group("/:username/:reponame", func() {
-		m.Get("/issues", repo.RetrieveLabels, repo.Issues)
-		m.Get("/issues/:index", repo.ViewIssue)
-		m.Get("/labels/", repo.RetrieveLabels, repo.Labels)
-		m.Get("/milestones", repo.Milestones)
-	}, ignSignIn, context.RepoAssignment(true))
-	m.Group("/:username/:reponame", func() {
-		// FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest.
-		// So they can apply their own enable/disable logic on routers.
-		m.Group("/issues", func() {
-			m.Combo("/new", repo.MustEnableIssues).Get(context.RepoRef(), repo.NewIssue).
-				Post(bindIgnErr(form.NewIssue{}), repo.NewIssuePost)
-
-			m.Group("/:index", func() {
-				m.Post("/title", repo.UpdateIssueTitle)
-				m.Post("/content", repo.UpdateIssueContent)
-				m.Combo("/comments").Post(bindIgnErr(form.CreateComment{}), repo.NewComment)
-			})
-		})
-		m.Group("/comments/:id", func() {
-			m.Post("", repo.UpdateCommentContent)
-			m.Post("/delete", repo.DeleteComment)
-		})
-	}, reqSignIn, context.RepoAssignment(true))
-	m.Group("/:username/:reponame", func() {
-		m.Group("/wiki", func() {
-			m.Get("/?:page", repo.Wiki)
-			m.Get("/_pages", repo.WikiPages)
-		}, repo.MustEnableWiki, context.RepoRef())
-	}, ignSignIn, context.RepoAssignment(false, true))
-
-	m.Group("/:username/:reponame", func() {
-		// FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest.
-		// So they can apply their own enable/disable logic on routers.
-		m.Group("/issues", func() {
-			m.Group("/:index", func() {
-				m.Post("/label", repo.UpdateIssueLabel)
-				m.Post("/milestone", repo.UpdateIssueMilestone)
-				m.Post("/assignee", repo.UpdateIssueAssignee)
-			}, reqRepoWriter)
-		})
-		m.Group("/labels", func() {
-			m.Post("/new", bindIgnErr(form.CreateLabel{}), repo.NewLabel)
-			m.Post("/edit", bindIgnErr(form.CreateLabel{}), repo.UpdateLabel)
-			m.Post("/delete", repo.DeleteLabel)
-			m.Post("/initialize", bindIgnErr(form.InitializeLabels{}), repo.InitializeLabels)
-		}, reqRepoWriter, context.RepoRef())
-		m.Group("/milestones", func() {
-			m.Combo("/new").Get(repo.NewMilestone).
-				Post(bindIgnErr(form.CreateMilestone{}), repo.NewMilestonePost)
-			m.Get("/:id/edit", repo.EditMilestone)
-			m.Post("/:id/edit", bindIgnErr(form.CreateMilestone{}), repo.EditMilestonePost)
-			m.Get("/:id/:action", repo.ChangeMilestonStatus)
-			m.Post("/delete", repo.DeleteMilestone)
-		}, reqRepoWriter, context.RepoRef())
-
-		m.Group("/releases", func() {
-			m.Get("/new", repo.NewRelease)
-			m.Post("/new", bindIgnErr(form.NewRelease{}), repo.NewReleasePost)
-			m.Post("/delete", repo.DeleteRelease)
-			m.Get("/edit/*", repo.EditRelease)
-			m.Post("/edit/*", bindIgnErr(form.EditRelease{}), repo.EditReleasePost)
-		}, repo.MustBeNotBare, reqRepoWriter, func(c *context.Context) {
-			c.Data["PageIsViewFiles"] = true
-		})
-
-		// FIXME: Should use c.Repo.PullRequest to unify template, currently we have inconsistent URL
-		// for PR in same repository. After select branch on the page, the URL contains redundant head user name.
-		// e.g. /org1/test-repo/compare/master...org1:develop
-		// which should be /org1/test-repo/compare/master...develop
-		m.Combo("/compare/*", repo.MustAllowPulls).Get(repo.CompareAndPullRequest).
-			Post(bindIgnErr(form.NewIssue{}), repo.CompareAndPullRequestPost)
-
-		m.Group("", func() {
-			m.Combo("/_edit/*").Get(repo.EditFile).
-				Post(bindIgnErr(form.EditRepoFile{}), repo.EditFilePost)
-			m.Combo("/_new/*").Get(repo.NewFile).
-				Post(bindIgnErr(form.EditRepoFile{}), repo.NewFilePost)
-			m.Post("/_preview/*", bindIgnErr(form.EditPreviewDiff{}), repo.DiffPreviewPost)
-			m.Combo("/_delete/*").Get(repo.DeleteFile).
-				Post(bindIgnErr(form.DeleteRepoFile{}), repo.DeleteFilePost)
-
-			m.Group("", func() {
-				m.Combo("/_upload/*").Get(repo.UploadFile).
-					Post(bindIgnErr(form.UploadRepoFile{}), repo.UploadFilePost)
-				m.Post("/upload-file", repo.UploadFileToServer)
-				m.Post("/upload-remove", bindIgnErr(form.RemoveUploadFile{}), repo.RemoveUploadFileFromServer)
-			}, func(c *context.Context) {
-				if !setting.Repository.Upload.Enabled {
-					c.NotFound()
-					return
-				}
-			})
-		}, repo.MustBeNotBare, reqRepoWriter, context.RepoRef(), func(c *context.Context) {
-			if !c.Repo.CanEnableEditor() {
-				c.NotFound()
-				return
-			}
-
-			c.Data["PageIsViewFiles"] = true
-		})
-	}, reqSignIn, context.RepoAssignment())
-
-	m.Group("/:username/:reponame", func() {
-		m.Group("", func() {
-			m.Get("/releases", repo.MustBeNotBare, repo.Releases)
-			m.Get("/pulls", repo.RetrieveLabels, repo.Pulls)
-			m.Get("/pulls/:index", repo.ViewPull)
-		}, context.RepoRef())
-
-		m.Group("/branches", func() {
-			m.Get("", repo.Branches)
-			m.Get("/all", repo.AllBranches)
-			m.Post("/delete/*", reqSignIn, reqRepoWriter, repo.DeleteBranchPost)
-		}, repo.MustBeNotBare, func(c *context.Context) {
-			c.Data["PageIsViewFiles"] = true
-		})
-
-		m.Group("/wiki", func() {
-			m.Group("", func() {
-				m.Combo("/_new").Get(repo.NewWiki).
-					Post(bindIgnErr(form.NewWiki{}), repo.NewWikiPost)
-				m.Combo("/:page/_edit").Get(repo.EditWiki).
-					Post(bindIgnErr(form.NewWiki{}), repo.EditWikiPost)
-				m.Post("/:page/delete", repo.DeleteWikiPagePost)
-			}, reqSignIn, reqRepoWriter)
-		}, repo.MustEnableWiki, context.RepoRef())
-
-		m.Get("/archive/*", repo.MustBeNotBare, repo.Download)
-
-		m.Group("/pulls/:index", func() {
-			m.Get("/commits", context.RepoRef(), repo.ViewPullCommits)
-			m.Get("/files", context.RepoRef(), repo.ViewPullFiles)
-			m.Post("/merge", reqRepoWriter, repo.MergePullRequest)
-		}, repo.MustAllowPulls)
-
-		m.Group("", func() {
-			m.Get("/src/*", repo.Home)
-			m.Get("/raw/*", repo.SingleDownload)
-			m.Get("/commits/*", repo.RefCommits)
-			m.Get("/commit/:sha([a-f0-9]{7,40})$", repo.Diff)
-			m.Get("/forks", repo.Forks)
-		}, repo.MustBeNotBare, context.RepoRef())
-		m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.MustBeNotBare, repo.RawDiff)
-
-		m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.MustBeNotBare, context.RepoRef(), repo.CompareDiff)
-	}, ignSignIn, context.RepoAssignment())
-	m.Group("/:username/:reponame", func() {
-		m.Get("/stars", repo.Stars)
-		m.Get("/watchers", repo.Watchers)
-	}, ignSignIn, context.RepoAssignment(), context.RepoRef())
-
-	m.Group("/:username", func() {
-		m.Get("/:reponame", ignSignIn, context.RepoAssignment(), context.RepoRef(), repo.Home)
-
-		m.Group("/:reponame", func() {
-			m.Head("/tasks/trigger", repo.TriggerTask)
-		})
-		// Use the regexp to match the repository name
-		// Duplicated routes to enable different ways of accessing same set of URLs,
-		// e.g. with or without ".git" suffix.
-		m.Group("/:reponame([\\d\\w-_\\.]+\\.git$)", func() {
-			m.Get("", ignSignIn, context.RepoAssignment(), context.RepoRef(), repo.Home)
-			m.Route("/*", "GET,POST", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP)
-		})
-		m.Route("/:reponame/*", "GET,POST", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP)
-	})
-	// ***** END: Repository *****
-
-	m.Group("/api", func() {
-		apiv1.RegisterRoutes(m)
-	}, ignSignIn)
-
-	// robots.txt
-	m.Get("/robots.txt", func(c *context.Context) {
-		if setting.HasRobotsTxt {
-			c.ServeFileContent(path.Join(setting.CustomPath, "robots.txt"))
-		} else {
-			c.NotFound()
-		}
-	})
-
-	// Not found handler.
-	m.NotFound(routes.NotFound)
-
-	// Flag for port number in case first time run conflict.
-	if c.IsSet("port") {
-		setting.AppURL = strings.Replace(setting.AppURL, setting.HTTPPort, c.String("port"), 1)
-		setting.HTTPPort = c.String("port")
-	}
-
-	var listenAddr string
-	if setting.Protocol == setting.SCHEME_UNIX_SOCKET {
-		listenAddr = fmt.Sprintf("%s", setting.HTTPAddr)
-	} else {
-		listenAddr = fmt.Sprintf("%s:%s", setting.HTTPAddr, setting.HTTPPort)
-	}
-	log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubURL)
-
-	var err error
-	switch setting.Protocol {
-	case setting.SCHEME_HTTP:
-		err = http.ListenAndServe(listenAddr, m)
-	case setting.SCHEME_HTTPS:
-		var tlsMinVersion uint16
-		switch setting.TLSMinVersion {
-		case "SSL30":
-			tlsMinVersion = tls.VersionSSL30
-		case "TLS12":
-			tlsMinVersion = tls.VersionTLS12
-		case "TLS11":
-			tlsMinVersion = tls.VersionTLS11
-		case "TLS10":
-			fallthrough
-		default:
-			tlsMinVersion = tls.VersionTLS10
-		}
-		server := &http.Server{Addr: listenAddr, TLSConfig: &tls.Config{
-			MinVersion:               tlsMinVersion,
-			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)
-	case setting.SCHEME_UNIX_SOCKET:
-		os.Remove(listenAddr)
-
-		var listener *net.UnixListener
-		listener, err = net.ListenUnix("unix", &net.UnixAddr{listenAddr, "unix"})
-		if err != nil {
-			break // Handle error after switch
-		}
-
-		// FIXME: add proper implementation of signal capture on all protocols
-		// execute this on SIGTERM or SIGINT: listener.Close()
-		if err = os.Chmod(listenAddr, os.FileMode(setting.UnixSocketPermission)); err != nil {
-			log.Fatal(4, "Failed to set permission of unix socket: %v", err)
-		}
-		err = http.Serve(listener, m)
-	default:
-		log.Fatal(4, "Invalid protocol: %s", setting.Protocol)
-	}
-
-	if err != nil {
-		log.Fatal(4, "Fail to start server: %v", err)
-	}
-
-	return nil
-}

codecov.yml

@@ -0,0 +1,9 @@
+coverage:
+  range: "60...95"
+  status:
+    project:
+      default:
+        threshold: 1%
+
+comment:
+  layout: 'diff'

conf/README.md

@@ -1,3 +0,0 @@
-Execute following command in ROOT directory when anything is changed:
-
-$ make bindata

conf/app.ini

@@ -2,51 +2,26 @@
 # !!! PLEASE MAKE CHANGES ON CORRESPONDING CUSTOM CONFIG FILE !!!
 # !!! IF YOU ARE PACKAGING PROVIDER, PLEASE MAKE OWN COPY OF IT !!!
 
-; App name that shows on every page title
-APP_NAME = Gogs
-; The name of the system user that runs Gogs
+; The brand name of the application, can be your company or team name.
+BRAND_NAME = Gogs
+; The system user who should be running the applications. It has no effect on Windows,
+; otherwise, it should match the value of $USER environment variable.
 RUN_USER = git
-; Either "dev", "prod" or "test"
+; The running mode of the application, can be either "dev", "prod" or "test".
 RUN_MODE = dev
 
 [server]
-PROTOCOL = http
+; The public-facing URL for the application.
+EXTERNAL_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
+; The public-facing domain name for the application.
 DOMAIN = localhost
-ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
+; The protocol that is used to serve direct traffic to the application.
+; Currently supports "http", "https", "fcgi" and "unix".
+PROTOCOL = http
+; The address to be listened by the application.
 HTTP_ADDR = 0.0.0.0
+; The port number to be listened by the application.
 HTTP_PORT = 3000
-; Permission for unix socket
-UNIX_SOCKET_PERMISSION = 666
-; Local (DMZ) URL for Gogs workers (such as SSH update) accessing web service.
-; In most cases you do not need to change the default value.
-; Alter it only if your SSH server node is not the same as HTTP node.
-LOCAL_ROOT_URL = %(PROTOCOL)s://%(HTTP_ADDR)s:%(HTTP_PORT)s/
-; Disable SSH feature when not available
-DISABLE_SSH = false
-; Whether use builtin SSH server or not.
-START_SSH_SERVER = false
-; Domain name to be exposed in SSH clone URL
-SSH_DOMAIN = %(DOMAIN)s
-; Port number to be exposed in SSH clone URL
-SSH_PORT = 22
-; Network interface builtin SSH server listens on
-SSH_LISTEN_HOST = 0.0.0.0
-; Port number builtin SSH server listens on
-SSH_LISTEN_PORT = %(SSH_PORT)s
-; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
-SSH_ROOT_PATH =
-; Choose the ciphers to support for SSH connections
-SSH_SERVER_CIPHERS = aes128-ctr, aes192-ctr, aes256-ctr, aes128-gcm@openssh.com, arcfour256, arcfour128
-; Directory to create temporary files when test publick key using ssh-keygen,
-; default is system temporary directory.
-SSH_KEY_TEST_PATH =
-; Path to ssh-keygen, default is 'ssh-keygen' and let shell find out which one to call.
-SSH_KEYGEN_PATH = ssh-keygen
-; Indicate whether to check minimum key size with corresponding type
-MINIMUM_KEY_SIZE_CHECK = false
-; Disable CDN even in "prod" mode
-OFFLINE_MODE = false
-DISABLE_ROUTER_LOG = false
 ; Generate steps:
 ; $ ./gogs cert -ca=true -duration=8760h0m0s -host=myhost.example.com
 ;
@@ -56,267 +31,326 @@ DISABLE_ROUTER_LOG = false
 ; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes
 CERT_FILE = custom/https/cert.pem
 KEY_FILE = custom/https/key.pem
-; Allowed TLS version values: SSL30, TLS10, TLS11, TLS12
-TLS_MIN_VERSION = TLS10
+; The minimum allowed TLS version, currently supports "TLS10", "TLS11", "TLS12", and "TLS13".
+TLS_MIN_VERSION = TLS12
+; File permission when serve traffic via Unix domain socket.
+UNIX_SOCKET_PERMISSION = 666
+; Local (DMZ) URL for workers (e.g. SSH update) accessing web service.
+; In most cases you do not need to change the default value.
+; Alter it only if your SSH server node is not the same as HTTP node.
+LOCAL_ROOT_URL = %(PROTOCOL)s://%(HTTP_ADDR)s:%(HTTP_PORT)s/
 
-; Upper level of template and static file path
-; default is the path where Gogs is executed
-STATIC_ROOT_PATH =
-; Default path for App data
-APP_DATA_PATH = data
-; Application level GZIP support
+; Whether to disable using CDN for static files regardless.
+OFFLINE_MODE = false
+; Whether to disable logging in router.
+DISABLE_ROUTER_LOG = true
+; Whether to enable application level GZIP compression.
 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
-; Enable render mode for raw file
-ENABLE_RAW_FILE_RENDER_MODE = false
+; The path for storing application specific data.
+APP_DATA_PATH = data
+; Whether to enable to load assets (i.e. "conf", "templates", "public") from disk instead of embedded bindata.
+LOAD_ASSETS_FROM_DISK = 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
+; The landing page URL for anonymous users, the value should not include
+; subpath that is handled by the reverse proxy.
+LANDING_URL = /
 
-[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
+; Whether to disable SSH access to the application entirely.
+DISABLE_SSH = false
+; The domain name to be exposed in SSH clone URL.
+SSH_DOMAIN = %(DOMAIN)s
+; The port number to be exposed in SSH clone URL.
+SSH_PORT = 22
+; The path of SSH root directory, default is "$HOME/.ssh".
+SSH_ROOT_PATH =
+; The path to ssh-keygen, default is "ssh-keygen" and let shell find out which one to call.
+SSH_KEYGEN_PATH = ssh-keygen
+; The directory to create temporary files when test a public key using ssh-keygen,
+; default is the system temporary directory.
+SSH_KEY_TEST_PATH =
+; Whether to check minimum public key size with corresponding type.
+MINIMUM_KEY_SIZE_CHECK = false
+; Whether to rewrite "~/.ssh/authorized_keys" file at start, ignored when use builtin SSH server.
+REWRITE_AUTHORIZED_KEYS_AT_START = false
+; Whether to start a builtin SSH server.
+START_SSH_SERVER = false
+; The network interface for builtin SSH server to listen on.
+SSH_LISTEN_HOST = 0.0.0.0
+; The port number for builtin SSH server to listen on.
+SSH_LISTEN_PORT = %(SSH_PORT)s
+; The list of accepted ciphers for connections to builtin SSH server.
+SSH_SERVER_CIPHERS = aes128-ctr, aes192-ctr, aes256-ctr, aes128-gcm@openssh.com, arcfour256, arcfour128
 
-; Attachment settings for releases
-[release.attachment]
-; Whether attachments are enabled. Defaults to `true`
-ENABLED = true
-; Path for attachments. Defaults to `data/attachments`
-PATH = data/attachments
-; One or more allowed types, e.g. image/jpeg|image/png
-ALLOWED_TYPES = */*
-; Max size of each file. Defaults to 32MB
-MAX_SIZE = 32
-; Max number of files per upload. Defaults to 10
-MAX_FILES = 10
-
-[markdown]
-; Enable hard line break extension
-ENABLE_HARD_LINE_BREAK = false
-; 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
-
-[smartypants]
-ENABLED = false
-FRACTIONS = true
-DASHES = true
-LATEX_DASHES = true
-ANGLED_QUOTES = true
-
-[http]
-; Value for Access-Control-Allow-Origin header, default is not to present
-ACCESS_CONTROL_ALLOW_ORIGIN =
-
-; Define allowed algorithms and their minimum key length (use -1 to disable a type)
+; Define allowed algorithms and their minimum key length (use -1 to disable a type).
 [ssh.minimum_key_sizes]
 ED25519 = 256
 ECDSA   = 256
 RSA     = 2048
 DSA     = 1024
 
-[database]
-; Either "mysql", "postgres" or "sqlite3", you can connect to TiDB with MySQL protocol
-DB_TYPE = mysql
-HOST = 127.0.0.1:3306
-NAME = gogs
-USER = root
-PASSWD =
-; For "postgres" only, either "disable", "require" or "verify-full"
-SSL_MODE = disable
-; For "sqlite3" and "tidb", use absolute path when you start as service
-PATH = data/gogs.db
+[repository]
+; The root path for storing managed repositories, default is "~/gogs-repositories"
+ROOT =
+; The script type server supports, sometimes could be "sh".
+SCRIPT_TYPE = bash
+; Default ANSI charset for an unrecognized charset.
+ANSI_CHARSET =
+; Whether to force every new repository to be private.
+FORCE_PRIVATE = false
+; The global limit of number of repositories a user can create, -1 means no limit.
+MAX_CREATION_LIMIT = -1
+; 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
+; Whether to disable Git interaction with repositories via HTTP/HTTPS protocol.
+DISABLE_HTTP_GIT = false
+; Whether to enable ability to migrate repository by server local path.
+ENABLE_LOCAL_PATH_MIGRATION = false
+; Whether to enable render mode for raw file. There are potential security risks.
+ENABLE_RAW_FILE_RENDER_MODE = false
+; The maximum number of goroutines that can be run at the same time for a single
+; fetch request. Usually, the value depend of how many CPU (cores) you have. If
+; the value is non-positive, it matches the number of CPUs available to the application.
+COMMITS_FETCH_CONCURRENCY = 0
 
-[admin]
-; Disable regular (non-admin) users to create organizations
-DISABLE_REGULAR_ORG_CREATION = false
+[repository.editor]
+; List of file extensions that should have line wraps in the CodeMirror editor.
+; Separate extensions with 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
 
-[security]
-INSTALL_LOCK = false
-; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!!
-SECRET_KEY = !#@FDEWREWR&*(
-; Auto-login remember days
-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
-; Enable to set cookie to indicate user login status
-ENABLE_LOGIN_STATUS_COOKIE = false
-LOGIN_STATUS_COOKIE_NAME = login_status
-
-[service]
-ACTIVE_CODE_LIVE_MINUTES = 180
-RESET_PASSWD_CODE_LIVE_MINUTES = 180
-; User need to confirm e-mail for registration
-REGISTER_EMAIL_CONFIRM = false
-; Does not allow register and admin create account only
-DISABLE_REGISTRATION = false
-; User must sign in to view anything.
-REQUIRE_SIGNIN_VIEW = false
-; Mail notification
-ENABLE_NOTIFY_MAIL = false
-; More detail: https://github.com/gogits/gogs/issues/165
-ENABLE_REVERSE_PROXY_AUTHENTICATION = false
-ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
-; Enable captcha validation for registration
-ENABLE_CAPTCHA = true
-
-[webhook]
-; Types are enabled for users to use, can be "gogs", "slack", "discord", "dingtalk"
-TYPES = gogs, slack, discord, dingtalk
-; Hook task queue length, increase if webhook shooting starts hanging
-QUEUE_LENGTH = 1000
-; Deliver timeout in seconds
-DELIVER_TIMEOUT = 15
-; Allow insecure certification
-SKIP_TLS_VERIFY = false
-; Number of history information in each page
-PAGING_NUM = 10
-
-[mailer]
-ENABLED = false
-; Buffer length of channel, keep it as it is if you don't know what it is.
-SEND_BUFFER_LEN = 100
-; Name displayed in mail title
-SUBJECT = %(APP_NAME)s
-; Mail server
-; Gmail: smtp.gmail.com:587
-; QQ: smtp.qq.com:465
-; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used.
-HOST =
-; Disable HELO operation when hostname are different.
-DISABLE_HELO =
-; Custom hostname for HELO operation, default is from system.
-HELO_HOSTNAME =
-; Do not verify the certificate of the server. Only use this for self-signed certificates
-SKIP_VERIFY =
-; Use client certificate
-USE_CERTIFICATE = false
-CERT_FILE = custom/mailer/cert.pem
-KEY_FILE = custom/mailer/key.pem
-; Mail from address, RFC 5322. This can be just an email address, or the `"Name" <email@example.com>` format
-FROM =
-; Mailer user name and password
-USER =
-PASSWD =
-; Use text/plain as format of content
-USE_PLAIN_TEXT = false
-
-[cache]
-; Either "memory", "redis", or "memcache", default is "memory"
-ADAPTER = memory
-; For "memory" only, GC interval in seconds, default is 60
-INTERVAL = 60
-; For "redis" and "memcache", connection host address
-; redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
-; memcache: `127.0.0.1:11211`
-HOST =
-
-[session]
-; Either "memory", "file", or "redis", default is "memory"
-PROVIDER = memory
-; Provider config options
-; memory: not have any config yet
-; file: session file path, e.g. `data/sessions`
-; redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
-; mysql: go-sql-driver/mysql dsn config string, e.g. `root:password@/session_table`
-PROVIDER_CONFIG = data/sessions
-; Session cookie name
-COOKIE_NAME = i_like_gogits
-; If you use session in https only, default is false
-COOKIE_SECURE = false
-; Enable set cookie, default is true
-ENABLE_SET_COOKIE = true
-; Session GC time interval, default is 3600
-GC_INTERVAL_TIME = 3600
-; Session life time, default is 86400
-SESSION_LIFE_TIME = 86400
-; Cookie name for CSRF
-CSRF_COOKIE_NAME = _csrf
-
-[picture]
-; Path to store user uploaded avatars
-AVATAR_UPLOAD_PATH = data/avatars
-; Chinese users can choose "duoshuo"
-; or a custom avatar source, like: http://cn.gravatar.com/avatar/
-GRAVATAR_SOURCE = gravatar
-; This value will be forced to be true in offline mode.
-DISABLE_GRAVATAR = false
-; Federated avatar lookup uses DNS to discover avatar associated
-; with emails, see https://www.libravatar.org
-; This value will be forced to be false in offline mode or Gravatar is disbaled.
-ENABLE_FEDERATED_AVATAR = true
-
-; Attachment settings for issues
-[attachment]
-; Whether attachments are enabled. Defaults to `true`
+[repository.upload]
+; Whether to enable repository file uploads.
 ENABLED = true
-; Path for attachments. Defaults to `data/attachments`
-PATH = data/attachments
-; One or more allowed types, e.g. image/jpeg|image/png
-ALLOWED_TYPES = image/jpeg|image/png
-; Max size of each file. Defaults to 4MB
-MAX_SIZE = 4
-; Max number of files per upload. Defaults to 5
+; The path to temporarily store uploads (content under this path gets wiped out on every start).
+TEMP_PATH = data/tmp/uploads
+; File types that are allowed to be uploaded, e.g. "image/jpeg|image/png". Leave empty to allow any file type.
+ALLOWED_TYPES =
+; The maximum size of each file in MB.
+FILE_MAX_SIZE = 3
+; The maximum number of files per upload.
 MAX_FILES = 5
 
-[time]
-; Specifies the format for fully outputed dates. Defaults to RFC1123
-; Special supported values are ANSIC, UnixDate, RubyDate, RFC822, RFC822Z, RFC850, RFC1123, RFC1123Z, RFC3339, RFC3339Nano, Kitchen, Stamp, StampMilli, StampMicro and StampNano
-; For more information about the format see http://golang.org/pkg/time/#pkg-constants
-FORMAT =
+[database]
+; The database backend, either "postgres", "mysql" "sqlite3" or "mssql".
+; You can connect to TiDB with MySQL protocol.
+TYPE = postgres
+HOST = 127.0.0.1:5432
+NAME = gogs
+USER = gogs
+PASSWORD =
+; For "postgres" only, either "disable", "require" or "verify-full".
+SSL_MODE = disable
+; For "sqlite3" only, make sure to use absolute path.
+PATH = data/gogs.db
+; The maximum open connections of the pool.
+MAX_OPEN_CONNS = 30
+; The maximum idle connections of the pool.
+MAX_IDLE_CONNS = 30
 
-; General settings of loggers
+[security]
+; Whether to show the install page, set this to "true" to bypass it.
+INSTALL_LOCK = false
+; The secret to encrypt cookie values, 2FA code, etc.
+; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!!
+SECRET_KEY = !#@FDEWREWR&*(
+; The days remembered for auto-login.
+LOGIN_REMEMBER_DAYS = 7
+; The cookie name to store auto-login information.
+COOKIE_REMEMBER_NAME = gogs_incredible
+; The cookie name to store logged in username.
+COOKIE_USERNAME = gogs_awesome
+; Whether to set secure cookie.
+COOKIE_SECURE = false
+; Whether to set cookie to indicate user login status.
+ENABLE_LOGIN_STATUS_COOKIE = false
+; The cookie name to store user login status.
+LOGIN_STATUS_COOKIE_NAME = login_status
+; A comma separated list of hostnames that are explicitly allowed to be accessed within the local network.
+LOCAL_NETWORK_ALLOWLIST =
+
+[email]
+; Whether to enable the email service.
+ENABLED = false
+; The prefix prepended to the subject line.
+SUBJECT_PREFIX = `[%(BRAND_NAME)s] `
+; The SMTP server with its port, e.g. smtp.mailgun.org:587, smtp.gmail.com:587, smtp.qq.com:465
+; If the port ends is "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409.
+; If the server supports STARTTLS it will always be used.
+HOST = smtp.mailgun.org:587
+; The email from address (RFC 5322). This can be just an email address, or the `"Name" <email@example.com>` format.
+FROM = noreply@gogs.localhost
+; The login user.
+USER = noreply@gogs.localhost
+; The login password.
+PASSWORD =
+
+; Whether to disable HELO operation when the hostname is different.
+DISABLE_HELO =
+; The custom hostname for HELO operation, default is from system.
+HELO_HOSTNAME =
+
+; Whether to skip verifying the certificate of the server. Only use this for self-signed certificates.
+SKIP_VERIFY = false
+; Whether to use client certificates.
+USE_CERTIFICATE = false
+CERT_FILE = custom/email/cert.pem
+KEY_FILE = custom/email/key.pem
+
+; Whether to use "text/plain" as content format.
+USE_PLAIN_TEXT = false
+; Whether to attach a plaintext alternative to the MIME message while sending HTML emails.
+; It is used to support older mail clients and make spam filters happier.
+ADD_PLAIN_TEXT_ALT = false
+
+[auth]
+; The valid duration of activate code in minutes.
+ACTIVATE_CODE_LIVES = 180
+; The valid duration of reset password code in minutes.
+RESET_PASSWORD_CODE_LIVES = 180
+; Whether to require email confirmation for adding new email addresses.
+; Enable this option will also require user to confirm the email for registration.
+REQUIRE_EMAIL_CONFIRMATION = false
+; Whether to disallow anonymous users visiting the site.
+REQUIRE_SIGNIN_VIEW = false
+; Whether to disable self-registration. When disabled, accounts would have to be created by admins.
+DISABLE_REGISTRATION = false
+; Whether to enable captcha validation for registration
+ENABLE_REGISTRATION_CAPTCHA = true
+
+; Whether to enable reverse proxy authentication via HTTP header.
+ENABLE_REVERSE_PROXY_AUTHENTICATION = false
+; Whether to automatically create new users for reverse proxy authentication.
+ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
+; The HTTP header used as username for reverse proxy authentication.
+REVERSE_PROXY_AUTHENTICATION_HEADER = X-WEBAUTH-USER
+
+[user]
+; Whether to enable email notifications for users.
+ENABLE_EMAIL_NOTIFICATION = false
+
+[session]
+; The session provider, either "memory", "file", or "redis".
+PROVIDER = memory
+; The configuration for respective provider:
+; - memory: does not need any config yet
+; - file: session file path, e.g. `data/sessions`
+; - redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
+PROVIDER_CONFIG = data/sessions
+; The cookie name to store the session identifier.
+COOKIE_NAME = i_like_gogs
+; Whether to set cookie in HTTPS only.
+COOKIE_SECURE = false
+; The GC interval in seconds for session data.
+GC_INTERVAL = 3600
+; The maximum life time in seconds for a session.
+MAX_LIFE_TIME = 86400
+; The cookie name for CSRF token.
+CSRF_COOKIE_NAME = _csrf
+
+[cache]
+; The cache adapter, either "memory", "redis", or "memcache".
+ADAPTER = memory
+; For "memory" only, GC interval in seconds.
+INTERVAL = 60
+; For "redis" and "memcache", connection host address:
+; - redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
+; - memcache: `127.0.0.1:11211`
+HOST =
+
+[http]
+; The value for "Access-Control-Allow-Origin" header, default is not to present.
+ACCESS_CONTROL_ALLOW_ORIGIN =
+
+[lfs]
+; The storage backend for uploading new objects.
+STORAGE = local
+; The root path to store LFS objects on local file system.
+OBJECTS_PATH = data/lfs-objects
+
+[attachment]
+; Whether to enabled upload attachments in general.
+ENABLED = true
+; The path to store attachments on the file system.
+PATH = data/attachments
+; File types that are allowed to be uploaded, e.g. "image/jpeg|image/png". Leave empty to allow any file type.
+ALLOWED_TYPES = image/jpeg|image/png
+; The maximum size of each file in MB.
+MAX_SIZE = 4
+; The maximum number of files per upload.
+MAX_FILES = 5
+
+[release.attachment]
+; Whether to enabled upload attachments for releases.
+ENABLED = true
+; File types that are allowed to be uploaded, e.g. "image/jpeg|image/png". Leave empty to allow any file type.
+ALLOWED_TYPES = */*
+; The maximum size of each file in MB.
+MAX_SIZE = 32
+; The maximum number of files per upload.
+MAX_FILES = 10
+
+[time]
+; Specifies the format for fully outputed dates.
+; Values should be one of the following:
+; ANSIC, UnixDate, RubyDate, RFC822, RFC822Z, RFC850, RFC1123, RFC1123Z, RFC3339, RFC3339Nano, Kitchen, Stamp, StampMilli, StampMicro and StampNano.
+; For more information about the format see http://golang.org/pkg/time/#pkg-constants.
+FORMAT = RFC1123
+
+[picture]
+; The path to store user avatars on the file system.
+AVATAR_UPLOAD_PATH = data/avatars
+; The path to store repository avatars on the file system.
+REPOSITORY_AVATAR_UPLOAD_PATH = data/repo-avatars
+; Chinese users can use a custom avatar source, such as http://cn.gravatar.com/avatar/.
+GRAVATAR_SOURCE = gravatar
+; Whether to disable Gravatar, this value will be forced to be true in offline mode.
+DISABLE_GRAVATAR = false
+; Whether to enable federated avatar lookup uses DNS to discover avatar associated
+; with emails, see https://www.libravatar.org for details.
+; This value will be forced to be false in offline mode or when Gravatar is disabled.
+ENABLE_FEDERATED_AVATAR = false
+
+[markdown]
+; Whether to enable hard line break extension.
+ENABLE_HARD_LINE_BREAK = false
+; The list of custom URL schemes that are allowed as links when rendering Markdown.
+; For example, "git" (for "git://") and "magnet" (for "magnet://").
+CUSTOM_URL_SCHEMES =
+; The list of file extensions that should be rendered/edited as Markdown.
+; Separate extensions with a comma. To render files with no extension as markdown, just put a comma.
+FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
+
+[smartypants]
+; Whether to enable the Smartypants extension.
+ENABLED = false
+FRACTIONS = true
+DASHES = true
+LATEX_DASHES = true
+ANGLED_QUOTES = true
+
+[admin]
+; Whether to disable regular (non-admin) users to create organizations.
+DISABLE_REGULAR_ORG_CREATION = false
+
+[webhook]
+; The list of enabled types for users to use, can be "gogs", "slack", "discord", "dingtalk".
+TYPES = gogs, slack, discord, dingtalk
+; Deliver timeout in seconds.
+DELIVER_TIMEOUT = 15
+; Whether to allow insecure certification.
+SKIP_TLS_VERIFY = false
+; The number of history information in each page.
+PAGING_NUM = 10
+
+; General settings of loggers.
 [log]
+; The root path for all log files, default is "log/" subdirectory.
 ROOT_PATH =
-; Can be "console" and "file", default is "console"
+; Can be "console", "file", "slack" and "discord".
 ; Use comma to separate multiple modes, e.g. "console, file"
 MODE = console
 ; Buffer length of channel, keep it as it is if you don't know what it is.
@@ -326,31 +360,39 @@ LEVEL = Trace
 
 ; For "console" mode only
 [log.console]
-; leave empty to inherit
-LEVEL =
+; Comment out to inherit
+; LEVEL =
 
 ; For "file" mode only
 [log.file]
-; leave empty to inherit
-LEVEL =
-; This enables automated log rotate (switch of following options)
+; Comment out to inherit
+; LEVEL =
+; Whether to enable automated log rotate (switch of following options).
 LOG_ROTATE = true
-; Segment log daily
+; Whether to segment log files daily.
 DAILY_ROTATE = true
-; Max size shift of single file, default is 28 means 1 << 28, 256MB
+; The maximum size shift of single file, default is 28 means 1 << 28 = 256MB.
 MAX_SIZE_SHIFT = 28
-; Max line number of single file
+; The maximum number of lines of single file.
 MAX_LINES = 1000000
-; Expired days of log file (delete after max days)
+; The expired days of log file (delete after max days).
 MAX_DAYS = 7
 
 ; For "slack" mode only
 [log.slack]
-; leave empty to inherit
-LEVEL =
+; Comment out to inherit
+; LEVEL =
 ; Webhook URL
 URL =
 
+[log.discord]
+; Comment out to inherit
+; LEVEL =
+; Webhook URL
+URL =
+; The username to be displayed in notification.
+USERNAME = %(BRAND_NAME)s
+
 [log.xorm]
 ; Enable file rotation
 ROTATE = true
@@ -361,14 +403,24 @@ MAX_SIZE = 100
 ; Maximum days to keep logger files
 MAX_DAYS = 3
 
+[log.gorm]
+; Whether to enable file rotation.
+ROTATE = true
+; Whether to rotate file every day.
+ROTATE_DAILY = true
+; The maximum file size in MB before next rotate.
+MAX_SIZE = 100
+; The maximum days to keep files.
+MAX_DAYS = 3
+
 [cron]
 ; Enable running cron tasks periodically.
 ENABLED = true
 ; Run cron tasks when Gogs starts.
 RUN_AT_START = false
 
-; Update mirrors
 [cron.update_mirrors]
+; Defines how often the mirror syncer checks if any mirror needs to be synchronized (based on the mirror update interval).
 SCHEDULE = @every 10m
 
 ; Repository health check
@@ -394,12 +446,12 @@ OLDER_THAN = 24h
 [git]
 ; Disables highlight of added and removed changes
 DISABLE_DIFF_HIGHLIGHT = false
+; Max number of files shown in diff view
+MAX_GIT_DIFF_FILES = 100
 ; Max number of lines allowed of a single file in diff view
 MAX_GIT_DIFF_LINES = 1000
 ; Max number of characters of a line allowed in diff view
-MAX_GIT_DIFF_LINE_CHARACTERS = 500
-; Max number of files shown in diff view
-MAX_GIT_DIFF_FILES = 100
+MAX_GIT_DIFF_LINE_CHARACTERS = 2000
 ; Arguments for command 'git gc', e.g. "--aggressive --auto"
 ; see more on http://git-scm.com/docs/git-gc/1.7.5
 GC_ARGS =
@@ -413,7 +465,8 @@ PULL = 300
 GC = 60
 
 [mirror]
-; Default interval in hours between each check
+; Defines the default interval (in hours) until the next sync for a mirror (after a successful mirror sync).
+; It can be overridden individually for each mirror repository in the settings.
 DEFAULT_INTERVAL = 8
 
 [api]
@@ -452,9 +505,23 @@ NEWS_FEED_PAGING_NUM = 20
 ; Number of commits that are showed in one page
 COMMITS_PAGING_NUM = 30
 
+[prometheus]
+; Whether to enable Prometheus metrics.
+ENABLED = true
+; Whether to enable HTTP Basic Authentication to protect metrics data.
+ENABLE_BASIC_AUTH = false
+; The username for HTTP Basic Authentication.
+BASIC_AUTH_USERNAME =
+; The password for HTTP Basic Authentication.
+BASIC_AUTH_PASSWORD =
+
+; Extension mapping to highlight class
+; e.g. .toml=ini
+[highlight.mapping]
+
 [i18n]
-LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR,gl-ES,uk-UA,en-GB,hu-HU,sk-SK
-NAMES = English,简体中文,繁體中文（香港）,繁體中文（臺灣）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어,galego,українська,English (United Kingdom),Magyar,slovenský
+LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR,gl-ES,uk-UA,en-GB,hu-HU,sk-SK,id-ID,fa-IR,vi-VN,pt-PT
+NAMES = English,简体中文,繁體中文（香港）,繁體中文（臺灣）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어,galego,українська,English (United Kingdom),Magyar,Slovenčina,Indonesian,Persian,Vietnamese,Português
 
 ; Used for datetimepicker
 [i18n.datelang]
@@ -481,14 +548,15 @@ sv-SE = sv
 ko-KR = ko
 gl-ES = gl
 uk-UA = uk
-
-; Extension mapping to highlight class
-; e.g. .toml=ini
-[highlight.mapping]
+en-GB = en-GB
+hu-HU = hu
+sk-SK = sk
+id-ID = id
+fa-IR = fa
+vi-VN = vi
+pt-PT = pt
 
 [other]
 SHOW_FOOTER_BRANDING = false
-; Show version information about Gogs and Go in the footer
-SHOW_FOOTER_VERSION = true
 ; Show time of template execution in the footer
 SHOW_FOOTER_TEMPLATE_LOAD_TIME = true

conf/auth.d/github.conf.example

@@ -0,0 +1,10 @@
+# This is an example of GitHub authentication
+#
+id           = 105
+type         = github
+name         = GitHub
+is_activated = true
+
+[config]
+api_endpoint = https://api.github.com/
+

conf/auth.d/ldap_bind_dn.conf.example

@@ -0,0 +1,29 @@
+# This is an example of LDAP (BindDN) authentication
+#
+id           = 101
+type         = ldap_bind_dn
+name         = LDAP BindDN
+is_activated = true
+
+[config]
+host               = mydomain.com
+port               = 636
+# 0 - Unencrypted, 1 - LDAPS, 2 - StartTLS
+security_protocol  = 0
+skip_verify        = false
+bind_dn            = 
+bind_password      = 
+user_base          = ou=Users,dc=mydomain,dc=com
+attribute_username = 
+attribute_name     = 
+attribute_surname  = 
+attribute_mail     = mail
+attributes_in_bind = false
+filter             = (&(objectClass=posixAccount)(cn=%s))
+admin_filter       = 
+group_enabled      = false
+group_dn           = 
+group_filter       = 
+group_member_uid   = 
+user_uid           = 
+

conf/auth.d/ldap_simple_auth.conf.example

@@ -0,0 +1,30 @@
+# This is an example of LDAP (simple auth) authentication
+#
+id           = 102
+type         = ldap_simple_auth
+name         = LDAP Simple Auth
+is_activated = true
+
+[config]
+host               = mydomain.com
+port               = 636
+# 0 - Unencrypted, 1 - LDAPS, 2 - StartTLS
+security_protocol  = 0
+skip_verify        = false
+bind_dn            = 
+bind_password      = 
+user_base          = 
+user_dn            = cn=%s,ou=Users,dc=mydomain,dc=com
+attribute_username = 
+attribute_name     = 
+attribute_surname  = 
+attribute_mail     = mail
+attributes_in_bind = false
+filter             = (&(objectClass=posixAccount)(cn=%s))
+admin_filter       = 
+group_enabled      = false
+group_dn           = 
+group_filter       = 
+group_member_uid   = 
+user_uid           = 
+

conf/auth.d/pam.conf.example

@@ -0,0 +1,10 @@
+# This is an example of PAM authentication
+#
+id           = 104
+type         = pam
+name         = System Auth
+is_activated = true
+
+[config]
+service_name = system-auth
+

conf/auth.d/smtp.conf.example

@@ -0,0 +1,16 @@
+# This is an example of SMTP authentication
+#
+id           = 103
+type         = smtp
+name         = GMail
+is_activated = true
+
+[config]
+# Either "PLAIN" or "LOGIN"
+auth            = PLAIN
+host            = smtp.gmail.com
+port            = 587
+allowed_domains = 
+tls             = true
+skip_verify     = false
+

conf/gitignore/PhpStorm

@@ -0,0 +1,63 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Ruby plugin and RubyMine
+/.rakeTasks
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### PhpStorm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint

conf/gitignore/UnrealEngine

@@ -0,0 +1,76 @@
+# Visual Studio 2015 user specific files
+.vs/
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# These project files can be generated by the engine
+*.xcodeproj
+*.xcworkspace
+*.sln
+*.suo
+*.opensdf
+*.sdf
+*.VC.db
+*.VC.opendb
+
+# Precompiled Assets
+SourceArt/**/*.png
+SourceArt/**/*.tga
+
+# Binary Files
+Binaries/*
+Plugins/*/Binaries/*
+
+# Builds
+Build/*
+
+# Whitelist PakBlacklist-<BuildConfiguration>.txt files
+!Build/*/
+Build/*/**
+!Build/*/PakBlacklist*.txt
+
+# Don't ignore icon files in Build
+!Build/**/*.ico
+
+# Built data for maps
+*_BuiltData.uasset
+
+# Configuration files generated by the Editor
+Saved/*
+
+# Compiled source files for the engine to use
+Intermediate/*
+Plugins/*/Intermediate/*
+
+# Cache files for the editor to use
+DerivedDataCache/*
+
+

conf/gitignore/WebStorm

@@ -0,0 +1,63 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Ruby plugin and RubyMine
+/.rakeTasks
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### WebStorm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint

conf/locale/TRANSLATORS

@@ -21,6 +21,7 @@ Barış Arda Yılmaz <ardayilmazgamer AT gmail DOT com>
 Bo-Yi Wu <appleboy DOT tw AT gmail DOT com>
 Breton Corentin <contact AT neodarz DOT net>
 Camille Baronnet <gogs AT camillebaronnet DOT fr>
+Changwoo Ryu <cwryu AT debian DOT org>
 Christoph Kisfeld <christoph DOT kisfeld AT gmail DOT com>
 Cysioland
 Damaris Padieu <damizx AT hotmail DOT fr>
@@ -31,6 +32,7 @@ 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>
+Flávio Monteiro <flaviomonteiro2013 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>
@@ -54,6 +56,7 @@ 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>
+Mathias Rangel Wulff <m AT rawu DOT dk>
 Michael Härtl <haertl DOT mike AT gmail DOT com>
 Miguel de la Cruz <miguel AT mcrx DOT me>
 Mikhail Burdin <xdshot9000 AT gmail DOT com>

conf/locale/locale_bg-BG.ini

@@ -9,7 +9,6 @@ sign_out=Изход
 sign_up=Регистрирайте се
 register=Регистрация
 website=Уебсайт
-version=Версия
 page=Страница
 template=Шаблон
 language=Език
@@ -44,6 +43,10 @@ issues=Задачи
 
 cancel=Отказ
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Инсталация
 title=Стъпки за инсталиране при първоначално стартиране
@@ -107,7 +110,7 @@ enable_captcha=Включи Captcha
 enable_captcha_popup=Изисква валидиране с captcha при саморегистрация на потребители.
 require_sign_in_view=Включи задължително вписване за преглед на страници
 require_sign_in_view_popup=Само вписани потребители могат да виждат страниците, анонимните посетители виждат само страниците за регистрация и вход.
-admin_setting_desc=Няма нужда от създаване на администраторски профил в момента, защото потребителят с първо ID в базата автоматично получава администраторски достъп.
+admin_setting_desc=Няма нужда да създавате администраторски профил в момента, защото потребителят с първо ID в базата автоматично получава администраторски достъп.
 admin_title=Настройки на профил на администратора
 admin_name=Потребителско име
 admin_password=Парола
@@ -122,6 +125,7 @@ run_user_not_match=Потребителският контекст на прил
 smtp_host_missing_port=Липсва порт в зададения SMTP адрес.
 invalid_smtp_from=Невалидно поле От: %v
 save_config_failed=Неуспешно запазване на конфигурация: %v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=Настройките на профил на администратора са невалидни: %v
 install_success=Добре дошли! Радваме се, че избрахте Gogs, и Ви пожелаваме приятна работа и сърдечни поздрави!
 invalid_log_root_path=Основният път към журналите е невалиден: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Вече имате профил? Впишете се сег
 social_register_hepler_msg=Вече имате профил? Свържете се сега!
 disable_register_prompt=За съжаление създаването на нови регистрации е изключено. Обърнете се към администратора на сайта.
 disable_register_mail=За съжаление потвърждението на регистрации е изключено.
+auth_source=Authentication Source
+local=Local
 remember_me=Запомни ме
 forgot_password=Забравена парола
 forget_password=Забравена парола?
@@ -169,11 +175,11 @@ reset_password_helper=Щракнете тук, за да нулирате пар
 password_too_short=Размерът на паролата не може да бъде по-малък от 6 знака.
 non_local_account=Нелокални потребители не могат да сменят паролата си през Gogs.
 
-login_two_factor=Two-factor Authentication
+login_two_factor=Двуфакторно удостоверяване
 login_two_factor_passcode=Парола за удостоверяване
 login_two_factor_enter_recovery_code=Enter a two-factor recovery code
 login_two_factor_recovery=Two-factor Recovery
-login_two_factor_recovery_code=Recovery Code
+login_two_factor_recovery_code=Код за възстановяване
 login_two_factor_enter_passcode=Enter a two-factor passcode
 login_two_factor_invalid_recovery_code=Този код за възстановяване вече е бил използван или не е валиден.
 
@@ -212,7 +218,7 @@ Content=Съдържание
 require_error=` не може да бъде празен.`
 alpha_dash_error=` трябва да e валидна буква, число или тире(-_).`
 alpha_dash_dot_error=` трябва да e валидна буква, число, тире(-_) или точка.`
-alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
+alpha_dash_dot_slash_error=` must be alphanumeric, dash (-_), dot or slash characters.`
 size_error=` трябва да е с размер %s.`
 min_size_error=` трябва да съдържа поне %s знака.`
 max_size_error=` трябва да съдържа най-много %s знака.`
@@ -229,6 +235,7 @@ org_name_been_taken=Името на организацията вече се п
 team_name_been_taken=Името на екипа вече се ползва.
 email_been_used=Този адрес на ел. поща вече се ползва.
 username_password_incorrect=Потребителското име или паролата не са верни.
+auth_source_mismatch=The authentication source selected is not associated with the user.
 enterred_invalid_repo_name=Моля уверете се, че въведеното име на хранилище е вярно.
 enterred_invalid_owner_name=Моля уверете се, че въведеното име на притежател е вярно.
 enterred_invalid_password=Моля уверете се, че въведената парола е вярна.
@@ -246,7 +253,7 @@ org_still_own_repo=Тази организация все още притежа
 target_branch_not_exist=Целевият клон не съществува.
 
 [user]
-change_avatar=Проми своя аватар
+change_avatar=Промени своя аватар
 join_on=Регистриран
 repositories=Хранилища
 activity=Публична дейност
@@ -256,8 +263,7 @@ following=Следване
 follow=Следване
 unfollow=Не следвай
 
-form.name_reserved=Потребителското име '%s' е запазено.
-form.name_pattern_not_allowed=Потребителското име '%s' не е допустимо.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Профил
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Or enter the secret:
 two_factor_then_enter_passcode=След това въведете паролата:
 two_factor_verify=Потвърждаване
 two_factor_invalid_passcode=Въведената парола е невалидна! Моля опитайте отново.
+two_factor_reused_passcode=The passcode you entered has already been used, please try another one!
 two_factor_enable_error=Enable Two-factor authentication failed: %v
 two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
 two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
@@ -370,6 +377,7 @@ delete_token=Изтрий
 access_token_deletion=Изтрий индивидуален API ключ за достъп
 access_token_deletion_desc=При изтриване на този индивидуален API ключ за достъп ще се премахнат всички свързани права на приложението. Желаете ли да продължите?
 delete_token_success=Индивидуалният API ключ за достъп е изтрит успешно! Не забравяйте да преконфигурирате приложението също.
+token_name_exists=Token with same name already exists.
 
 orgs.none=Не сте член на никоя организация.
 orgs.leave_title=Напусни организация
@@ -417,10 +425,11 @@ mirror_last_synced=Последна синхр.
 watchers=Наблюдаващи
 stargazers=Харесващи
 forks=Разклонения
+repo_description_helper=Description of repository. Maximum 512 characters length.
+repo_description_length=Available characters
 
 form.reach_limit_of_creation=Притежателят е достигнал настроения лимит от %d брой хранилища.
-form.name_reserved=Името на хранилището '%s' е запазено.
-form.name_pattern_not_allowed=Име на хранилището от вида '%s' не е позволено.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Изисква потребител и парола
 migrate_type=Тип мигриране
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Съдържанието на файла е б
 editor.file_already_exists=Файл с име '%s' вече съществува в това хранилище.
 editor.no_changes_to_show=Няма промени.
 editor.fail_to_update_file=Невъзможно модифициране/създаване на файл '%s' заради грешка: %v
+editor.fail_to_delete_file=Failed to delete file '%s' with error: %v
 editor.add_subdir=Добави поддиректория...
 editor.unable_to_upload_files=Невъзможно качване на файлове в '%s' заради грешка: %v
 editor.upload_files_to_dir=Качи файлове в '%s'
@@ -634,6 +644,7 @@ pulls.cannot_auto_merge_desc=Не може да се извърши обедин
 pulls.cannot_auto_merge_helper=Моля, използвайте инструменти на командния ред за да разрешите конфликтите.
 pulls.create_merge_commit=Create a merge commit
 pulls.rebase_before_merging=Rebase before merging
+pulls.commit_description=Commit Description
 pulls.merge_pull_request=Обедини заявка за сливане
 pulls.open_unmerged_pull_exists=`Невъзможно повторно отваряне, защото вече съществува заявка за сливане (#%d) от същото хранилище със същата информация за обединяване, която чака да бъде извършена`
 pulls.delete_branch=Изтрий клон
@@ -738,7 +749,7 @@ settings.tracker_issue_style=Стил на именуване на външна
 settings.tracker_issue_style.numeric=Цифров
 settings.tracker_issue_style.alphanumeric=Символен
 settings.tracker_url_format_desc=Можете да използвате текстови маркери <code>{user} {repo} {index}</code> за потребителско име, име на хранилище и индекс на задача съответно.
-settings.pulls_desc=Включва заявки за сливане за да може да се приемат външни доработки
+settings.pulls_desc=Enable pull requests to accept contributions between repositories and branches
 settings.pulls.ignore_whitespace=Ignore changes in whitespace
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Опасна зона
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Данните за уики на това хра
 settings.delete=Изтрий това хранилище
 settings.delete_desc=След като изтриете хранилището, няма връщане назад. Моля, бъдете сигурни.
 settings.delete_notices_1=- Тази операция <strong>НЕ МОЖЕ</strong> да бъде отменена в последствие.
-settings.delete_notices_2=- Тази операция ще изтрие всичко от това хранилище, включително Git данни, задачи, коментари и достъпа на сътрудници.
+settings.delete_notices_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
 settings.delete_notices_fork_1=- Всички разклонения ще станат независими след изтриването.
 settings.deletion_success=Хранилището е изтрито успешно!
 settings.update_settings_success=Настройките на хранилището са запазени успешно.
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=Този потребител няма да
 settings.remove_collaborator_success=Сътрудникът е премахнат.
 settings.search_user_placeholder=Име на потребител...
 settings.org_not_allowed_to_be_collaborator=Невъзможно добавяне на организация като сътрудник.
-settings.add_webhook=Добави уеб-кука
 settings.hooks_desc=Уеб-куките много приличат на обикновен HTTP POST тригер. Когато нещо се случи в Gogs, ние ще изпратим уведомление до сървъра, който посочите. Научете повече в <a target="_blank" href="%s">Ръководство за уеб-куки</a>.
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Добави уеб-кука
 settings.webhook_deletion=Изтрий уеб-кука
 settings.webhook_deletion_desc=При изтриване на тази уеб-кука ще се премахне информацията за нея и цялата хронология на нейното изпращане. Желаете ли да продължите?
 settings.webhook_deletion_success=Уеб-куката е изтрита успешно!
@@ -792,6 +805,8 @@ settings.webhook.response=Отговор
 settings.webhook.headers=Заглавки
 settings.webhook.payload=Съдържание
 settings.webhook.body=Тяло
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git куките се изпълняват от Git. Вие може да промените файловете с поддържаните куки в списъка по-долу, за да изпълните външни операции.
 settings.githook_edit_desc=Ако куката е неактивна, ще бъде представено примерно съдържание. Ако оставите съдържанието празно, то тази кука ще бъде изключена.
 settings.githook_name=Име на куката
@@ -819,10 +834,10 @@ settings.event_push=Предаване
 settings.event_push_desc=Git предаване към хранилището
 settings.event_issues=Issues
 settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment=Issue Comment
-settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_pull_request=Заявка за сливане
 settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_release=Release
 settings.event_release_desc=Release published in a repository.
 settings.active=Активна
@@ -852,6 +867,8 @@ settings.add_key_success=Новият ключ за внедряване '%s' е
 settings.deploy_key_deletion=Изтрий ключ за внедряване
 settings.deploy_key_deletion_desc=При изтриването на този ключ за внедряване ще се премахнат свързаните права за достъп до това хранилище. Желаете ли да продължите?
 settings.deploy_key_deletion_success=Ключът за внедряване е изтрит успешно!
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=Преглед на файлове
 diff.parent=родител
@@ -916,9 +933,8 @@ team_name_helper=Ще използвате това име при спомена
 team_desc_helper=Каква е целта на този екип?
 team_permission_desc=Какво ниво на достъп трябва да има този екип?
 
-form.name_reserved=Името на организацията '%s' е запазено.
-form.name_pattern_not_allowed=Име на организацията от вида '%s' не е разрешено.
-form.team_name_reserved=Име на екип "%s" е запазено.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Настройки
 settings.options=Опции
@@ -990,12 +1006,19 @@ first_page=Първа
 last_page=Последна
 total=Общо: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 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> уеб-куки, <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.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Изпълни
 dashboard.clean_unbind_oauth=Почисти несвързани OAuthes
 dashboard.clean_unbind_oauth_success=Всички несвързани OAuthes са изтрити успешно.
@@ -1087,11 +1110,12 @@ repos.stars=Харесвания
 repos.issues=Задачи
 repos.size=Размер
 
-auths.auth_manage_panel=Управление на удостоверявания
+auths.auth_sources=Authentication Sources
 auths.new=Добави нов начин на удостоверяване
 auths.name=Име
 auths.type=Тип
 auths.enabled=Активно
+auths.default=Default
 auths.updated=Последна модификация
 auths.auth_type=Тип на удостоверяване
 auths.auth_name=Име на удостоверяване
@@ -1128,9 +1152,9 @@ auths.enable_tls=Включи TLS криптиране
 auths.skip_tls_verify=Пропусни проверка на TLS сертификат
 auths.pam_service_name=Име на PAM услуга
 auths.enable_auto_register=Включи автоматична регистрация
-auths.tips=Съвети
 auths.edit=Редактирай настройки за удостоверяване
 auths.activated=Това удостоверяване е активно
+auths.default_auth=This authentication is default login source
 auths.new_success=Новото удостоверяване '%s' е добавено успешно.
 auths.update_success=Настройките за удостоверяване са запазени успешно.
 auths.update=Запази настройки за удостоверяване
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Това удостоверяване ще бъде из
 auths.still_in_used=Това удостоверяване все още се използва от някои потребители. Моля изтрийте ги или ги конвертирайте до друг тип на влизане първо.
 auths.deletion_success=Удостоверяването е изтрито успешно!
 auths.login_source_exist=Източник за валидация на потребители "%s" вече съществува.
+auths.github_api_endpoint=API Endpoint
 
 config.not_set=(not set)
 config.server_config=Сървърни настройки
-config.app_name=Име на приложението
-config.app_ver=Версия на приложението
-config.app_url=URL адрес на приложението
-config.domain=Домейн
-config.offline_mode=Офлайн режим
-config.disable_router_log=Изключи журнал на маршрутизатора
+config.brand_name=Brand name
 config.run_user=Потребителски контекст
 config.run_mode=Режим на изпълнение
-config.git_version=Git версия
-config.static_file_root_path=Път към статични файлове
-config.log_file_root_path=Път към журнал
-config.reverse_auth_user=Потребителско име при обратно удостоверяване
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH конфигурация
-config.ssh_enabled=Активен
-config.ssh_start_builtin_server=Стартирай вграден сървър
-config.ssh_domain=Домейн
-config.ssh_port=Порт
-config.ssh_listen_port=Порт за слушане
-config.ssh_root_path=Основен път
-config.ssh_key_test_path=Път до ключове
-config.ssh_keygen_path=Път до генератор ('ssh-keygen')
-config.ssh_minimum_key_size_check=Проверка за минимален размер на ключове
-config.ssh_minimum_key_sizes=Минимален размер на ключове
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 config.repo_config=Конфигурация на хранилище
-config.repo_root_path=Основен път към хранилища
-config.script_type=Тип на скрипта
-config.repo_force_private=Force Private
-config.max_creation_limit=Max Creation Limit
-config.preferred_licenses=Предпочитани лицензи
-config.disable_http_git=Забраняване на HTTP Git
-config.enable_local_path_migration=Enable Local Path Migration
-config.commits_fetch_concurrency=Commits Fetch Concurrency
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Настройки на базата данни
-config.db_type=Тип
-config.db_host=Сървър
-config.db_name=Име
-config.db_user=Потребител
-config.db_ssl_mode=SSL режим
-config.db_ssl_mode_helper=(само за postgres)
-config.db_path=Път
-config.db_path_helper=(за "sqlite3" и "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Настройка на услугата
-config.register_email_confirm=Изисквай потвърждение на адреси на ел. поща
-config.disable_register=Изключи нови регистрации
-config.show_registration_button=Покажи бутон за регистрация
-config.require_sign_in_view=Изисквай вписване за преглед
-config.mail_notify=Уведомяване по ел. поща
-config.disable_key_size_check=Изключи проверка минимален размер на ключ
-config.enable_captcha=Включи Captcha
-config.active_code_lives=Кодове за активиране
-config.reset_password_code_lives=Кодове за изчистване на парола
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Конфигурация на уеб-куки
-config.queue_length=Дължина на опашка
-config.deliver_timeout=Време за отказ при изпращане
-config.skip_tls_verify=Пропусни проверка на TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Конфигурация на мейлър
-config.mailer_enabled=Активен
-config.mailer_disable_helo=Изключи HELO
-config.mailer_name=Име
-config.mailer_host=Сървър
-config.mailer_user=Потребител
-config.send_test_mail=Изпрати тестово писмо
-config.test_mail_failed=Невъзможно изпращане на тестово писмо до '%s': %v
-config.test_mail_sent=Тестово писмо беше изпратено до '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth конфигурация
-config.oauth_enabled=Активна
-
-config.cache_config=Конфигурация на кеша
-config.cache_adapter=Кеш адаптер
-config.cache_interval=Кеш интервал
-config.cache_conn=Кеш на връзката
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Конфигурация на сесии
-config.session_provider=Доставчик на сесии
-config.provider_config=Конфигурация на доставчик
-config.cookie_name=Име на бисквитката
-config.enable_set_cookie=Включи използване на бисквитки
-config.gc_interval_time=GC през интервал
-config.session_life_time=Период на валидност на сесиите
-config.https_only=HTTPS само
-config.cookie_life_time=Период на валидност на бисквитките
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Конфигурация на кеша
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=Конфигуриране на HTTP
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Конфигурация на изображения
-config.picture_service=Услуги за снимки
-config.disable_gravatar=Изключи Gravatar
-config.enable_federated_avatar=Включи външни аватари
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Конфигурация на уеб-куки
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Конфигурация на git
-config.git_disable_diff_highlight=Забрани оцветяване на синтаксис при преглед на разлики
-config.git_max_diff_lines=Максимален брой различни редове (за файл)
-config.git_max_diff_line_characters=Максимален брой различни символи (на ред)
-config.git_max_diff_files=Максимален брой променени файлове (при показване)
-config.git_gc_args=Аргументи на GC
-config.git_migrate_timeout=Време за отказ при миграция
-config.git_mirror_timeout=Време за отказ при синхр. на огледало
-config.git_clone_timeout=Време за отказ при клониране
-config.git_pull_timeout=Време за отказ при сливане
-config.git_gc_timeout=Време за отказ при GC
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Конфигурация на журнал
+config.log_file_root_path=Път към журнал
 config.log_mode=Режим
 config.log_options=Настройки
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Системните съобщения са изтрит
 
 [action]
 create_repo=създаде хранилище <a href="%s"> %s</a>
-fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=преименува хранилище от <code>%[1]s</code> на <a href="%[2]s">%[3]s</a>
 commit_repo=предаде към <a href="%[1]s/src/%[2]s">%[3]s</a> в <a href="%[1]s">%[4]s</a>
 compare_commits=Сравнение между тези %d ревизии
@@ -1300,6 +1384,10 @@ create_branch=създаде клон <a href="%[1]s/src/%[2]s"> %[3]s</a> % <a
 delete_branch=изтри клон <code>%[2]s</code> % <a href="%[1]s">[3]s</a>
 push_tag=предаде маркер <a href="%s/src/%s">%[2]s</a> към <a href="%[1]s">[3]s</a>
 delete_tag=изтри етикет <code>%[2]s</code> % <a href="%[1]s">[3]s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=преди
@@ -1321,6 +1409,7 @@ months=%[2]s %[1]d месеца
 years=%[2]s %[1]d години
 raw_seconds=секунди
 raw_minutes=минути
+raw_hours=hours
 
 [dropzone]
 default_message=Тук пуснете файлове с влачене или просто щракнете за избор на файл за качване.

conf/locale/locale_cs-CZ.ini

@@ -9,7 +9,6 @@ sign_out=Odhlásit se
 sign_up=Registrovat se
 register=Registrovat se
 website=Webové stránky
-version=Verze
 page=Strana
 template=Šablona
 language=Jazyk
@@ -23,10 +22,10 @@ password=Heslo
 re_type=Znovu zadat
 captcha=CAPTCHA
 
-repository=Repositář
+repository=Repozitář
 organization=Organizace
 mirror=Zrcadlo
-new_repo=Nový repositář
+new_repo=Nový repozitář
 new_migrate=Nové přenesení
 new_mirror=Nové zrcadlo
 new_fork=Nový repositář rozštěpení
@@ -39,11 +38,15 @@ your_profile=Váš profil
 your_settings=Vaše nastavení
 
 activities=Aktivity
-pull_requests=Pull Requesty
+pull_requests=Požadavky na natažení
 issues=Úkoly
 
 cancel=Zrušit
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Instalace
 title=Kroky instalace pro první spuštění
@@ -72,7 +75,7 @@ run_user=Účet pro spouštění
 run_user_helper=Tento uživatel musí mít přístup do kořenového adresáře repositářů a právo spustit Gogs.
 domain=Doména
 domain_helper=Toto ovlivňuje URL klonů skrze SSH.
-ssh_port=SSH port
+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=Použít vestavěný SSH server
 use_builtin_ssh_server_popup=Pro Git operace spustit vestavěný SSH server, aby byl rozpoznán od systémové SSH služby.
@@ -122,6 +125,7 @@ run_user_not_match=Uživatel pro spuštění není aktuální uživatel: %s -> %
 smtp_host_missing_port=V adrese SMTP serveru chybí číslo portu.
 invalid_smtp_from=Hodnota položky SMTP Od: není zadána správně: %v
 save_config_failed=Uložení konfigurace se nezdařilo: %v
+init_failed=Nepodařilo se inicializovat aplikaci: %v
 invalid_admin_setting=Nastavení účtu správce není správné: %v
 install_success=Vítejte! Jsme rádi, že jste si vybrali Gogs. Bavte se a opatrujte se.
 invalid_log_root_path=Kořenový adresář souborů systémových záznamů není správný: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Již máte účet? Přihlašte se!
 social_register_hepler_msg=Již máte účet? Připojte se!
 disable_register_prompt=Omlouváme se, ale registrace jsou vypnuty. Kontaktujte správce systému.
 disable_register_mail=Omlouváme se, ale e-mailové služby jsou vypnuté. Kontaktujte správce systému.
+auth_source=Zdroj ověření
+local=Lokální
 remember_me=Zapamatovat si mne
 forgot_password=Zapomenuté heslo
 forget_password=Zapomněli jste heslo?
@@ -229,6 +235,7 @@ org_name_been_taken=Název organizace je již obsazen.
 team_name_been_taken=Název týmu je již obsazen.
 email_been_used=E-mailová adresa je již použita.
 username_password_incorrect=Chybné uživatelské jméno nebo heslo.
+auth_source_mismatch=Vybraný zdroj ověření není propojen s uživatelem.
 enterred_invalid_repo_name=Ujistěte se, prosím, že zadaný název repositáře je správný.
 enterred_invalid_owner_name=Ujistěte se, prosím, že jméno vlastníka je zadáno správně.
 enterred_invalid_password=Ujistěte se, prosím, že zadané heslo je správné.
@@ -248,7 +255,7 @@ target_branch_not_exist=Cílová větev neexistuje.
 [user]
 change_avatar=Změnit vaši uživatelskou ikonu
 join_on=Zaregistroval se dne
-repositories=Repositáře
+repositories=Repozitáře
 activity=Veřejná aktivita
 followers=Sledující
 starred=Oblíbené repositáře
@@ -256,8 +263,7 @@ following=Sledovaní
 follow=Sledovat
 unfollow=Přestat sledovat
 
-form.name_reserved=Uživatelské jméno '%s' je rezervováno.
-form.name_pattern_not_allowed=Vzor uživatelského jména '%s' není povolen.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profil
@@ -316,7 +322,7 @@ add_email_success=Vaše nová e-mailová adresa byla přidána.
 
 manage_ssh_keys=Správa SSH klíčů
 add_key=Přidat klíč
-ssh_desc=Toto je seznam SSH klíčů vašeho účtu. Tyto klíče umožňují plný přístup k vašim repositářům, proto je velmi důležité, abyste jste si byli jistí, že jsou skutečně vaše.
+ssh_desc=Toto je seznam SSH klíčů vašeho účtu. Jelikož SSH klíče umožňují komukoliv plný přístup k vašim repositářům, je velmi důležité, abyste si byli jistí, že jsou skutečně vaše.
 ssh_helper=<strong>Nevíte jak?</strong> Podívejte se do příručky GitHubu jak si <a href="%s">vytvořit vlastní SSH klíč</a>, nebo na <a href="%s">řešení častých problémů</a>, na které můžete narazit při používání SSH.
 add_new_key=Přidat SSH klíč
 ssh_key_been_used=Obsah veřejného klíče byl použit.
@@ -326,8 +332,8 @@ key_content=Obsah
 add_key_success=Byl přidán nový SSH klíč '%s'!
 delete_key=Smazat
 ssh_key_deletion=Smazání SSH klíče
-ssh_key_deletion_desc=Smazání tohoto SSH klíče odstraní všechny související přístupy k vašemu účtu. Chcete pokračovat?
-ssh_key_deletion_success=SSH klíč úspěšně odstraněn!
+ssh_key_deletion_desc=Smazání tohoto klíče SSH odstraní všechny související přístupy k vašemu účtu. Chcete pokračovat?
+ssh_key_deletion_success=SSH klíč byl úspěšně smazán!
 add_on=Přidán dne
 last_used=Naposledy použit dne
 no_activity=Žádná aktuální aktivita
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Nebo zadejte tajný kód:
 two_factor_then_enter_passcode=Pak zadejte přístupový kód:
 two_factor_verify=Ověřit
 two_factor_invalid_passcode=Zadaný přístupový kód není platný, prosím, zkuste to znova!
+two_factor_reused_passcode=Kód, který jste zadali už byl použit. Prosím, zkuste jiný!
 two_factor_enable_error=Povolení dvoufaktorového ověření selhalo: %v
 two_factor_enable_success=Dvoufaktorové ověření bylo pro váš účet povoleno!
 two_factor_recovery_codes_title=Obnovovací kódy dvoufaktorového ověření
@@ -370,6 +377,7 @@ delete_token=Smazat
 access_token_deletion=Smazání osobní přístupové poukázky
 access_token_deletion_desc=Smazáním této osobní přístupové poukázky odstraní všechen související přístup aplikace. Chcete pokračovat?
 delete_token_success=Osobní přístupová poukázka byla odstraněna! Nezapomeňte také změnit nastavení vaší aplikace.
+token_name_exists=Poukázka se stejným jménem již existtuje.
 
 orgs.none=Nejste členem žádné organizace.
 orgs.leave_title=Opustit organizaci
@@ -417,10 +425,11 @@ mirror_last_synced=Naposledy synchronizováno
 watchers=Sledující
 stargazers=Sledující
 forks=Rozštěpení
+repo_description_helper=Popis repozitáře. Maximální délka 512 znaků.
+repo_description_length=Dostupné znaky
 
 form.reach_limit_of_creation=Vlastník dosáhl maximálního počtu %d vytvořených repositořů.
-form.name_reserved=Název repositáře '%s' je rezervován.
-form.name_pattern_not_allowed=Vzor názvu repositáře '%s' není povolen.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Ověření je vyžadováno
 migrate_type=Typ přenesení
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Obsah souboru se změnil od začátku úprav.
 editor.file_already_exists=Soubor '%s' již v tomto repositáři existuje.
 editor.no_changes_to_show=Žádné změny k zobrazení.
 editor.fail_to_update_file=Vytvoření nebo změna souboru '%s' skončila chybou: %v
+editor.fail_to_delete_file=Nepodařilo se smazat soubor '%s' kvůli chybě: %v
 editor.add_subdir=Přidat podadresář...
 editor.unable_to_upload_files=Nepodařilo se nahrát soubor do '%s'. Chyba: %v
 editor.upload_files_to_dir=Nahrát soubory do '%s'
@@ -616,7 +626,7 @@ pulls.compare_compare=porovnat
 pulls.filter_branch=Filtrovat větev
 pulls.no_results=Nebyly nalezeny žádné výsledky.
 pulls.nothing_to_compare=Není co porovnávat, protože základ a hlavní větve jsou shodné.
-pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history.
+pulls.nothing_merge_base=Není co porovnávat, protože tyto dvě větve mají úplně jinou historii.
 pulls.has_pull_request=`Požadavek na natažení mezi těmito větvemi již existuje: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create=Vytvořit požadavek na natažení
 pulls.title_desc=chce sloučit %[1]d revizí z větve <code>%[2]s</code> do větve <code>%[3]s</code>
@@ -632,8 +642,9 @@ pulls.is_checking=Kontrola rozporů stále pokračuje, prosím obnovte za někol
 pulls.can_auto_merge_desc=Tento požadavek na natažení může být automaticky sloučen.
 pulls.cannot_auto_merge_desc=Tento požadavek na natažení nemůže být automaticky sloučen, neboť se v něm nachází rozpory.
 pulls.cannot_auto_merge_helper=Prosím proveďte sloučení ručně, aby byly vyřešeny rozpory.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Vytvořit slučovací commit
+pulls.rebase_before_merging=Rebase před slučováním
+pulls.commit_description=Popis Commitu
 pulls.merge_pull_request=Sloučit požadavek na natažení
 pulls.open_unmerged_pull_exists=`Nemůžete znovuotevřít požadavek na natažení, neboť požadavek na natažení ze stejného repositáře se stejnými informacemi pro sloučení již existuje (#%d) a čeká na sloučení.`
 pulls.delete_branch=Smazat větev
@@ -738,9 +749,9 @@ settings.tracker_issue_style=Styl pojmenování úkolů v externím systému úk
 settings.tracker_issue_style.numeric=Číselný
 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 číslo úkolu.
-settings.pulls_desc=Povolit požadavky na natažení, aby mohly být příspěvky veřejnosti akceptovány
-settings.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Enable pull requests to accept contributions between repositories and branches
+settings.pulls.ignore_whitespace=Ignorovat změny v netisknutelných znacích
+settings.pulls.allow_rebase_merge=Povolit použití rebase pro sloučení revizí
 settings.danger_zone=Nebezpečná zóna
 settings.cannot_fork_to_same_owner=Nemůžete rozštěpit repositář jejímu vlastníkovi.
 settings.new_owner_has_same_repo=Nový vlastník již repositář se stejným názvem má. Vyberte, prosím, jiné jméno.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Přidat webový háček
 settings.webhook_deletion=Smazat webový háček
 settings.webhook_deletion_desc=Smazáním tohoto webového háčku dojte také ke smazání veškerých informací o něm a také historie volání. Chcete pokračovat?
 settings.webhook_deletion_success=Webový háček byl smazán!
@@ -792,6 +805,8 @@ settings.webhook.response=Odpověď
 settings.webhook.headers=Hlavičky
 settings.webhook.payload=Datová část
 settings.webhook.body=Tělo zprávy
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Jelikož háčky Gitu jsou spravovány Gitem samotným, můžete v seznamu níže upravit soubory podporovaných háčku k provádění uživatelských operací.
 settings.githook_edit_desc=Je-li háček neaktivní, bude zobrazen vzorový obsah. Nebude-li zadán žádný obsah, háček bude vypnut.
 settings.githook_name=Název háčku
@@ -819,10 +834,10 @@ settings.event_push=Odeslat
 settings.event_push_desc=Odeslání pomocí Gitu do repositáře
 settings.event_issues=Úkoly
 settings.event_issues_desc=Úkol, který je otevřen, uzavřen, znovuotevřen, změněn, přiřazen, nepřiřazen, mající změněn štítek, smazán štítek, mající přiřazen milník, nemající přiřazen milník.
-settings.event_issue_comment=Komentář k úkolu
-settings.event_issue_comment_desc=Komentář k úkolu vytvořen, upraven nebo smazán.
 settings.event_pull_request=Požadavek na natažení
 settings.event_pull_request_desc=Požadavek na natažení otevřen, uzavřen, znovuotevřen, změněn, přiřazen, nepřiřazen, změněn štítek, smazán štítek, mající nastaven štítek, zrušeno nastavení štítku nebo synchronizován.
+settings.event_issue_comment=Komentář k úkolu
+settings.event_issue_comment_desc=Komentář k úkolu vytvořen, upraven nebo smazán.
 settings.event_release=Vydání
 settings.event_release_desc=Vydání vystaveno v repositáři.
 settings.active=Aktivní
@@ -835,14 +850,14 @@ 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=Přidat integraci <a href="%s">Discord</a> do vašeho repositáře.
-settings.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository.
+settings.add_dingtalk_hook_desc=Přidat integraci <a href="%s">Dingtalk</a> do vašeho repositáře.
 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>Přichycen při činu!</b> Pokud chcete přidat osobní veřejné klíče, zadejte je prosím v <a href="%s%s">nastavení vašeho účtu</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í SSH klíče.
+settings.deploy_key_desc=Klíče pro nasazení mají pouze přístup ke čtení. Nejsou stejné jako SSH klíče osobního účtu.
 settings.no_deploy_keys=Žádné klíče pro nasazení nebyly ještě přidány.
 settings.title=Název
 settings.deploy_key_content=Obsah
@@ -852,6 +867,8 @@ settings.add_key_success=Nový klíč pro nasazení '%s' byl přidán!
 settings.deploy_key_deletion=Smazat klíč pro nasazení
 settings.deploy_key_deletion_desc=Smazání toho klíče pro nasazení smaže také veškerý k němu svázaný přístup do tohoto repositáře. Chcete pokračovat?
 settings.deploy_key_deletion_success=Klíč pro nasazení byl smazán!
+settings.description_desc=Popis repozitáře. Maximální délka 512 znaků.
+settings.description_length=Dostupné znaky
 
 diff.browse_source=Procházet zdrojové kódy
 diff.parent=rodič
@@ -907,7 +924,7 @@ people=Lidé
 invite_someone=Přizvěte někoho
 teams=Týmy
 lower_members=členové
-lower_repositories=repositáře
+lower_repositories=repozitáře
 create_new_team=Vytvořit nový tým
 org_desc=Popis
 team_name=Název týmu
@@ -916,9 +933,8 @@ team_name_helper=Tento název budete používat při zmiňovaní týmu v konverz
 team_desc_helper=Popište prosím tento tým
 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=Název týmu '%s' je vyhrazen.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Nastavení
 settings.options=Možnosti
@@ -971,9 +987,9 @@ teams.delete_team_success=Daný tým byl smazán.
 teams.read_permission_desc=Členství v tom týmu poskytuje právo <strong>čtení</strong>: členové mohou číst z a vytvářet klony repositářů týmu.
 teams.write_permission_desc=Členství v tom týmu poskytuje právo <strong>zápisu</strong>: členové mohou číst z a odesílat do repositářů týmu.
 teams.admin_permission_desc=Členství v tom týmu poskytuje právo <strong>správce</strong>: členové mohou číst z, odesílat do a přidávat spolupracovníky do repositářů týmu.
-teams.repositories=Repositáře týmu
+teams.repositories=Repozitáře týmu
 teams.search_repo_placeholder=Hledat repositář...
-teams.add_team_repository=Přidat repositář týmu
+teams.add_team_repository=Přidat repozitář týmu
 teams.remove_repo=Odstranit
 teams.add_nonexistent_repo=Repositář, který se snažíte přidat, neexistuje. Nejdříve jej vytvořte, prosím.
 
@@ -981,7 +997,7 @@ teams.add_nonexistent_repo=Repositář, který se snažíte přidat, neexistuje.
 dashboard=Přehled
 users=Uživatelé
 organizations=Organizace
-repositories=Repositáře
+repositories=Repozitáře
 authentication=Způsoby ověření
 config=Nastavení
 notices=Systémová oznámení
@@ -990,12 +1006,19 @@ first_page=První
 last_page=Poslední
 total=Celkem: %d
 
+dashboard.build_info=Informace o sestavení
+dashboard.app_ver=Verze aplikace
+dashboard.git_version=Git verze
+dashboard.go_version=Go verze
+dashboard.build_time=Čas sestavení
+dashboard.build_commit=Commit sestavení
 dashboard.statistic=Statistika
 dashboard.operations=Operace
 dashboard.system_status=Stav sledování systému
 dashboard.statistic_info=Databáze Gogs obsahuje <b>%d</b> uživatelů, <b>%d</b> organizací, <b>%d</b> veřejných klíčů, <b>%d</b> repositářů, <b>%d</b> hlídání, <b>%d</b> oblíbení, <b>%d</b> akcí, <b>%d</b> přístupů, <b>%d</b> úkolů, <b>%d</b> komentářů, <b>%d</b> sociálních účtů, <b>%d</b> sledování, <b>%d</b> zrcadel, <b>%d</b> vydání, <b>%d</b> zdrojů přihlášení, <b>%d</b> webových háčků, <b>%d</b> milníků, <b>%d</b> štítků, <b>%d</b> háčků, <b>%d</b> týmů, <b>%d</b> úkolů změn, <b>%d</b> příloh.
 dashboard.operation_name=Název operace
 dashboard.operation_switch=Přepnout
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Spustit
 dashboard.clean_unbind_oauth=Smazat odpojené asociace OAuth2
 dashboard.clean_unbind_oauth_success=Všechny odpojené asociace OAuth2 byly smazány.
@@ -1087,11 +1110,12 @@ repos.stars=Oblíbení
 repos.issues=Úkoly
 repos.size=Velikost
 
-auths.auth_manage_panel=Panel správy způsobů ověřování
+auths.auth_sources=Zdroje ověření
 auths.new=Přidat nový zdroj
 auths.name=Název
 auths.type=Typ
 auths.enabled=Povolený
+auths.default=Výchozí
 auths.updated=Změněné
 auths.auth_type=Typ ověření
 auths.auth_name=Název ověření
@@ -1100,7 +1124,7 @@ auths.domain=Doména
 auths.host=Server
 auths.port=Port
 auths.bind_dn=Připojení DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Můžete použít '%s' jako zástupný znak pro uživatelské jméno, například DOM\%s
 auths.bind_password=Heslo připojení
 auths.bind_password_helper=Upozornění: Toto heslo je ukládáno nešifrované. Nepoužívejte pro správcovské účty.
 auths.user_base=Výchozí místo hledání uživatelů
@@ -1128,9 +1152,9 @@ auths.enable_tls=Povolit šifrování TLS
 auths.skip_tls_verify=Přeskočit ověření TLS
 auths.pam_service_name=Název služby PAM
 auths.enable_auto_register=Povolit zaregistrování se
-auths.tips=Tipy
 auths.edit=Upravit nastavení ověřování
 auths.activated=Tento způsob ověřování je aktivní
+auths.default_auth=Toto ověření je výchozí zdroj přihlášení
 auths.new_success=Nový způsob ověřování '%s' byl přidán.
 auths.update_success=Nastavení ověřování bylo změněno.
 auths.update=Změnit nastavení ověřování
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Tento způsob ověřování bude smazán, chcete pokračo
 auths.still_in_used=Tento způsob ověřování je stále používán některými uživateli. Prosím, nejdříve změňte u těchto uživatelů typ ověřování na jiný.
 auths.deletion_success=Způsob ověřování byl smazán!
 auths.login_source_exist=Zdroj přihlášení '%s' již existuje.
+auths.github_api_endpoint=Koncový bod API
 
-config.not_set=(not set)
+config.not_set=(není nastaveno)
 config.server_config=Nastavení serveru
-config.app_name=Název aplikace
-config.app_ver=Verze aplikace
-config.app_url=URL aplikace
-config.domain=Doména
-config.offline_mode=Režim off-line
-config.disable_router_log=Vypnout systémové záznamy směrovače
+config.brand_name=Název značky
 config.run_user=Účet pro spouštění
 config.run_mode=Režim spouštění
-config.git_version=Verze Gitu
-config.static_file_root_path=Kořenový adresář statického souboru
-config.log_file_root_path=Kořenový adresář souboru systémových záznamů
-config.reverse_auth_user=Uživatel obráceného ověření
+config.server.external_url=Externí URL
+config.server.domain=Doména
+config.server.protocol=Protokol
+config.server.http_addr=HTTP adresa
+config.server.http_port=HTTP port
+config.server.cert_file=Soubor certifikátu
+config.server.key_file=Soubor klíče
+config.server.tls_min_version=Minimální verze TLS
+config.server.unix_socket_permission=Oprávnění Unix socket
+config.server.local_root_url=Místní URL kořenového adresáře
+config.server.offline_mode=Offline režim
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Povolit Gzip
+config.server.app_data_path=Cesta dat aplikace
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=Nastavení SSH
-config.ssh_enabled=Povolený
-config.ssh_start_builtin_server=Spustit vestavěný server
-config.ssh_domain=Doména
-config.ssh_port=Port
-config.ssh_listen_port=Port pro naslouchání
-config.ssh_root_path=Kořenová cesta
-config.ssh_key_test_path=Cesta testu klíčů
-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.ssh.enabled=Povoleno
+config.ssh.domain=Vystavená doména
+config.ssh.port=Vystavený port
+config.ssh.root_path=Kořenová cesta
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Kontrola minimální velikosti klíčů
+config.ssh.minimum_key_sizes=Minimální velikost klíčů
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Serverové šifry
 
 config.repo_config=Nastavení repositáře
-config.repo_root_path=Kořenový adresář repositářů
-config.script_type=Typ skriptu
-config.repo_force_private=Vynutit soukromé
-config.max_creation_limit=Maximální lhůta pro vytvoření
-config.preferred_licenses=Upřednostňované licence
-config.disable_http_git=Vypnout HTTP Git
-config.enable_local_path_migration=Povolit migraci z místní cesty
-config.commits_fetch_concurrency=Souběžnost vyzvednutí revizí
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Kořenová cesta
+config.repo.script_type=Typ skriptu
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Upřednostňované licence
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Nastavení databáze
-config.db_type=Typ
-config.db_host=Server
-config.db_name=Název
-config.db_user=Uživatel
-config.db_ssl_mode=SSL režim
-config.db_ssl_mode_helper=(pouze pro 'postgres')
-config.db_path=Cesta
-config.db_path_helper=(pro "sqlite3" a "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Nastavení služby
-config.register_email_confirm=Vyžadovat potvrzení e-mailu
-config.disable_register=Vypnout registraci
-config.show_registration_button=Ukázat tlačítko registrace
-config.require_sign_in_view=Vyžadovat zobrazení přihlášení
-config.mail_notify=Upozornění e-mailem
-config.disable_key_size_check=Vypnout kontrolu minimální velikosti klíčů
-config.enable_captcha=Povolit službu CAPTCHA
-config.active_code_lives=Doba života aktivního kódu
-config.reset_password_code_lives=Lhůta kódu pro obnovu hesla
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Nastavení webových háčků
-config.queue_length=Délka fronty
-config.deliver_timeout=Časový limit doručení
-config.skip_tls_verify=Přeskočit ověření TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Nastavení odesílání e-mailů
-config.mailer_enabled=Povolený
-config.mailer_disable_helo=Vypnout HELO
-config.mailer_name=Název
-config.mailer_host=Server
-config.mailer_user=Uživatel
-config.send_test_mail=Odeslat zkušební E-mail
-config.test_mail_failed=Odeslání testovacího e-mailu na '%s' selhalo: %v
-config.test_mail_sent=Zkušební e-mail byl odeslán na '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Nastavení ověření OAuth
-config.oauth_enabled=Povolený
-
-config.cache_config=Nastavení mezipaměti
-config.cache_adapter=Adaptér mezipaměti
-config.cache_interval=Interval mezipaměti
-config.cache_conn=Připojení mezipaměti
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Nastavení relace
-config.session_provider=Poskytovatel relace
-config.provider_config=Nastavení poskytovatele
-config.cookie_name=Název souboru cookie
-config.enable_set_cookie=Povolit nastavení cookie
-config.gc_interval_time=Čas intervalu GC
-config.session_life_time=Doba trvání relace
-config.https_only=Pouze protokol HTTPS
-config.cookie_life_time=Doba života souboru cookie
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Nastavení mezipaměti
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=Nastavení HTTP
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Nastavení ikony uživatele
-config.picture_service=Služba ikon uživatelů
-config.disable_gravatar=Vypnout službu Gravatar
-config.enable_federated_avatar=Povolit jednotné ikony uživatelů
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Nastavení webových háčků
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Konfigurace Gitu
-config.git_disable_diff_highlight=Vypnout zvýraznění syntaxe v rozdílovém zobrazení
-config.git_max_diff_lines=Maximální počet rozdílných řádků jednoho souboru
-config.git_max_diff_line_characters=Maximální počet zobrazených rozdílných znaků jedné řádky
-config.git_max_diff_files=Maximální počet zobrazených rozdílných souborů
-config.git_gc_args=Parametry GC
-config.git_migrate_timeout=Časová lhůta přenesení
-config.git_mirror_timeout=Časový limit aktualizace zrcadla
-config.git_clone_timeout=Časový limit operace naklonování
-config.git_pull_timeout=Časový limit operace stažení
-config.git_gc_timeout=Časový limit operace GC
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Nastavení systémových záznamů
+config.log_file_root_path=Kořenový adresář souboru systémových záznamů
 config.log_mode=Režim
 config.log_options=Možnosti
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Systémová upozornění byla smazána.
 
 [action]
 create_repo=vytvořil repositář <a href="%s">%s</a>
-fork_repo=rozštěpil repositář do <a href="%s">%s</a>
 rename_repo=přejmenoval repositář z <code>%[1]s</code> na <a href="%[2]s">%[3]s</a>
 commit_repo=odeslal do větve <a href="%[1]s/src/%[2]s">%[3]s</a> v repositáři <a href="%[1]s">%[4]s</a>
 compare_commits=Zobrazit porovnání pro tyto %d revize
@@ -1300,6 +1384,10 @@ create_branch=vytvořil novou větev <a href="%[1]s/src/%[2]s">%[3]s</a> v <a hr
 delete_branch=smazal větev <code>%[2]s</code> v <a href="%[1]s">%[3]s</a>
 push_tag=odeslal značku <a href="%s/src/%s">%[2]s</a> do repositáře <a href="%[1]s">%[3]s</a>
 delete_tag=smazána značka <code>%[2]s</code> v <a href="%[1]s">%[3]s</a>
+fork_repo=rozštěpil repositář do <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synchronizoval/a novou referenci <a href="%s/src/%s">%[2]s</a> do <a href="%[1]s">%[3]s</a> ze zrcadla
+mirror_sync_delete=synchronizoval/a a smazal/a referenci <code>%[2]s</code> v <a href="%[1]s">%[3]s</a> ze zrcadla
 
 [tool]
 ago=před
@@ -1321,6 +1409,7 @@ months=%[2]s %[1]d měsíci
 years=%[2]s %[1]d roky
 raw_seconds=sekundy
 raw_minutes=minuty
+raw_hours=hours
 
 [dropzone]
 default_message=Přetáhněte soubory sem nebo stiskněte Nahrát.

conf/locale/locale_de-DE.ini

@@ -9,7 +9,6 @@ sign_out=Abmelden
 sign_up=Registrieren
 register=Registrieren
 website=Webseite
-version=Version
 page=Seite
 template=Vorlage
 language=Sprache
@@ -44,6 +43,10 @@ issues=Issues
 
 cancel=Abbrechen
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Installation
 title=Installationsschritte für den ersten Start
@@ -122,6 +125,7 @@ run_user_not_match=Der ausführende Benutzer ist nicht der aktuelle Benutzer: %s
 smtp_host_missing_port=In der Adresse des SMTP Host fehlt die Portnummer.
 invalid_smtp_from=SMTP Absender Feld ist nicht gültig: %v
 save_config_failed=Fehler beim Speichern der Konfiguration: %v
+init_failed=Fehler beim Initialisieren der Anwendung: %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.
 invalid_log_root_path=Pfad zum Log-Verzeichnis ist ungültig: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Haben Sie bereits ein Konto? Jetzt anmelden!
 social_register_hepler_msg=Haben Sie bereits ein Konto? Jetzt verknüpfen!
 disable_register_prompt=Es tut uns leid, die Registrierung wurde deaktiviert. Bitte wenden Sie sich an den Administrator.
 disable_register_mail=Es tut uns leid, die Bestätigung der Registrierungs-E-Mail wurde deaktiviert.
+auth_source=Authentifizierungsquelle
+local=Lokal
 remember_me=Angemeldet bleiben
 forgot_password=Passwort vergessen
 forget_password=Passwort vergessen?
@@ -229,6 +235,7 @@ org_name_been_taken=Organisationsname ist bereits vergeben.
 team_name_been_taken=Teamname ist bereits vergeben.
 email_been_used=E-Mail-Adresse wird bereits verwendet.
 username_password_incorrect=Benutzername oder Passwort ist nicht korrekt.
+auth_source_mismatch=Die ausgewählte Authentifizierungsquelle ist dem Benutzer nicht zugeordnet.
 enterred_invalid_repo_name=Bitte achten Sie darauf, dass der von Ihnen eingegebene Repository-Name korrekt ist.
 enterred_invalid_owner_name=Bitte achten Sie darauf, dass der eingegebene Name des Besitzers korrekt ist.
 enterred_invalid_password=Bitte achten Sie darauf, dass das eingegebene Passwort richtig ist.
@@ -256,8 +263,7 @@ following=Folge ich
 follow=Folgen
 unfollow=Nicht mehr folgen
 
-form.name_reserved=Der Benutzername '%s' ist reserviert.
-form.name_pattern_not_allowed=Benutzernamen der Form '%s' sind nicht erlaubt.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profil
@@ -319,7 +325,7 @@ add_key=Schlüssel hinzufügen
 ssh_desc=Dies ist eine Liste aller SSH-Schlüssel, die Ihrem Konto zugeordnet sind. Bitte entfernen Sie alle Schlüssel, die Ihnen nicht bekannt sind.
 ssh_helper=<strong>Brauchen Sie Hilfe?</strong> Hier ist eine Anleitung zum <a href="%s">Erzeugen von SSH-Schlüsseln</a> oder <a href="%s">Lösen einfacher SSH-Probleme</a>.
 add_new_key=SSH-Schlüssel hinzufügen
-ssh_key_been_used=Inhalt des öffentlichen Schlüssels wurde verwendet.
+ssh_key_been_used=Inhalt des öffentlichen Schlüssels wurde bereits verwendet.
 ssh_key_name_used=Ein öffentlicher Schlüssel mit diesem Namen existiert bereits.
 key_name=Schlüsselname
 key_content=Inhalt
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Oder geben Sie Ihren Geheim-Code ein:
 two_factor_then_enter_passcode=Geben Sie die PIN ein:
 two_factor_verify=Bestätigen
 two_factor_invalid_passcode=Die eingegebene PIN ist ungültig. Bitte versuchen Sie es erneut!
+two_factor_reused_passcode=Der von dir eingegebene Passcode wurde bereits verwendet, bitte probiere einen anderen!
 two_factor_enable_error=Einschalten der Zwei-Faktor-Authentifizierung ist fehlgeschlagen: %v
 two_factor_enable_success=Die Zwei-Faktor-Authentifizierung wurde für Ihr Konto erfolgreich aktiviert!
 two_factor_recovery_codes_title=Zwei-Faktor-Authentifizierung-Wiederherstellungscodes
@@ -370,6 +377,7 @@ delete_token=Löschen
 access_token_deletion=Persönlichen Token entfernen
 access_token_deletion_desc=Das Löschen dieses persönlichen Zugangs-Tokens wird alle zugehörigen Zugriffe der Anwendung entfernen. Möchten Sie fortfahren?
 delete_token_success=Persönlicher Zugriffs-Token wurde erfolgreich entfernt! Vergessen Sie nicht Ihre Anwendung zu aktualisieren.
+token_name_exists=Token mit dem gleichen Namen existiert bereits.
 
 orgs.none=Sie sind kein Mitglied einer Organisation.
 orgs.leave_title=Organisation verlassen
@@ -417,10 +425,11 @@ mirror_last_synced=Zuletzt synchronisiert
 watchers=Beobachter
 stargazers=In Favoriten von
 forks=Forks
+repo_description_helper=Beschreibung des Repository. Maximal 512 Zeichen.
+repo_description_length=Verfügbare Zeichen
 
 form.reach_limit_of_creation=Der Besitzer hat die maximale Anzahl von %d erstellbaren Repositories erreicht.
-form.name_reserved=Repository-Name '%s' ist reserviert.
-form.name_pattern_not_allowed=Repository-Namen der Form '%s' sind nicht erlaubt.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Authorisierung benötigt
 migrate_type=Migrationstyp
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Seit dem Start der Bearbeitung hat sich die Da
 editor.file_already_exists=Eine Datei mit dem Namen '%s' existiert bereits in diesem Repository.
 editor.no_changes_to_show=Keine Änderungen vorhanden.
 editor.fail_to_update_file=Fehler beim Ändern/Erstellen der Datei '%s'. Fehler: %v
+editor.fail_to_delete_file=Fehler beim Löschen der Datei '%s'. Fehler: %v
 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'
@@ -616,7 +626,7 @@ pulls.compare_compare=vergleichen
 pulls.filter_branch=Branch filtern
 pulls.no_results=Keine Ergebnisse verfügbar.
 pulls.nothing_to_compare=Es gibt nichts zu vergleichen, da Base- und Head-Branch gleich sind.
-pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history.
+pulls.nothing_merge_base=Es gibt nichts zu vergleichen, da beide Zweige eine komplett unterschiedliche Historie haben.
 pulls.has_pull_request=`Es existiert bereits ein Pull-Request zwischen diesen beiden Zielen: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create=Pull-Request erstellen
 pulls.title_desc=möchte %[1]d Commits von <code>%[2]s</code> nach <code>%[3]s</code> zusammenführen
@@ -632,8 +642,9 @@ pulls.is_checking=Die Konfliktprüfung läuft noch. Bitte aktualisieren Sie die
 pulls.can_auto_merge_desc=Dieser Pull-Request kann automatisch zusammengeführt werden.
 pulls.cannot_auto_merge_desc=Dieser Pull-Request kann nicht automatisch zusammengeführt werden, da es Konflikte gibt.
 pulls.cannot_auto_merge_helper=Bitte manuell zusammenführen, um die Konflikte zu lösen.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Erstelle einen Merge-Commit
+pulls.rebase_before_merging=Rebase vor dem Zusammenführen
+pulls.commit_description=Commit Beschreibung
 pulls.merge_pull_request=Pull-Request zusammenführen
 pulls.open_unmerged_pull_exists=`Sie können diesen Pull-Request nicht wieder öffnen, da bereits ein offener Pull-Request (#%d) aus dem selben Repository mit den gleichen Merge-Informationen existiert und auf das Zusammenführen wartet.`
 pulls.delete_branch=Zweig löschen
@@ -738,9 +749,9 @@ settings.tracker_issue_style=Namenskonvention des externen Issue-Trackers:
 settings.tracker_issue_style.numeric=Numerisch
 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.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Erlaube Pull-Requests zur Zusammenarbeit von Repositories und Branches
+settings.pulls.ignore_whitespace=Ignoriere whitespace Änderungen
+settings.pulls.allow_rebase_merge=Die Verwendung von Rebase erlauben, um Commits zu mergen
 settings.danger_zone=Gefahrenzone
 settings.cannot_fork_to_same_owner=Besitzer kann das Repository nicht forken.
 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.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Webhook hinzufügen
 settings.webhook_deletion=Webhook entfernen
 settings.webhook_deletion_desc=Das Löschen dieses Webhooks wird alle zugehörigen Informationen und den Übertragungsverlauf entfernen. Wirklich fortfahren?
 settings.webhook_deletion_success=Webhook wurde erfolgreich entfernt!
@@ -792,6 +805,8 @@ settings.webhook.response=Antwort
 settings.webhook.headers=Kopfzeilen
 settings.webhook.payload=Nutzdaten
 settings.webhook.body=Inhalt
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git-Hooks werden von Git selbst bereitgestellt. Sie können die Dateien der unterstützten Hooks in der Liste unten bearbeiten, um eigene Operationen einzubinden.
 settings.githook_edit_desc=Wenn ein Hook inaktiv ist, wird der Standardinhalt benutzt. Lassen Sie den Inhalt leer, um den Hook zu deaktivieren.
 settings.githook_name=Hook-Name
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push auf ein Repository
 settings.event_issues=Issues
 settings.event_issues_desc=Issue geöffnet, geschlossen, wieder geöffnet, bearbeitet, zugewiesen, nicht zugewiesen, Label aktualisiert, Label gelöscht, einem Meilenstein zugewiesen oder davon entfernt.
-settings.event_issue_comment=Issue-Kommentar
-settings.event_issue_comment_desc=Issue-Kommentar angelegt, geändert oder gelöscht.
 settings.event_pull_request=Pull-Request
 settings.event_pull_request_desc=Pull-Request geöffnet, geschlossen, wieder geöffnet, bearbeitet, zugewiesen, nicht zugewiesen, Label aktualisiert, Label gelöscht, einem Meilenstein zugewiesen, davon entfernt oder synchronisiert.
+settings.event_issue_comment=Issue-Kommentar
+settings.event_issue_comment_desc=Issue-Kommentar angelegt, geändert oder gelöscht.
 settings.event_release=Release
 settings.event_release_desc=Release in Repository veröffentlicht.
 settings.active=Aktiv
@@ -835,7 +850,7 @@ 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.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository.
+settings.add_dingtalk_hook_desc=<a href="%s">Dingtalk</a>-Integration zu deinem Repository hinzufügen.
 settings.slack_token=Token
 settings.slack_domain=Domain
 settings.slack_channel=Kanal
@@ -852,6 +867,8 @@ settings.add_key_success=Der Deploy-Schlüssel '%s' wurde erfolgreich hinzugefü
 settings.deploy_key_deletion=Deploy-Schlüssel löschen
 settings.deploy_key_deletion_desc=Nach dem Löschen dieses Deploy-Schlüssels werden entsprechende Zugriffe auf dieses Repository nicht mehr möglich sein. Möchten Sie wirklich fortfahren?
 settings.deploy_key_deletion_success=Deploy-Schlüssel wurde erfolgreich gelöscht!
+settings.description_desc=Beschreibung des Repository. Maximal 512 Zeichen.
+settings.description_length=Verfügbare Zeichen
 
 diff.browse_source=Quellcode durchsuchen
 diff.parent=Ursprung
@@ -916,9 +933,8 @@ team_name_helper=Unter diesem Namen können Sie in Diskussionen auf das Team ver
 team_desc_helper=Worum geht es bei diesem Team?
 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.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Einstellungen
 settings.options=Optionen
@@ -990,12 +1006,19 @@ first_page=Erste
 last_page=Letzte
 total=Gesamt: %d
 
+dashboard.build_info=Build-Informationen
+dashboard.app_ver=Anwendungsversion
+dashboard.git_version=Git-Version
+dashboard.go_version=Go-Version
+dashboard.build_time=Build-Zeit
+dashboard.build_commit=Build-Commit
 dashboard.statistic=Statistik
 dashboard.operations=Operationen
 dashboard.system_status=Systemmonitor-Status
 dashboard.statistic_info=Gogs Datenbank hat <b>%d</b> Benutzer, <b>%d</b> Organisationen, <b>%d</b> öffentliche Schlüssel, <b>%d</b> Repositories, <b>%d</b> Beobachtet, <b>%d</b> Favoriten, <b>%d</b> Aktionen, <b>%d</b> Zugriffe, <b>%d</b> Issues, <b>%d</b> Kommentare, <b>%d</b> Konten sozialer Medien, <b>%d</b> Folgende, <b>%d</b> Mirror, <b>%d</b> Releases, <b>%d</b> Login-Quellen, <b>%d</b> Webhooks, <b>%d</b> Meilensteine, <b>%d</b> Label, <b>%d</b> Hook-Tasks, <b>%d</b> Teams, <b>%d</b> Aktualisierungs-Tasks, <b>%d</b> Anhänge.
 dashboard.operation_name=Name der Operation
 dashboard.operation_switch=Wechseln
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Ausführen
 dashboard.clean_unbind_oauth=Nicht verbundene OAuths bereinigen
 dashboard.clean_unbind_oauth_success=Alle nicht verbundenen OAuth-Tokens wurden gelöscht.
@@ -1087,11 +1110,12 @@ repos.stars=Favoriten
 repos.issues=Issues
 repos.size=Größe
 
-auths.auth_manage_panel=Authentifizierung
+auths.auth_sources=Authentifizierungsquelle
 auths.new=Neue Quelle hinzufügen
 auths.name=Name
 auths.type=Typ
 auths.enabled=Aktiviert
+auths.default=Standard
 auths.updated=Aktualisiert
 auths.auth_type=Authentifizierungstyp
 auths.auth_name=Authentifizierungsname
@@ -1100,7 +1124,7 @@ auths.domain=Domain
 auths.host=Host
 auths.port=Port
 auths.bind_dn=DN binden
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Sie können "%s" als Platzhalter für den Benutzernamen einsetzen, z.B. DOM\%s
 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
@@ -1128,9 +1152,9 @@ auths.enable_tls=TLS-Verschlüsselung aktivieren
 auths.skip_tls_verify=TLS-Prüfung überspringen
 auths.pam_service_name=PAM Dienstname
 auths.enable_auto_register=Automatische Registrierung aktivieren
-auths.tips=Tipps
 auths.edit=Authentifizierungseinstellungen bearbeiten
 auths.activated=Diese Authentifizierung ist aktiv
+auths.default_auth=Diese Authentifizierungsmethode ist die Vorgabe
 auths.new_success=Neue Authentifizierung '%s' wurde erfolgreich hinzugefügt.
 auths.update_success=Die Authentifizierungseinstellungen wurden erfolgreich aktualisiert.
 auths.update=Authentifizierungseinstellungen aktualisieren
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Diese Authentifizierung wird gelöscht. Möchten Sie fort
 auths.still_in_used=Diese Authentifizierung wird noch von einigen Benutzern verwendet. Bitte löschen Sie diese Benutzer oder ändern Sie deren Anmeldetyp.
 auths.deletion_success=Authentifizierung wurde erfolgreich gelöscht!
 auths.login_source_exist=Login-Quelle '%s' ist bereits vorhanden.
+auths.github_api_endpoint=API Endpunkt
 
-config.not_set=(not set)
+config.not_set=(nicht festgelegt)
 config.server_config=Serverkonfiguration
-config.app_name=Name der Anwendung
-config.app_ver=Anwendungsversion
-config.app_url=Anwendungs-URL
-config.domain=Domain
-config.offline_mode=Offline-Modus
-config.disable_router_log=Router-Log deaktivieren
+config.brand_name=Markenname
 config.run_user=Ausführender Benutzer
 config.run_mode=Laufzeit-Modus
-config.git_version=Git Version
-config.static_file_root_path=Verzeichnis für statische Dateien
-config.log_file_root_path=Log-Verzeichnis
-config.reverse_auth_user=Nutzer bei Reverse-Authentifizierung
+config.server.external_url=Externe URL
+config.server.domain=Domäne
+config.server.protocol=Protokoll
+config.server.http_addr=HTTP-Adresse
+config.server.http_port=HTTP-Port
+config.server.cert_file=Zertifikatsdatei
+config.server.key_file=Schlüsseldatei
+config.server.tls_min_version=Minimale TLS-Version
+config.server.unix_socket_permission=Unix-Socket-Berechtigung
+config.server.local_root_url=Lokale Root-URL
+config.server.offline_mode=Offline-Modus
+config.server.disable_router_log=Router-Log deaktivieren
+config.server.enable_gzip=Gzip aktivieren
+config.server.app_data_path=Anwendungsdatenpfad
+config.server.load_assets_from_disk=Assets von Festplatte laden
+config.server.landing_url=Startseite
 
 config.ssh_config=SSH Konfiguration
-config.ssh_enabled=Aktiviert
-config.ssh_start_builtin_server=Eingebauten Server starten
-config.ssh_domain=Domain
-config.ssh_port=Port
-config.ssh_listen_port=Listen Port
-config.ssh_root_path=Verzeichnis
-config.ssh_key_test_path=Schlüssel-Test-Pfad
-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.ssh.enabled=Aktiviert
+config.ssh.domain=Exponierte Domain
+config.ssh.port=Exponierter Port
+config.ssh.root_path=Wurzelpfad
+config.ssh.keygen_path=Keygenpfad
+config.ssh.key_test_path=Schlüsseltestpfad
+config.ssh.minimum_key_size_check=Prüfung der Mindestschlüssellänge
+config.ssh.minimum_key_sizes=Mindestschlüssellängen
+config.ssh.rewrite_authorized_keys_at_start=Beim Start "authorized_keys" umschreiben
+config.ssh.start_builtin_server=Eingebauten Server starten
+config.ssh.listen_host=Listen-Host
+config.ssh.listen_port=Listen-Port
+config.ssh.server_ciphers=Serverchiffren
 
 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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Wurzelpfad
+config.repo.script_type=Skript-Typ
+config.repo.ansi_chatset=ANSI-Zeichensatz
+config.repo.force_private=Privat erzwingen
+config.repo.max_creation_limit=Maximales Erstellungslimit
+config.repo.preferred_licenses=Bevorzugte Lizenzen
+config.repo.disable_http_git=HTTP-Git deaktivieren
+config.repo.enable_local_path_migration=Lokale Pfadmigration aktivieren
+config.repo.enable_raw_file_render_mode=Darstellen von Roh-Dateien aktivieren
+config.repo.commits_fetch_concurrency=Anzahl gleichzeitiger Commit-/Fetch-Prozesse
+config.repo.editor.line_wrap_extensions=Editor Erweiterungen für Zeilenumbrüche
+config.repo.editor.previewable_file_modes=Vorschau der Dateimodi des Editors
+config.repo.upload.enabled=Upload aktiviert
+config.repo.upload.temp_path=Temporärer Pfad für Uploads
+config.repo.upload.allowed_types=Erlaubte Upload-Typen
+config.repo.upload.file_max_size=Upload-Dateigrößenlimit
+config.repo.upload.max_files=Upload-Dateilimit
 
 config.db_config=Datenbankkonfiguration
-config.db_type=Typ
-config.db_host=Host
-config.db_name=Name
-config.db_user=Benutzer
-config.db_ssl_mode=SSL-Modus
-config.db_ssl_mode_helper=(nur für "postgres")
-config.db_path=Verzeichnis
-config.db_path_helper=(für "sqlite3" und "tidb")
+config.db.type=Typ
+config.db.host=Host
+config.db.name=Name
+config.db.user=Benutzer
+config.db.ssl_mode=SSL-Modus
+config.db.ssl_mode_helper=(nur für "postgres")
+config.db.path=Pfad
+config.db.path_helper=(nur für "sqlite3")
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Service-Konfiguration
-config.register_email_confirm=E-Mail-Bestätigung bei Registrierung
-config.disable_register=Registrierung deaktivieren
-config.show_registration_button=Schaltfläche Registrieren anzeigen
-config.require_sign_in_view=Ansehen erfordert Anmeldung
-config.mail_notify=E-Mail-Benachrichtigung
-config.disable_key_size_check=Prüfung der Mindestschlüssellänge deaktiveren
-config.enable_captcha=Captcha aktivieren
-config.active_code_lives=Aktivierungscode Lebensdauer
-config.reset_password_code_lives=Passwortcode Lebensdauer
+config.security_config=Sicherheitskonfiguration
+config.security.login_remember_days=Anzahl Tage zum Speichern des Logins
+config.security.cookie_remember_name=Cookie merken
+config.security.cookie_username=Benutzernamen-Cookie
+config.security.cookie_secure=Sicheres Cookie aktivieren
+config.security.reverse_proxy_auth_user=Reverse-Proxy-Authentifizierungs-Header
+config.security.enable_login_status_cookie=Login-Status-Cookie aktivieren
+config.security.login_status_cookie_name=Login-Status-Cookie
 
-config.webhook_config=Webhook-Konfiguration
-config.queue_length=Warteschlangenlänge
-config.deliver_timeout=Zeitlimit für Zustellung
-config.skip_tls_verify=TLS verifikation überspringen
+config.email_config=E-Mail-Konfiguration
+config.email.enabled=Aktiviert
+config.email.subject_prefix=Betreff-Präfix
+config.email.host=Host
+config.email.from=Von
+config.email.user=Benutzer
+config.email.disable_helo=HELO deaktivieren
+config.email.helo_hostname=HELO Hostname
+config.email.skip_verify=Zertifikatsüberprüfung überspringen
+config.email.use_certificate=Benutzerdefiniertes Zertifikat verwenden
+config.email.cert_file=Zertifikatsdatei
+config.email.key_file=Schlüsseldatei
+config.email.use_plain_text=Klartext verwenden
+config.email.add_plain_text_alt=Klartext-Alternative hinzufügen
+config.email.send_test_mail=Test-E-Mail senden
+config.email.test_mail_failed=Fehler beim Senden der Test-E-Mail an '%s': %v
+config.email.test_mail_sent=Test-E-Mail wurde an '%s ' gesendet.
 
-config.mailer_config=Mailer-Konfiguration
-config.mailer_enabled=Aktiviert
-config.mailer_disable_helo=HELO Deaktivieren
-config.mailer_name=Name
-config.mailer_host=Host
-config.mailer_user=Benutzer
-config.send_test_mail=Test-E-Mail senden
-config.test_mail_failed=Das Senden der Test-E-Mail an '%s': %v ist fehlgeschlagen
-config.test_mail_sent=Test-E-Mail wurde an '%s' gesendet.
+config.auth_config=Authentifizierungskonfiguration
+config.auth.activate_code_lives=Aktivierungscode Lebensdauer
+config.auth.reset_password_code_lives=Gültigkeitsdauer Zurücksetzungs-Code
+config.auth.require_email_confirm=E-Mail-Bestätigung erforderlich
+config.auth.require_sign_in_view=Anmeldung erforderlich
+config.auth.disable_registration=Registrierung deaktivieren
+config.auth.enable_registration_captcha=Registrierungs-Captcha aktivieren
+config.auth.enable_reverse_proxy_authentication=Reverse-Proxy-Authentifizierung aktivieren
+config.auth.enable_reverse_proxy_auto_registration=Automatische Reverse-Proxy-Registrierung aktivieren
+config.auth.reverse_proxy_authentication_header=Reverse-Proxy-Authentifizierungs-Header
 
-config.oauth_config=OAuth-Konfiguration
-config.oauth_enabled=Aktiviert
-
-config.cache_config=Cache-Konfiguration
-config.cache_adapter=Cache-Adapter
-config.cache_interval=Cache-Intervall
-config.cache_conn=Cache-Anbindung
+config.user_config=Benutzerkonfiguration
+config.user.enable_email_notify=E-Mail-Benachrichtigung aktivieren
 
 config.session_config=Session-Konfiguration
-config.session_provider=Session-Provider
-config.provider_config=Provider-Einstellungen
-config.cookie_name=Cookie-Name
-config.enable_set_cookie=Cookies verwenden
-config.gc_interval_time=GC-Intervall
-config.session_life_time=Session-Lebensdauer
-config.https_only=Nur HTTPS
-config.cookie_life_time=Cookie-Lebensdauer
+config.session.provider=Anbieter
+config.session.provider_config=Anbieter-Konfiguration
+config.session.cookie_name=Cookie
+config.session.https_only=Nur HTTPS
+config.session.gc_interval=GC-Intervall
+config.session.max_life_time=Maximale Lebensdauer
+config.session.csrf_cookie_name=CSRF-Cookie
+
+config.cache_config=Cache-Konfiguration
+config.cache.adapter=Adapter
+config.cache.interval=GC-Intervall
+config.cache.host=Host
+
+config.http_config=HTTP-Konfiguration
+config.http.access_control_allow_origin=Access-Control-Allow-Origin
+
+config.attachment_config=Anhang-Konfiguration
+config.attachment.enabled=Aktiviert
+config.attachment.path=Pfad
+config.attachment.allowed_types=Erlaubte Typen
+config.attachment.max_size=Größenlimit
+config.attachment.max_files=Dateilimit
+
+config.release_config=Release-Konfiguration
+config.release.attachment.enabled=Anhang aktiviert
+config.release.attachment.allowed_types=Erlaubte Anhang-Typen
+config.release.attachment.max_size=Größenlimit für Anhang
+config.release.attachment.max_files=Dateilimit für Anhang
 
 config.picture_config=Konfiguration der Profilbilder
-config.picture_service=Bildservice
-config.disable_gravatar=Gravatar deaktivieren
-config.enable_federated_avatar=Föderierte Profilbilder einschalten
+config.picture.avatar_upload_path=Benutzer-Avatar Upload-Pfad
+config.picture.repo_avatar_upload_path=Repository-Avatar Upload-Pfad
+config.picture.gravatar_source=Gravatar-Quelle
+config.picture.disable_gravatar=Gravatar deaktivieren
+config.picture.enable_federated_avatar=Föderierte Avatare aktivieren
+
+config.mirror_config=Mirror-Konfiguration
+config.mirror.default_interval=Standardintervall
+
+config.webhook_config=Webhook-Konfiguration
+config.webhook.types=Typen
+config.webhook.deliver_timeout=Zeitlimit für Zustellung
+config.webhook.skip_tls_verify=TLS-Prüfung überspringen
 
 config.git_config=Git Konfiguration
-config.git_disable_diff_highlight=Diff Syntaxhervorhebung ausschalten
-config.git_max_diff_lines=Max Diff Zeilen (in einer Datei)
-config.git_max_diff_line_characters=Max Diff Zeichen (in einer Zeile)
-config.git_max_diff_files=Max Diff Dateien (Anzeige)
-config.git_gc_args=GC-Argumente
-config.git_migrate_timeout=Zeitlimit für Migration
-config.git_mirror_timeout=Zeitlimit für Mirror-Aktualisierung
-config.git_clone_timeout=Zeitlimit für Clone
-config.git_pull_timeout=Zeitlimit für Pull
-config.git_gc_timeout=Zeitlimit für GC
+config.git.disable_diff_highlight=Diff-Syntaxhervorhebung ausschalten
+config.git.max_diff_lines=Zeilenlimit für Diff (für eine einzelne Datei)
+config.git.max_diff_line_characters=Zeichenlimit für Diff (für eine einzelne Datei)
+config.git.max_diff_files=Dateilimit für Diff (für einen einzelnen Diff)
+config.git.gc_args=GC-Argumente
+config.git.migrate_timeout=Zeitlimit für Migration
+config.git.mirror_timeout=Zeitlimit zum Spiegeln
+config.git.clone_timeout=Clone-Timeout
+config.git.pull_timeout=Pull-Timeout
+config.git.gc_timeout=GC-Timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Konfiguration des Loggings
+config.log_file_root_path=Log-Verzeichnis
 config.log_mode=Modus
 config.log_options=Optionen
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Systemmitteilungen wurden erfolgreich gelöscht.
 
 [action]
 create_repo=hat das Repository <a href="%s">%s</a> erstellt
-fork_repo=hat das Repository nach <a href="%s">%s</a> geforkt
 rename_repo=hat das Repository von <code>%[1]s</code> zu <a href="%[2]s">%[3]s</a> umbenannt
 commit_repo=hat auf <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a> gepusht
 compare_commits=Zeige Vergleich für diese %d Commits
@@ -1295,11 +1379,15 @@ comment_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> kommentiert`
 create_pull_request=`hat Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> erstellt`
 close_pull_request=`hat Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> geschlossen`
 reopen_pull_request=`hat den Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> wieder geöffnet`
-merge_pull_request=`hat Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> zuammengeführt`
+merge_pull_request=`hat Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> zusammengeführt`
 create_branch=hat neuen Branch <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a> angelegt
 delete_branch=hat Branch <code>%[2]s</code> in <a href="%[1]s">%[3]s</a> gelöscht
 push_tag=hat Tag <a href="%s/src/%s">%[2]s</a> auf <a href="%[1]s">%[3]s</a> gepusht
 delete_tag=hat Tag <code>%[2]s</code> in <a href="%[1]s">%[3]s</a> gelöscht
+fork_repo=hat das Repository nach <a href="%s">%s</a> geforkt
+mirror_sync_push=hat auf <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a> gepusht
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=vor
@@ -1321,6 +1409,7 @@ months=%[2]s %[1]d Monaten
 years=%[2]s %[1]d Jahren
 raw_seconds=Sekunden
 raw_minutes=Minuten
+raw_hours=Stunden
 
 [dropzone]
 default_message=Zum Hochladen hier klicken oder Datei hier ablegen.

conf/locale/locale_en-GB.ini

@@ -9,7 +9,6 @@ sign_out=Sign Out
 sign_up=Sign Up
 register=Register
 website=Website
-version=Version
 page=Page
 template=Template
 language=Language
@@ -44,6 +43,10 @@ issues=Issues
 
 cancel=Cancel
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Installation
 title=Install Steps For First-time Run
@@ -122,6 +125,7 @@ run_user_not_match=Run user isn't the current user: %s -> %s
 smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=SMTP From field is not valid: %v
 save_config_failed=Fail to save configuration: %v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=Admin account setting is invalid: %v
 install_success=Welcome! We're glad that you chose Gogs, have fun and take care.
 invalid_log_root_path=Log root path is invalid: %v
@@ -151,6 +155,8 @@ 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.
+auth_source=Authentication Source
+local=Local
 remember_me=Remember Me
 forgot_password=Forgot Password
 forget_password=Forgot password?
@@ -229,6 +235,7 @@ org_name_been_taken=Organisation name has already been taken.
 team_name_been_taken=Team name has already been taken.
 email_been_used=Email address has already been used.
 username_password_incorrect=Username or password is not correct.
+auth_source_mismatch=The authentication source selected is not associated with the user.
 enterred_invalid_repo_name=Please make sure that the repository name you have entered is correct.
 enterred_invalid_owner_name=Please make sure that the owner name you have entered is correct.
 enterred_invalid_password=Please make sure the that password you have entered is correct.
@@ -256,8 +263,7 @@ following=Following
 follow=Follow
 unfollow=Unfollow
 
-form.name_reserved=Username '%s' is reserved.
-form.name_pattern_not_allowed=Username pattern '%s' is not allowed.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profile
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Or enter the secret:
 two_factor_then_enter_passcode=Then enter passcode:
 two_factor_verify=Verify
 two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_reused_passcode=The passcode you entered has already been used, please try another one!
 two_factor_enable_error=Enable Two-factor authentication failed: %v
 two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
 two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
@@ -370,6 +377,7 @@ delete_token=Delete
 access_token_deletion=Personal Access Token Deletion
 access_token_deletion_desc=Delete this personal access token will remove all related accesses of application. Do you want to continue?
 delete_token_success=Personal access token has been removed successfully! Don't forget to update your application as well.
+token_name_exists=Token with same name already exists.
 
 orgs.none=You are not a member of any organisations.
 orgs.leave_title=Leave organisation
@@ -417,10 +425,11 @@ mirror_last_synced=Last Synced
 watchers=Watchers
 stargazers=Stargazers
 forks=Forks
+repo_description_helper=Description of repository. Maximum 512 characters length.
+repo_description_length=Available characters
 
 form.reach_limit_of_creation=The owner has reached maximum creation limit of %d repositories.
-form.name_reserved=Repository name '%s' is reserved.
-form.name_pattern_not_allowed=Repository name pattern '%s' is not allowed.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Need Authorisation
 migrate_type=Migration Type
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=File content has been changed since you starte
 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.fail_to_delete_file=Failed to delete 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'
@@ -634,6 +644,7 @@ pulls.cannot_auto_merge_desc=This pull request can't be merged automatically bec
 pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.create_merge_commit=Create a merge commit
 pulls.rebase_before_merging=Rebase before merging
+pulls.commit_description=Commit Description
 pulls.merge_pull_request=Merge Pull Request
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
 pulls.delete_branch=Delete Branch
@@ -738,7 +749,7 @@ settings.tracker_issue_style=External Issue Tracker Naming Style:
 settings.tracker_issue_style.numeric=Numeric
 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.pulls_desc=Enable pull requests to accept contributions between repositories and branches
 settings.pulls.ignore_whitespace=Ignore changes in whitespace
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Danger Zone
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Repository wiki data have been erased successfull
 settings.delete=Delete This Repository
 settings.delete_desc=Once you delete a repository, there is no going back. Please be certain.
 settings.delete_notices_1=- This operation <strong>CANNOT</strong> be undone.
-settings.delete_notices_2=- This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators.
+settings.delete_notices_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
 settings.delete_notices_fork_1=- All forks will become independent after deletion.
 settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=Repository options has been updated successfully.
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=This user will no longer have collaboration
 settings.remove_collaborator_success=Collaborator has been removed.
 settings.search_user_placeholder=Search user...
 settings.org_not_allowed_to_be_collaborator=Organisation is not allowed to 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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Add Webhook
 settings.webhook_deletion=Delete Webhook
 settings.webhook_deletion_desc=Delete this webhook will remove its information and all delivery history. Do you want to continue?
 settings.webhook_deletion_success=Webhook has been deleted successfully!
@@ -792,6 +805,8 @@ settings.webhook.response=Response
 settings.webhook.headers=Headers
 settings.webhook.payload=Payload
 settings.webhook.body=Body
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git Hooks are powered by Git itself, you can edit files of supported hooks in the list below to perform custom operations.
 settings.githook_edit_desc=If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook.
 settings.githook_name=Hook Name
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push to a repository
 settings.event_issues=Issues
 settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment=Issue Comment
-settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_pull_request=Pull Request
 settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_release=Release
 settings.event_release_desc=Release published in a repository.
 settings.active=Active
@@ -852,6 +867,8 @@ settings.add_key_success=New deploy key '%s' has been added successfully!
 settings.deploy_key_deletion=Delete Deploy Key
 settings.deploy_key_deletion_desc=Deleting this deploy key will remove all related accesses for this repository. Do you want to continue?
 settings.deploy_key_deletion_success=Deploy key has been deleted successfully!
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=Browse Source
 diff.parent=parent
@@ -916,9 +933,8 @@ team_name_helper=You'll use this name to mention this team in conversations.
 team_desc_helper=What is this team all about?
 team_permission_desc=What permission level should this team have?
 
-form.name_reserved=Organisation name '%s' is reserved.
-form.name_pattern_not_allowed=Organisation name pattern '%s' is not allowed.
-form.team_name_reserved=Team name '%s' is reserved.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Settings
 settings.options=Options
@@ -990,12 +1006,19 @@ first_page=First
 last_page=Last
 total=Total: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Statistics
 dashboard.operations=Operations
 dashboard.system_status=System Monitor Status
 dashboard.statistic_info=Gogs database has <b>%d</b> users, <b>%d</b> organisations, <b>%d</b> public keys, <b>%d</b> repositories, <b>%d</b> watches, <b>%d</b> stars, <b>%d</b> actions, <b>%d</b> accesses, <b>%d</b> issues, <b>%d</b> comments, <b>%d</b> social accounts, <b>%d</b> follows, <b>%d</b> mirrors, <b>%d</b> releases, <b>%d</b> login sources, <b>%d</b> webhooks, <b>%d</b> milestones, <b>%d</b> labels, <b>%d</b> hook tasks, <b>%d</b> teams, <b>%d</b> update tasks, <b>%d</b> attachments.
 dashboard.operation_name=Operation Name
 dashboard.operation_switch=Switch
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Run
 dashboard.clean_unbind_oauth=Clean unbound OAuthes
 dashboard.clean_unbind_oauth_success=All unbind OAuthes have been deleted successfully.
@@ -1087,11 +1110,12 @@ repos.stars=Stars
 repos.issues=Issues
 repos.size=Size
 
-auths.auth_manage_panel=Authentication Manage Panel
+auths.auth_sources=Authentication Sources
 auths.new=Add New Source
 auths.name=Name
 auths.type=Type
 auths.enabled=Enabled
+auths.default=Default
 auths.updated=Updated
 auths.auth_type=Authentication Type
 auths.auth_name=Authentication Name
@@ -1128,9 +1152,9 @@ auths.enable_tls=Enable TLS Encryption
 auths.skip_tls_verify=Skip TLS Verify
 auths.pam_service_name=PAM Service Name
 auths.enable_auto_register=Enable Auto Registration
-auths.tips=Tips
 auths.edit=Edit Authentication Setting
 auths.activated=This authentication is activated
+auths.default_auth=This authentication is default login source
 auths.new_success=New authentication '%s' has been added successfully.
 auths.update_success=Authentication setting has been updated successfully.
 auths.update=Update Authentication Setting
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=This authentication is going to be deleted, do you want t
 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.github_api_endpoint=API Endpoint
 
 config.not_set=(not set)
 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.disable_router_log=Disable Router Log
+config.brand_name=Brand name
 config.run_user=Run User
 config.run_mode=Run Mode
-config.git_version=Git Version
-config.static_file_root_path=Static File Root Path
-config.log_file_root_path=Log File Root Path
-config.reverse_auth_user=Reverse Authentication User
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH Configuration
-config.ssh_enabled=Enabled
-config.ssh_start_builtin_server=Start Builtin Server
-config.ssh_domain=Domain
-config.ssh_port=Port
-config.ssh_listen_port=Listen Port
-config.ssh_root_path=Root Path
-config.ssh_key_test_path=Key Test Path
-config.ssh_keygen_path=Keygen ('ssh-keygen') Path
-config.ssh_minimum_key_size_check=Minimum Key Size Check
-config.ssh_minimum_key_sizes=Minimum Key Sizes
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 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 Licences
-config.disable_http_git=Disable HTTP Git
-config.enable_local_path_migration=Enable Local Path Migration
-config.commits_fetch_concurrency=Commits Fetch Concurrency
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Database Configuration
-config.db_type=Type
-config.db_host=Host
-config.db_name=Name
-config.db_user=User
-config.db_ssl_mode=SSL Mode
-config.db_ssl_mode_helper=(for "postgres" only)
-config.db_path=Path
-config.db_path_helper=(for "sqlite3" and "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Service Configuration
-config.register_email_confirm=Require Email Confirmation
-config.disable_register=Disable Registration
-config.show_registration_button=Show Register Button
-config.require_sign_in_view=Require Sign In View
-config.mail_notify=Mail Notification
-config.disable_key_size_check=Disable Minimum Key Size Check
-config.enable_captcha=Enable Captcha
-config.active_code_lives=Active Code Lives
-config.reset_password_code_lives=Reset Password Code Lives
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Webhook Configuration
-config.queue_length=Queue Length
-config.deliver_timeout=Deliver Timeout
-config.skip_tls_verify=Skip TLS Verify
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Mailer Configuration
-config.mailer_enabled=Enabled
-config.mailer_disable_helo=Disable HELO
-config.mailer_name=Name
-config.mailer_host=Host
-config.mailer_user=User
-config.send_test_mail=Send Test Email
-config.test_mail_failed=Fail to send test email to '%s': %v
-config.test_mail_sent=Test email has been sent to '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth Configuration
-config.oauth_enabled=Enabled
-
-config.cache_config=Cache Configuration
-config.cache_adapter=Cache Adapter
-config.cache_interval=Cache Interval
-config.cache_conn=Cache Connection
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Session Configuration
-config.session_provider=Session Provider
-config.provider_config=Provider Config
-config.cookie_name=Cookie Name
-config.enable_set_cookie=Enable Set Cookie
-config.gc_interval_time=GC Interval Time
-config.session_life_time=Session Life Time
-config.https_only=HTTPS Only
-config.cookie_life_time=Cookie Life Time
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Cache Configuration
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP Configuration
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Picture Configuration
-config.picture_service=Picture Service
-config.disable_gravatar=Disable Gravatar
-config.enable_federated_avatar=Enable Federated Avatars
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Webhook Configuration
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 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.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Log Configuration
+config.log_file_root_path=Log File Root Path
 config.log_mode=Mode
 config.log_options=Options
 
@@ -1283,7 +1368,6 @@ notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=created repository <a href="%s">%s</a>
-fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a>
 commit_repo=pushed to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
 compare_commits=View comparison for these %d commits
@@ -1300,6 +1384,10 @@ create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href=
 delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a>
 delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=ago
@@ -1321,6 +1409,7 @@ months=%d months %s
 years=%d years %s
 raw_seconds=seconds
 raw_minutes=minutes
+raw_hours=hours
 
 [dropzone]
 default_message=Drop files here or click to upload.

conf/locale/locale_en-US.ini

@@ -9,7 +9,6 @@ sign_out = Sign Out
 sign_up = Sign Up
 register = Register
 website = Website
-version = Version
 page = Page
 template = Template
 language = Language
@@ -44,6 +43,10 @@ issues = Issues
 
 cancel = Cancel
 
+[status]
+page_not_found = Page Not Found
+internal_server_error = Internal Server Error
+
 [install]
 install = Installation
 title = Install Steps For First-time Run
@@ -107,21 +110,22 @@ enable_captcha = Enable Captcha
 enable_captcha_popup = Require validate captcha for user self-registration.
 require_sign_in_view = Enable Require Sign In to View Pages
 require_sign_in_view_popup = Only signed in users can view pages, visitors will only be able to see sign in/up pages.
-admin_setting_desc = You do not have to create an admin account right now, user whoever ID=1 will gain admin access automatically.
+admin_setting_desc = You don't need to create an admin account right now. The first user in the users table will be automatically granted admin access.
 admin_title = Admin Account Settings
 admin_name = Username
 admin_password = Password
 confirm_password = Confirm Password
 admin_email = Admin Email
 install_gogs = Install Gogs
-test_git_failed = Fail to test 'git' command: %v
+test_git_failed = Failed to test 'git' command: %v
 sqlite3_not_available = Your release version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version.
 invalid_db_setting = Database setting is not correct: %v
 invalid_repo_path = Repository root path is invalid: %v
 run_user_not_match = Run user isn't the current user: %s -> %s
-smtp_host_missing_port = SMTP Host is missing port in address.
-invalid_smtp_from = SMTP From field is not valid: %v
-save_config_failed = Fail to save configuration: %v
+smtp_host_missing_port = SMTP Host port missing from address.
+invalid_smtp_from = SMTP From field is invalid: %v
+save_config_failed = Failed to save configuration: %v
+init_failed = Failed to initialize application: %v
 invalid_admin_setting = Admin account setting is invalid: %v
 install_success = Welcome! We're glad that you chose Gogs, have fun and take care.
 invalid_log_root_path = Log root path is invalid: %v
@@ -151,6 +155,8 @@ 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, email services are disabled. Please contact the site administrator.
+auth_source = Authentication Source
+local = Local
 remember_me = Remember Me
 forgot_password= Forgot Password
 forget_password = Forgot password?
@@ -158,15 +164,15 @@ sign_up_now = Need an account? Sign up now.
 confirmation_mail_sent_prompt = A new confirmation email has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete the registration process.
 active_your_account = Activate Your Account
 prohibit_login = Login Prohibited
-prohibit_login_desc = Your account is prohibited to login, please contact site admin.
+prohibit_login_desc = Your account is prohibited from logging in. Please contact the site admin.
 resent_limit_prompt = Sorry, you already requested an activation email recently. Please wait 3 minutes then try again.
-has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (<b>%s</b>). If you haven't received a confirmation email or need to resend a new one, please click on the button below.
+has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (<b>%s</b>). If you haven't received a confirmation email or need to receive a new one, please click the button below.
 resend_mail = Click here to resend your activation email
 send_reset_mail = Click here to (re)send your password reset email
 reset_password = Reset Your Password
 invalid_code = Sorry, your confirmation code has expired or not valid.
 reset_password_helper = Click here to reset your password
-password_too_short = Password length cannot be less then 6.
+password_too_short = Password length must be at least 6 characters.
 non_local_account = Non-local accounts cannot change passwords through Gogs.
 
 login_two_factor = Two-factor Authentication
@@ -175,7 +181,7 @@ login_two_factor_enter_recovery_code = Enter a two-factor recovery code
 login_two_factor_recovery = Two-factor Recovery
 login_two_factor_recovery_code = Recovery Code
 login_two_factor_enter_passcode = Enter a two-factor passcode
-login_two_factor_invalid_recovery_code = Recovery code has been used or does not valid.
+login_two_factor_invalid_recovery_code = Recovery code already used or invalid.
 
 [mail]
 activate_account = Please activate your account
@@ -210,10 +216,10 @@ TreeName = File path
 Content = Content
 
 require_error = ` cannot be empty.`
-alpha_dash_error = ` must be valid alpha or numeric or dash(-_) characters.`
-alpha_dash_dot_error = ` must be valid alpha or numeric or dash(-_) or dot characters.`
-alpha_dash_dot_slash_error = ` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
-size_error  = ` must be size %s.`
+alpha_dash_error = ` must be alphanumeric or dash(-_) characters.`
+alpha_dash_dot_error = ` must be alphanumeric or dash(-_) or dot characters.`
+alpha_dash_dot_slash_error = ` must be alphanumeric, dash (-_), dot or slash characters.`
+size_error  = ` size must be %s.`
 min_size_error = ` must contain at least %s characters.`
 max_size_error = ` must contain at most %s characters.`
 email_error = ` is not a valid email address.`
@@ -229,14 +235,15 @@ org_name_been_taken = Organization name has already been taken.
 team_name_been_taken = Team name has already been taken.
 email_been_used = Email address has already been used.
 username_password_incorrect = Username or password is not correct.
+auth_source_mismatch = The authentication source selected is not associated with the user.
 enterred_invalid_repo_name = Please make sure that the repository name you entered is correct.
 enterred_invalid_owner_name = Please make sure that the owner name you entered is correct.
 enterred_invalid_password = Please make sure the that password you entered is correct.
 user_not_exist = Given user does not exist.
-last_org_owner = Removing the last user from a owner team isn't allowed, as there must always be at least one owner in any given organization.
+last_org_owner = Removing the last remaining user from an owner team is not allowed, as an organization must always have at least one owner.
 
-invalid_ssh_key = Sorry, we're not able to verify your SSH key: %s
-unable_verify_ssh_key = Gogs cannot verify your SSH key, but we assume that it is valid, please double-check it.
+invalid_ssh_key = Sorry, verification of your SSH key failed: %s
+unable_verify_ssh_key = Gogs cannot verify your SSH key, but it's assumed to be valid. Please double-check it.
 auth_failed = Authentication failed: %v
 
 still_own_repo = Your account still has ownership over at least one repository, you have to delete or transfer them first.
@@ -256,8 +263,7 @@ following = Following
 follow = Follow
 unfollow = Unfollow
 
-form.name_reserved = Username '%s' is reserved.
-form.name_pattern_not_allowed = Username pattern '%s' is not allowed.
+form.name_not_allowed = User name or pattern %q is not allowed.
 
 [settings]
 profile = Profile
@@ -297,7 +303,7 @@ old_password = Current Password
 new_password = New Password
 retype_new_password = Retype New Password
 password_incorrect = Current password is not correct.
-change_password_success = Your password was successfully changed. You can now sign using this new password.
+change_password_success = Your password was successfully changed and can now be used for logging in.
 password_change_disabled = Non-local type users are not allowed to change their password.
 
 emails = Email Addresses
@@ -348,6 +354,7 @@ two_factor_or_enter_secret = Or enter the secret:
 two_factor_then_enter_passcode = Then enter passcode:
 two_factor_verify = Verify
 two_factor_invalid_passcode = The passcode you entered is not valid, please try again!
+two_factor_reused_passcode = The passcode you entered has already been used, please try another one!
 two_factor_enable_error = Enable Two-factor authentication failed: %v
 two_factor_enable_success = Two-factor authentication has enabled for your account successfully!
 two_factor_recovery_codes_title = Two-factor Authentication Recovery Codes
@@ -370,6 +377,7 @@ delete_token = Delete
 access_token_deletion = Personal Access Token Deletion
 access_token_deletion_desc = Delete this personal access token will remove all related accesses of application. Do you want to continue?
 delete_token_success = Personal access token has been removed successfully! Don't forget to update your application as well.
+token_name_exists = Token with same name already exists.
 
 orgs.none = You are not a member of any organizations.
 orgs.leave_title = Leave organization
@@ -417,10 +425,11 @@ mirror_last_synced = Last Synced
 watchers = Watchers
 stargazers = Stargazers
 forks = Forks
+repo_description_helper = Description of repository. Maximum 512 characters length.
+repo_description_length = Available characters
 
 form.reach_limit_of_creation = The owner has reached maximum creation limit of %d repositories.
-form.name_reserved = Repository name '%s' is reserved.
-form.name_pattern_not_allowed = Repository name pattern '%s' is not allowed.
+form.name_not_allowed = Repository name or pattern %q is not allowed.
 
 need_auth = Need Authorization
 migrate_type = Migration Type
@@ -514,6 +523,7 @@ editor.file_changed_while_editing = File content has been changed since you star
 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.fail_to_delete_file = Failed to delete 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'
@@ -634,6 +644,7 @@ pulls.cannot_auto_merge_desc = This pull request can't be merged automatically b
 pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts.
 pulls.create_merge_commit = Create a merge commit
 pulls.rebase_before_merging = Rebase before merging
+pulls.commit_description = Commit Description
 pulls.merge_pull_request = Merge Pull Request
 pulls.open_unmerged_pull_exists = `You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
 pulls.delete_branch = Delete Branch
@@ -738,7 +749,7 @@ settings.tracker_issue_style = External Issue Tracker Naming Style:
 settings.tracker_issue_style.numeric = Numeric
 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.pulls_desc = Enable pull requests to accept contributions between repositories and branches
 settings.pulls.ignore_whitespace = Ignore changes in whitespace
 settings.pulls.allow_rebase_merge = Allow use rebase to merge commits
 settings.danger_zone = Danger Zone
@@ -777,8 +788,10 @@ 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.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.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.
+settings.webhooks.add_new = Add a new webhook:
+settings.webhooks.choose_a_type = Choose a type...
+settings.add_webhook = Add webhook
 settings.webhook_deletion = Delete Webhook
 settings.webhook_deletion_desc = Delete this webhook will remove its information and all delivery history. Do you want to continue?
 settings.webhook_deletion_success = Webhook has been deleted successfully!
@@ -792,6 +805,8 @@ settings.webhook.response = Response
 settings.webhook.headers = Headers
 settings.webhook.payload = Payload
 settings.webhook.body = Body
+settings.webhook.err_cannot_parse_payload_url = Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses = Non admins are not allowed to use local addresses.
 settings.githooks_desc = Git Hooks are powered by Git itself, you can edit files of supported hooks in the list below to perform custom operations.
 settings.githook_edit_desc = If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook.
 settings.githook_name = Hook Name
@@ -806,9 +821,9 @@ settings.slack_username = Username
 settings.slack_icon_url = Icon URL
 settings.slack_color = Color
 settings.event_desc = When should this webhook be triggered?
-settings.event_push_only = Just the <code>push</code> event.
-settings.event_send_everything = I need <strong>everything</strong>.
-settings.event_choose = Let me choose what I need.
+settings.event_push_only = Just the <code>push</code> event
+settings.event_send_everything = I need <strong>everything</strong>
+settings.event_choose = Let me choose what I need
 settings.event_create = Create
 settings.event_create_desc = Branch or tag created
 settings.event_delete = Delete
@@ -819,10 +834,10 @@ settings.event_push = Push
 settings.event_push_desc = Git push to a repository
 settings.event_issues = Issues
 settings.event_issues_desc = Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment = Issue Comment
-settings.event_issue_comment_desc = Issue comment created, edited, or deleted.
 settings.event_pull_request = Pull Request
 settings.event_pull_request_desc = Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_issue_comment = Issue Comment
+settings.event_issue_comment_desc = Issue comment created, edited, or deleted.
 settings.event_release = Release
 settings.event_release_desc = Release published in a repository.
 settings.active = Active
@@ -852,6 +867,8 @@ settings.add_key_success = New deploy key '%s' has been added successfully!
 settings.deploy_key_deletion = Delete Deploy Key
 settings.deploy_key_deletion_desc = Deleting this deploy key will remove all related accesses for this repository. Do you want to continue?
 settings.deploy_key_deletion_success = Deploy key has been deleted successfully!
+settings.description_desc = Description of repository. Maximum 512 characters length.
+settings.description_length = Available characters
 
 diff.browse_source = Browse Source
 diff.parent = parent
@@ -916,9 +933,8 @@ team_name_helper = You'll use this name to mention this team in conversations.
 team_desc_helper = What is this team all about?
 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.
+form.name_not_allowed = Organization name or pattern %q is not allowed.
+form.team_name_not_allowed = Team name or pattern %q is not allowed.
 
 settings = Settings
 settings.options = Options
@@ -990,12 +1006,19 @@ first_page = First
 last_page = Last
 total = Total: %d
 
+dashboard.build_info = Build Information
+dashboard.app_ver = Application version
+dashboard.git_version = Git version
+dashboard.go_version = Go version
+dashboard.build_time = Build time
+dashboard.build_commit = Build commit
 dashboard.statistic = Statistics
 dashboard.operations = Operations
 dashboard.system_status = System Monitor Status
 dashboard.statistic_info = Gogs database has <b>%d</b> users, <b>%d</b> organizations, <b>%d</b> public keys, <b>%d</b> repositories, <b>%d</b> watches, <b>%d</b> stars, <b>%d</b> actions, <b>%d</b> accesses, <b>%d</b> issues, <b>%d</b> comments, <b>%d</b> social accounts, <b>%d</b> follows, <b>%d</b> mirrors, <b>%d</b> releases, <b>%d</b> login sources, <b>%d</b> webhooks, <b>%d</b> milestones, <b>%d</b> labels, <b>%d</b> hook tasks, <b>%d</b> teams, <b>%d</b> update tasks, <b>%d</b> attachments.
 dashboard.operation_name = Operation Name
 dashboard.operation_switch = Switch
+dashboard.select_operation_to_run = Please select operation to run
 dashboard.operation_run = Run
 dashboard.clean_unbind_oauth = Clean unbound OAuthes
 dashboard.clean_unbind_oauth_success = All unbind OAuthes have been deleted successfully.
@@ -1087,11 +1110,12 @@ repos.stars = Stars
 repos.issues = Issues
 repos.size = Size
 
-auths.auth_manage_panel = Authentication Manage Panel
+auths.auth_sources = Authentication Sources
 auths.new = Add New Source
 auths.name = Name
 auths.type = Type
 auths.enabled = Enabled
+auths.default = Default
 auths.updated = Updated
 auths.auth_type = Authentication Type
 auths.auth_name = Authentication Name
@@ -1128,9 +1152,9 @@ auths.enable_tls = Enable TLS Encryption
 auths.skip_tls_verify = Skip TLS Verify
 auths.pam_service_name = PAM Service Name
 auths.enable_auto_register = Enable Auto Registration
-auths.tips = Tips
 auths.edit = Edit Authentication Setting
 auths.activated = This authentication is activated
+auths.default_auth =  This authentication is default login source
 auths.new_success = New authentication '%s' has been added successfully.
 auths.update_success = Authentication setting has been updated successfully.
 auths.update = Update Authentication Setting
@@ -1140,119 +1164,181 @@ auths.delete_auth_desc = This authentication is going to be deleted, do you want
 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.github_api_endpoint = API Endpoint
 
 config.not_set = (not set)
-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.disable_router_log = Disable Router Log
-config.run_user = Run User
-config.run_mode = Run Mode
-config.git_version = Git Version
-config.static_file_root_path = Static File Root Path
-config.log_file_root_path = Log File Root Path
-config.reverse_auth_user = Reverse Authentication User
+config.server_config = Server configuration
+config.brand_name = Brand name
+config.run_user = Run user
+config.run_mode = Run mode
+config.server.external_url = External URL
+config.server.domain = Domain
+config.server.protocol = Protocol
+config.server.http_addr = HTTP address
+config.server.http_port = HTTP port
+config.server.cert_file = Certificate file
+config.server.key_file = Key file
+config.server.tls_min_version = Minimum TLS version
+config.server.unix_socket_permission = Unix socket permission
+config.server.local_root_url = Local root URL
+config.server.offline_mode = Offline mode
+config.server.disable_router_log = Disable router log
+config.server.enable_gzip = Enable Gzip
+config.server.app_data_path = Application data path
+config.server.load_assets_from_disk = Load assets from disk
+config.server.landing_url = Landing URL
 
-config.ssh_config = SSH Configuration
-config.ssh_enabled = Enabled
-config.ssh_start_builtin_server = Start Builtin Server
-config.ssh_domain = Domain
-config.ssh_port = Port
-config.ssh_listen_port = Listen Port
-config.ssh_root_path = Root Path
-config.ssh_key_test_path = Key Test Path
-config.ssh_keygen_path = Keygen ('ssh-keygen') Path
-config.ssh_minimum_key_size_check = Minimum Key Size Check
-config.ssh_minimum_key_sizes = Minimum Key Sizes
+config.ssh_config = SSH configuration
+config.ssh.enabled = Enabled
+config.ssh.domain = Exposed domain
+config.ssh.port = Exposed port
+config.ssh.root_path = Root path
+config.ssh.keygen_path = Keygen path
+config.ssh.key_test_path = Key test path
+config.ssh.minimum_key_size_check = Minimum key size check
+config.ssh.minimum_key_sizes = Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start = Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server = Start builtin server
+config.ssh.listen_host = Listen host
+config.ssh.listen_port = Listen port
+config.ssh.server_ciphers = Server ciphers
 
-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.repo_config = Repository configuration
+config.repo.root_path = Root path
+config.repo.script_type = Script type
+config.repo.ansi_chatset = ANSI charset
+config.repo.force_private = Force private
+config.repo.max_creation_limit = Max creation limit
+config.repo.preferred_licenses = Preferred licenses
+config.repo.disable_http_git = Disable HTTP Git
+config.repo.enable_local_path_migration = Enable local path migration
+config.repo.enable_raw_file_render_mode = Enable raw file render mode
+config.repo.commits_fetch_concurrency = Commits fetch concurrency
+config.repo.editor.line_wrap_extensions = Editor line wrap extensions
+config.repo.editor.previewable_file_modes = Editor previewable file modes
+config.repo.upload.enabled = Upload enabled
+config.repo.upload.temp_path = Upload temporary path
+config.repo.upload.allowed_types = Upload allowed types
+config.repo.upload.file_max_size = Upload file size limit
+config.repo.upload.max_files = Upload files limit
 
-config.http_config = HTTP Configuration
-config.http_access_control_allow_origin = Access Control Allow Origin
+config.db_config = Database configuration
+config.db.type = Type
+config.db.host = Host
+config.db.name = Name
+config.db.user = User
+config.db.ssl_mode = SSL mode
+config.db.ssl_mode_helper = (for "postgres" only)
+config.db.path = Path
+config.db.path_helper = (for "sqlite3"only)
+config.db.max_open_conns = Maximum open connections
+config.db.max_idle_conns = Maximum idle connections
 
-config.db_config = Database Configuration
-config.db_type = Type
-config.db_host = Host
-config.db_name = Name
-config.db_user = User
-config.db_ssl_mode = SSL Mode
-config.db_ssl_mode_helper = (for "postgres" only)
-config.db_path = Path
-config.db_path_helper = (for "sqlite3" and "tidb")
+config.security_config = Security configuration
+config.security.login_remember_days = Login remember days
+config.security.cookie_remember_name = Remember cookie
+config.security.cookie_username = Username cookie
+config.security.cookie_secure = Enable secure cookie
+config.security.reverse_proxy_auth_user = Reverse proxy authentication header
+config.security.enable_login_status_cookie = Enable login status cookie
+config.security.login_status_cookie_name = Login status cookie
+config.security.local_network_allowlist = Local network allowlist
 
-config.service_config = Service Configuration
-config.register_email_confirm = Require Email Confirmation
-config.disable_register = Disable Registration
-config.show_registration_button = Show Register Button
-config.require_sign_in_view = Require Sign In View
-config.mail_notify = Mail Notification
-config.disable_key_size_check = Disable Minimum Key Size Check
-config.enable_captcha = Enable Captcha
-config.active_code_lives = Active Code Lives
-config.reset_password_code_lives = Reset Password Code Lives
+config.email_config = Email configuration
+config.email.enabled = Enabled
+config.email.subject_prefix = Subject prefix
+config.email.host = Host
+config.email.from = From
+config.email.user = User
+config.email.disable_helo = Disable HELO
+config.email.helo_hostname = HELO hostname
+config.email.skip_verify = Skip certificate verify
+config.email.use_certificate = Use custom certificate
+config.email.cert_file = Certificate file
+config.email.key_file = Key file
+config.email.use_plain_text = Use plain text
+config.email.add_plain_text_alt = Add plain text alternative
+config.email.send_test_mail = Send test email
+config.email.test_mail_failed = Failed to send test email to '%s': %v
+config.email.test_mail_sent = Test email has been sent to '%s'.
 
-config.webhook_config = Webhook Configuration
-config.queue_length = Queue Length
-config.deliver_timeout = Deliver Timeout
-config.skip_tls_verify = Skip TLS Verify
+config.auth_config = Authentication configuration
+config.auth.activate_code_lives = Activate code lives
+config.auth.reset_password_code_lives = Reset password code lives
+config.auth.require_email_confirm = Require email confirmation
+config.auth.require_sign_in_view = Require sign in view
+config.auth.disable_registration = Disable registration
+config.auth.enable_registration_captcha = Enable registration captcha
+config.auth.enable_reverse_proxy_authentication = Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration = Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header = Reverse proxy authentication header
 
-config.mailer_config = Mailer Configuration
-config.mailer_enabled = Enabled
-config.mailer_disable_helo = Disable HELO
-config.mailer_name = Name
-config.mailer_host = Host
-config.mailer_user = User
-config.send_test_mail = Send Test Email
-config.test_mail_failed = Fail to send test email to '%s': %v
-config.test_mail_sent = Test email has been sent to '%s'.
+config.user_config = User configuration
+config.user.enable_email_notify = Enable email notification
 
-config.oauth_config = OAuth Configuration
-config.oauth_enabled = Enabled
+config.session_config = Session configuration
+config.session.provider = Provider
+config.session.provider_config = Provider config
+config.session.cookie_name = Cookie
+config.session.https_only = HTTPS only
+config.session.gc_interval = GC interval
+config.session.max_life_time = Max life time
+config.session.csrf_cookie_name = CSRF cookie
 
-config.cache_config = Cache Configuration
-config.cache_adapter = Cache Adapter
-config.cache_interval = Cache Interval
-config.cache_conn = Cache Connection
+config.cache_config = Cache configuration
+config.cache.adapter = Adapter
+config.cache.interval = GC interval
+config.cache.host = Host
 
-config.session_config = Session Configuration
-config.session_provider = Session Provider
-config.provider_config = Provider Config
-config.cookie_name = Cookie Name
-config.enable_set_cookie = Enable Set Cookie
-config.gc_interval_time = GC Interval Time
-config.session_life_time = Session Life Time
-config.https_only = HTTPS Only
-config.cookie_life_time = Cookie Life Time
+config.http_config = HTTP configuration
+config.http.access_control_allow_origin = Access control allow origin
 
-config.picture_config = Picture Configuration
-config.picture_service = Picture Service
-config.disable_gravatar = Disable Gravatar
-config.enable_federated_avatar = Enable Federated Avatars
+config.attachment_config = Attachment configuration
+config.attachment.enabled = Enabled
+config.attachment.path = Path
+config.attachment.allowed_types = Allowed types
+config.attachment.max_size = Size limit
+config.attachment.max_files = Files limit
 
-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.release_config = Release configuration
+config.release.attachment.enabled = Attachment enabled
+config.release.attachment.allowed_types = Attachment allowed types
+config.release.attachment.max_size = Attachment size limit
+config.release.attachment.max_files = Attachment files limit
 
-config.log_config = Log Configuration
+config.picture_config = Picture configuration
+config.picture.avatar_upload_path = User avatar upload path
+config.picture.repo_avatar_upload_path = Repository avatar upload path
+config.picture.gravatar_source = Gravatar source
+config.picture.disable_gravatar = Disable Gravatar
+config.picture.enable_federated_avatar = Enable federated avatars
+
+config.mirror_config = Mirror configuration
+config.mirror.default_interval = Default interval
+
+config.webhook_config = Webhook configuration
+config.webhook.types = Types
+config.webhook.deliver_timeout = Deliver timeout
+config.webhook.skip_tls_verify = Skip TLS verify
+
+config.git_config = Git configuration
+config.git.disable_diff_highlight = Disable diff syntax highlight
+config.git.max_diff_lines = Diff lines limit (for a single file)
+config.git.max_diff_line_characters = Diff characters limit (for a single line)
+config.git.max_diff_files = Diff files limit (for a single diff)
+config.git.gc_args = GC arguments
+config.git.migrate_timeout = Migration timeout
+config.git.mirror_timeout = Mirror fetch timeout
+config.git.clone_timeout = Clone timeout
+config.git.pull_timeout = Pull timeout
+config.git.gc_timeout = GC timeout
+
+config.lfs_config = LFS configuration
+config.lfs.storage = Storage
+config.lfs.objects_path = Objects path
+
+config.log_config = Log configuration
+config.log_file_root_path = Log file root path
 config.log_mode = Mode
 config.log_options = Options
 
@@ -1283,7 +1369,6 @@ notices.delete_success = System notices have been deleted successfully.
 
 [action]
 create_repo = created repository <a href="%s">%s</a>
-fork_repo = forked a repository to <a href="%s">%s</a>
 rename_repo = renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a>
 commit_repo = pushed to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
 compare_commits = View comparison for these %d commits
@@ -1300,6 +1385,10 @@ create_branch = created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a hre
 delete_branch = deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag = pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a>
 delete_tag = deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+fork_repo = forked a repository to <a href="%s">%s</a>
+mirror_sync_push = synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create = synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete = synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago = ago
@@ -1321,6 +1410,7 @@ months = %d months %s
 years = %d years %s
 raw_seconds = seconds
 raw_minutes = minutes
+raw_hours = hours
 
 [dropzone]
 default_message = Drop files here or click to upload.

conf/locale/locale_es-ES.ini

@@ -9,7 +9,6 @@ sign_out=Cerrar sesión
 sign_up=Registro
 register=Registro
 website=Página web
-version=Versión
 page=Página
 template=Plantilla
 language=Idioma
@@ -44,6 +43,10 @@ issues=Incidencias
 
 cancel=Cancelar
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Instalación
 title=Pasos de la instalación por primera vez
@@ -122,6 +125,7 @@ run_user_not_match=El usuario que está ejecutando la aplicación no es el usuar
 smtp_host_missing_port=No se ha definido el puerto para el host SMTP.
 invalid_smtp_from=El campo SMTP no es válido: %v
 save_config_failed=Error al guardar la configuración: %v
+init_failed=Failed to initialize application: %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.
 invalid_log_root_path=La ruta para los registros es inválida: %v
@@ -151,6 +155,8 @@ register_hepler_msg=¿Ya tienes una cuenta? ¡Inicia sesión!
 social_register_hepler_msg=¿Ya tienes una cuenta? ¡Enlázala!
 disable_register_prompt=Lo sentimos, el registro está deshabilitado. Por favor, contacta con el administrador del sitio.
 disable_register_mail=Lo sentimos. Los correos de Confirmación de Registro están deshabilitados.
+auth_source=Authentication Source
+local=Local
 remember_me=Recuérdame
 forgot_password=He olvidado mi contraseña
 forget_password=¿Has olvidado tu contraseña?
@@ -160,13 +166,13 @@ active_your_account=Activa tu cuenta
 prohibit_login=Ingreso prohibido
 prohibit_login_desc=Su cuenta tiene prohibido ingresar al sistema, fovor contactar al administrador del sistema.
 resent_limit_prompt=Lo sentimos, estás solicitando el reenvío del mail de activación con demasiada frecuencia. Por favor, espera 3 minutos.
-has_unconfirmed_mail=Hola %s, tu correo electrónico (<b>%s</b>) no está confirmado. Si no has recibido un correo de confirmación o necesitas que lo enviemos de nuevo, por favor, haz click en el siguiente botón.
+has_unconfirmed_mail=Hola %s, tu correo electrónico (<b>%s</b>) no está confirmado. Si no has recibido un correo de confirmación o necesitas que te lo enviemos de nuevo, por favor haz click en el siguiente botón.
 resend_mail=Haz click aquí para reenviar tu correo electrónico de activación
 send_reset_mail=Haga clic aquí para (re)enviar el correo para el restablecimiento de la contraseña
 reset_password=Restablecer su contraseña
 invalid_code=Lo sentimos, su código de confirmación ha expirado o no es valido.
 reset_password_helper=Haga Clic aquí para restablecer su contraseña
-password_too_short=La longitud de la contraseña no puede ser menor a 6.
+password_too_short=La longitud de la contraseña no puede ser menor de 6 caracteres.
 non_local_account=Cuentas que no son locales no pueden cambiar las contraseñas a través de Gogs.
 
 login_two_factor=Autenticación en dos pasos
@@ -210,8 +216,8 @@ TreeName=Ruta del archivo
 Content=Contenido
 
 require_error=` no puede estar vacío.`
-alpha_dash_error=` los caracteres deben ser Alfanumericos o dash(-_).`
-alpha_dash_dot_error=` debe ser un caracter alfanumérivo válido, un guión alto o bajo (-_) o un signo de puntuación.`
+alpha_dash_error=` los caracteres deben ser alfanuméricos o un guión (-_).`
+alpha_dash_dot_error=` debe ser un carácter alfanumérico válido, un guión (-_) o un signo de puntuación.`
 alpha_dash_dot_slash_error=` deben ser caracteres alfanuméricos, guiones(-_), puntos o barras.`
 size_error=` debe ser de tamaño %s.`
 min_size_error=` debe contener al menos %s caracteres.`
@@ -229,6 +235,7 @@ org_name_been_taken=Ya existe una organización con este nombre.
 team_name_been_taken=Ya existe un equipo con este nombre.
 email_been_used=Esta dirección de correo electrónico ya está en uso.
 username_password_incorrect=Nombre de usuario o contraseña incorrectos.
+auth_source_mismatch=The authentication source selected is not associated with the user.
 enterred_invalid_repo_name=Por favor, asegúrate de que has introducido correctamente el nombre del repositorio.
 enterred_invalid_owner_name=Por favor, asegúrate de que has introducido correctamente el nombre del propietario.
 enterred_invalid_password=Por favor, asegúrate de que has introducido correctamente tu contraseña.
@@ -256,8 +263,7 @@ following=Siguiendo
 follow=Seguir
 unfollow=Dejar de seguir
 
-form.name_reserved=El usuario '%s' está reservado.
-form.name_pattern_not_allowed=El patrón de nombre de usuario '%s' no está permitido.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Perfil
@@ -342,21 +348,22 @@ two_factor_enable=Activar
 two_factor_disable=Desactivar
 two_factor_view_recovery_codes=Guarda <a href="%s%s"> tus códigos de recuperación</a> en un lugar seguro. Podrás usarlos como código de acceso si pierdes el acceso a tu aplicación de autenticación.
 two_factor_http=Para las operaciones sobre HTTP/HTTPS, no puedes usar un usuario y contraseña. Por favor, cree y utilice <a href="%[1]s%[2]s"> un token de acceso personal</a> como su credencial de acceso, por ejemplo, <code>%[3]s</code>.
-two_factor_enable_title=Habilitar autenticaciñon en dos pasos
+two_factor_enable_title=Habilitar autenticación en dos pasos
 two_factor_scan_qr=Por favor, use su aplicación de autenticación para escanear la imagen:
-two_factor_or_enter_secret=Or enter the secret:
+two_factor_or_enter_secret=O introduzca el secreto:
 two_factor_then_enter_passcode=Introduce el Pin:
 two_factor_verify=Verificar
 two_factor_invalid_passcode=¡El Pin que has introducido no es válido, por favor, inténtalo de nuevo!
-two_factor_enable_error=Enable Two-factor authentication failed: %v
-two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
-two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
-two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
-two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
-two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
-two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_reused_passcode=¡El pin de autenticación que has introducido ya ha sido usado, por favor intenta con otro!
+two_factor_enable_error=Ha fallado la activación de la autenticación en dos pasos: %v
+two_factor_enable_success=¡La autenticación en dos pasos se ha activado en tu cuenta correctamente!
+two_factor_recovery_codes_title=Códigos de recuperación para la autenticación en dos pasos
+two_factor_recovery_codes_desc=Los códigos de recuperación se usan cuando pierdes temporalmente el acceso a tu aplicación de autenticación. Cada código de recuperación solo puede utilizarse en una ocasión, <b>por favor, mantén estos códigos en lugar seguro</b>.
+two_factor_regenerate_recovery_codes=Regenerar códigos de recuperación
+two_factor_regenerate_recovery_codes_error=Ha fallado la regeneración de códigos de recuperación: %v
+two_factor_regenerate_recovery_codes_success=¡Nuevos códigos de recuperación han sido generados con éxito!
 two_factor_disable_title=Deshabilitar autenticación en dos pasos
-two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_desc=El nivel de seguridad de tu cuenta se verá reducido después de desactivar la autenticación en dos pasos. ¿Deseas continuar?
 two_factor_disable_success=¡La autenticación en dos pasos ha sido deshabilitada satisfactoriamente!
 
 manage_access_token=Gestionar los Tokens de Acceso personales
@@ -370,6 +377,7 @@ delete_token=Eliminar
 access_token_deletion=Borrado de Token de Acceso Personal
 access_token_deletion_desc=Si elimina este token de acceso personal la aplicación asociada perderá el permiso de acceso. ¿Desea continuar?
 delete_token_success=¡El token de acceso personal ha sido eliminado con éxito! No se olvide de actualizar también las aplicaciones asociadas.
+token_name_exists=Token with same name already exists.
 
 orgs.none=No eres un miembro de ninguna organización.
 orgs.leave_title=Salir de una organización
@@ -417,10 +425,11 @@ mirror_last_synced=Última sincronización
 watchers=Seguidores
 stargazers=Fans
 forks=Forks
+repo_description_helper=Descripción del repositorio. Longitud máxima de 512 caracteres.
+repo_description_length=Caracteres disponibles
 
 form.reach_limit_of_creation=El propietario ha alcanzado el límite máximo de %d repositorios creados.
-form.name_reserved=El nombre del repositorio '%s' está reservado.
-form.name_pattern_not_allowed=El patrón del nombre del repositorio '%s' no está permitido.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Requiere autorización
 migrate_type=Tipo de migración
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=El contenido del archivo ha sido modificado de
 editor.file_already_exists=Ya existe un archivo con nombre '%s' en este repositorio.
 editor.no_changes_to_show=No existen cambios para mostrar.
 editor.fail_to_update_file=Error al actualizar/crear el archivo '%s', error: %v
+editor.fail_to_delete_file=Error al borrar el fichero '%s', error: %v
 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'
@@ -616,7 +626,7 @@ pulls.compare_compare=comparar con
 pulls.filter_branch=Filtrar rama
 pulls.no_results=Sin resultados.
 pulls.nothing_to_compare=Nada que comparar. Las dos ramas coinciden.
-pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history.
+pulls.nothing_merge_base=No hay nada que comparar porque las dos ramas tienen una historia completamente distinta.
 pulls.has_pull_request=`Ya existe un pull request entre estas dos ramas: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create=Crear Pull Request
 pulls.title_desc=desea fusionar %[1]d commits de <code>%[2]s</code> en <code>%[3]s</code>
@@ -632,8 +642,9 @@ pulls.is_checking=Se está procediendo a la búsqueda de conflictos, por favor a
 pulls.can_auto_merge_desc=Este Pull Request puede ser fusionado automáticamente.
 pulls.cannot_auto_merge_desc=Este Pull Request no puede ser fusionado automáticamente porque hay conflictos.
 pulls.cannot_auto_merge_helper=Por favor, fusiona manualmente para resolver los conflictos.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Crear un commit del fusionado
+pulls.rebase_before_merging=Hacer rebase antes de fusionar
+pulls.commit_description=Descripción del commit
 pulls.merge_pull_request=Fusionar Pull Request
 pulls.open_unmerged_pull_exists=`Usted no puede realizar la operación de reapertura porque en estos momentos existe una solicitud de pull request (#%d) para el mismo repositorio con la misma información que se encuentra a la espera de aprobación`
 pulls.delete_branch=Eliminar la rama
@@ -693,7 +704,7 @@ settings.branches_bare=No puedes gestionar ramas en un repositorio vacío. Por f
 settings.default_branch=Rama predeterminada
 settings.default_branch_desc=Se considera la rama «base» como la rama por defecto para commits de código, las solicitudes pull y edición en línea.
 settings.update=Actualizar
-settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
+settings.update_default_branch_unsupported=El cambio de rama por defecto no esta soportado por la versión de Git en el servidor.
 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.
@@ -710,7 +721,7 @@ settings.protect_whitelist_users=Usuarios que pueden hacer push a esta rama
 settings.protect_whitelist_search_users=Buscar usuarios
 settings.protect_whitelist_teams=Equipos cuyos miembros pueden hacer push a esta rama
 settings.protect_whitelist_search_teams=Buscar equipos
-settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
+settings.update_protect_branch_success=¡Las opciones de protección para esta rama se han actualizado con éxito!
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Configuración Básica
@@ -723,7 +734,7 @@ settings.change_reponame_prompt=Este cambio afectará a los enlaces al repositor
 settings.advanced_settings=Ajustes avanzados
 settings.wiki_desc=Activar sistema de wiki
 settings.use_internal_wiki=Usar wiki integrada
-settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
+settings.allow_public_wiki_desc=Permitir acceso público a la wiki cuando el repositorio es privado
 settings.use_external_wiki=Usar Wiki externa
 settings.external_wiki_url=URL externa de la Wiki
 settings.external_wiki_url_desc=Los visitantes serán redireccionados a la URL cuando hagan click en la barra.
@@ -738,11 +749,11 @@ settings.tracker_issue_style=Estilo de etiquetado del tracker externo de inciden
 settings.tracker_issue_style.numeric=Numérico
 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.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Permitir pull requests para aceptar contribuciones entre repositorios y ramas
+settings.pulls.ignore_whitespace=Ignorar los cambios en el espacio en blanco
+settings.pulls.allow_rebase_merge=Permite usar rebase para fusionar los commits
 settings.danger_zone=Zona de Peligro
-settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
+settings.cannot_fork_to_same_owner=No puedes hacer fork del repositorio a su propietario original.
 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.
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Los datos de la wiki del repositorio han sido bor
 settings.delete=Eliminar este repositorio
 settings.delete_desc=Una vez has eliminado un repositorio, no hay vuelta atrás. Por favor, asegúrate de que es lo que quieres.
 settings.delete_notices_1=- Esta operación <strong>NO PUEDE</strong> revertirse.
-settings.delete_notices_2=- Esta operación eliminará de manera permanente todo el contenido de este repositorio, incluyendo los datos de git, las incidencias, los comentarios y los permisos de acceso de los colaboradores.
+settings.delete_notices_2=- Esta operación eliminará de manera permanente todo el contenido de este repositorio, incluyendo los datos de Git, las incidencias, los comentarios y los permisos de acceso de los colaboradores.
 settings.delete_notices_fork_1=- Todos los forks se convertirán en independientes tras el borrado.
 settings.deletion_success=¡El respositorio ha sido eliminado satisfactoriamente!
 settings.update_settings_success=Las opciones del repositorio se han actualizado correctamente.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Añadir Webhook
 settings.webhook_deletion=Eliminar Webhook
 settings.webhook_deletion_desc=Al borrar este webhook se eliminará su información y todo su historial. ¿Desea continuar?
 settings.webhook_deletion_success=¡Webhook eliminado con éxito!
@@ -786,12 +799,14 @@ settings.webhook.test_delivery=Test de entrega
 settings.webhook.test_delivery_desc=Enviar un falso evento Push de entrega para probar tus ajustes de webhook
 settings.webhook.test_delivery_success=Probar que los webhook han sido añadidos a la cola de entrega. Esto puede tomar algunos segundos antes de aparecer en el historial de entregas.
 settings.webhook.redelivery=Reenviar
-settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
+settings.webhook.redelivery_success=La tarea del Hook '%s' ha sido reañadida en la cola de entrega. Puede tardar unos segundos en actualizarse el historial de estado de la cola.
 settings.webhook.request=Petición
 settings.webhook.response=Respuesta
 settings.webhook.headers=Encabezado
 settings.webhook.payload=Payload
 settings.webhook.body=Cuerpo del mensaje
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Los Git Hooks son una funcionalidad del propio Git, puedes editar los ficheros de los hooks soportados en la siguiente lista para aplicar operaciones personalizadas.
 settings.githook_edit_desc=Si el hook no está activo, se mostrará contenido de ejemplo. Dejar el contenido vacío deshabilitará este hook.
 settings.githook_name=Nombre del Hook
@@ -801,7 +816,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.secret_desc=El secreto será enviado como un payload SHA256 HMAC hex digest vía cabecera <code>X-Gogs-Signature</code>.
 settings.slack_username=Nombre de usuario
 settings.slack_icon_url=URL de icono
 settings.slack_color=Color
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push a un repositorio
 settings.event_issues=Incidencias
 settings.event_issues_desc=Incidencia abierta, cerrada, reabierta, editada, asignada, desasignada, etiqueta actualizada, etiqueta limpiada, hito marcado, o desmarcado,.
-settings.event_issue_comment=Comentario de incidencia
-settings.event_issue_comment_desc=Comentario de incidencias creado, editado o borrado.
 settings.event_pull_request=Pull Request
 settings.event_pull_request_desc=Pull request abierto, cerrado, reabierto, editado, asignado, desasignado, etiqueta actualizada, etiqueta limpiada, hito marcado, hito desmarcado, o sincronizado.
+settings.event_issue_comment=Comentario de incidencia
+settings.event_issue_comment_desc=Comentario de incidencias creado, editado o borrado.
 settings.event_release=Lanzamiento
 settings.event_release_desc=Lanzamiento publicado en un repositorio.
 settings.active=Activo
@@ -834,8 +849,8 @@ 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.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository.
+settings.add_discord_hook_desc=Añade integración con <a href="%s">Discord</a> a tu repositorio.
+settings.add_dingtalk_hook_desc=Añade integración con <a href="%s">Dingtalk</a> a tu repositorio.
 settings.slack_token=Token
 settings.slack_domain=Dominio
 settings.slack_channel=Canal
@@ -852,6 +867,8 @@ settings.add_key_success=¡La nueva clave de desplieque '%s' ha sido creada con
 settings.deploy_key_deletion=Eliminar Clave de Despliegue
 settings.deploy_key_deletion_desc=Al eliminar esta clave de despliegue se perderán el permiso de acceso a este repositorio con dicha clave. ¿Deseas continuar?
 settings.deploy_key_deletion_success=¡Clave de despliegue eliminada con éxito!
+settings.description_desc=Descripción del repositorio. Longitud máxima de 512 caracteres.
+settings.description_length=Caracteres disponibles
 
 diff.browse_source=Explorar el Código
 diff.parent=padre
@@ -916,9 +933,8 @@ team_name_helper=Utiliza este nombre para mencionar a este equipo en las convers
 team_desc_helper=¿En qué consiste este equipo?
 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.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Configuración
 settings.options=Opciones
@@ -990,12 +1006,19 @@ first_page=Primera
 last_page=Última
 total=Total: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Estadísticas
 dashboard.operations=Operaciones
 dashboard.system_status=Estado del Monitor del Sistema
 dashboard.statistic_info=La base de datos de Gogs contiene <b>%d</b> usuarios, <b>%d</b> organizaciones, <b>%d</b> claves públicas, <b>%d</b> repositorios, <b>%d</b> vigilados, <b>%d</b> destacados, <b>%d</b> acciones, <b>%d</b> accesos, <b>%d</b> incidencias, <b>%d</b> comentarios, <b>%d</b> cuentas de redes sociales, <b>%d</b> seguidores, <b>%d</b> mirrors, <b>%d</b> releases, <b>%d</b> fuentes de login, <b>%d</b> webhooks, <b>%d</b> milestones, <b>%d</b> etiquetas, <b>%d</b> hooks, <b>%d</b> equipos, <b>%d</b> tareas actualizadas, <b>%d</b> adjuntos.
 dashboard.operation_name=Nombre de la operación
 dashboard.operation_switch=Interruptor
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Ejecutar
 dashboard.clean_unbind_oauth=Limpiar solicitudes de OAuth sin confirmar
 dashboard.clean_unbind_oauth_success=Las solicitudes de OAuth sin confirmar se han eliminado correctamente.
@@ -1009,8 +1032,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_hooks=Resync pre-receive, update and post-receive hooks of all repositories
-dashboard.resync_all_hooks_success=All repositories' pre-receive, update and post-receive hooks have been resynced successfully.
+dashboard.resync_all_hooks=Resincroniza los "hooks" de pre-recepción, actualización y post-recepción en todos los repositorios
+dashboard.resync_all_hooks_success=Se han vuelto a sincronizar todos los "hooks" de pre-recepción, actualización y post-recepción de los repositorios con éxito.
 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.
 
@@ -1087,11 +1110,12 @@ repos.stars=Estrellas
 repos.issues=Incidencias
 repos.size=Tamaño
 
-auths.auth_manage_panel=Panel de administración de autenticación
+auths.auth_sources=Fuentes de autentificación
 auths.new=Añadir nuevo origen
 auths.name=Nombre
 auths.type=Tipo
 auths.enabled=Activo
+auths.default=Por defecto
 auths.updated=Actualizado
 auths.auth_type=Tipo de autenticación
 auths.auth_name=Nombre de autenticación
@@ -1100,7 +1124,7 @@ auths.domain=Dominio
 auths.host=Host
 auths.port=Puerto
 auths.bind_dn=Bind DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Puedes usar '%s' como marcador de posición para el nombre de usuario, ej. DOM\%s
 auths.bind_password=Contraseña Bind
 auths.bind_password_helper=Advertencia: La contraseña se almacena como texto plano. No utilice una cuenta con privilegios elevados.
 auths.user_base=Base de búsqueda de usuarios
@@ -1111,10 +1135,10 @@ auths.attribute_name=Atributo nombre
 auths.attribute_surname=Atributo apellido
 auths.attribute_mail=Atributo correo electrónico
 auths.verify_group_membership=Verificar pertenencia a grupo
-auths.group_search_base_dn=Group Search Base DN
+auths.group_search_base_dn=Base DN para la búsqueda de grupos
 auths.group_filter=Filtro de grupo
-auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
-auths.user_attribute_listed_in_group=User Attribute Listed in Group
+auths.group_attribute_contain_user_list=Atributo de grupo que contiene la lista de usuarios
+auths.user_attribute_listed_in_group=Atributo de usuario listado en grupo
 auths.attributes_in_bind=Buscar atributos en el contexto del Bind DN
 auths.filter=Filtro de usuario
 auths.admin_filter=Filtro de aministrador
@@ -1128,9 +1152,9 @@ auths.enable_tls=Habilitar cifrado TLS
 auths.skip_tls_verify=Omitir la verificación TLS
 auths.pam_service_name=Nombre del Servicio PAM
 auths.enable_auto_register=Hablilitar Auto-Registro
-auths.tips=Consejos
 auths.edit=Editar la Configuración de Autenticación
 auths.activated=Esta autenticación ha sido activada
+auths.default_auth=Esta autenticación es la fuente de inicio de sesión predeterminada
 auths.new_success=¡La autenticación '%s' ha sido añadida con éxito!
 auths.update_success=La configuración de autenticación ha sido actualizada con éxito.
 auths.update=Actualizar la configuración de autenticación
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Esta autenticación será eliminada. ¿Deseas continuar?
 auths.still_in_used=Este método de autentificación aún es utilizado por algunos usuarios, por favor elimine o convierta estos usuarios a otro tipo de autentificación.
 auths.deletion_success=¡La autenticación ha sido eliminada con éxito!
 auths.login_source_exist=El origen de autenticación '%s' ya existe.
+auths.github_api_endpoint=API Endpoint
 
-config.not_set=(not set)
+config.not_set=(sin definir)
 config.server_config=Configuración del servidor
-config.app_name=Nombre de la Aplicación
-config.app_ver=Versión de la Aplicación
-config.app_url=URL de la Aplicación
-config.domain=Dominio
-config.offline_mode=Modo Sin Conexión
-config.disable_router_log=Deshabilitar Log del Router
+config.brand_name=Brand name
 config.run_user=Ejecutada como Usuario
 config.run_mode=Modo de ejecución
-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.reverse_auth_user=Autenticación Inversa de Usuario
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=Configuración SSH
-config.ssh_enabled=Habilitado
-config.ssh_start_builtin_server=Iniciar servidor integrado
-config.ssh_domain=Dominio
-config.ssh_port=Puerto
-config.ssh_listen_port=Puerto de escucha
-config.ssh_root_path=Ruta raíz
-config.ssh_key_test_path=Ruta de la clave de prueba
-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.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 config.repo_config=Configuración del repositorio
-config.repo_root_path=Ruta del Repositorio
-config.script_type=Tipo de Script
-config.repo_force_private=Forzar Privado
-config.max_creation_limit=Limite máximo de creación
-config.preferred_licenses=Licencias Preferidas
-config.disable_http_git=Desactivar HTTP Git
-config.enable_local_path_migration=Activar la migración de la ruta de acceso Local
-config.commits_fetch_concurrency=Commits Fetch Concurrency
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Configuración de la Base de Datos
-config.db_type=Tipo
-config.db_host=Host
-config.db_name=Nombre
-config.db_user=Usuario
-config.db_ssl_mode=Modo SSL
-config.db_ssl_mode_helper=(sólo para "postgres")
-config.db_path=Ruta
-config.db_path_helper=(para "sqlite3" y "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Configuración del servicio
-config.register_email_confirm=Solicitar Confirmación por Correo Electrónico
-config.disable_register=Deshabilitar el Registro
-config.show_registration_button=Mostrar Botón de Registro
-config.require_sign_in_view=Solicitar la Vista de Inicio de Sesión
-config.mail_notify=Notificación por Correo Electrónico
-config.disable_key_size_check=Deshabilitar la comprobación de Tamaño Mínimo de Clave
-config.enable_captcha=Activar Captcha
-config.active_code_lives=Habilitar Vida del Código
-config.reset_password_code_lives=Restablecer Contraseña de Vida del Código
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Configuración de Webhooks
-config.queue_length=Tamaño de Cola de Envío
-config.deliver_timeout=Timeout de Entrega
-config.skip_tls_verify=Omitir la Verificación TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Configuración del servidor de correo
-config.mailer_enabled=Activado
-config.mailer_disable_helo=Desactivar HELO
-config.mailer_name=Nombre
-config.mailer_host=Host
-config.mailer_user=Usuario
-config.send_test_mail=Enviar email de prueba
-config.test_mail_failed=Fallo al enviar el email de prueba a '%s': %v
-config.test_mail_sent=El email de prueba ha sido enviado a '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Configuración OAuth
-config.oauth_enabled=Activado
-
-config.cache_config=Configuración de la Caché
-config.cache_adapter=Adaptador de la Caché
-config.cache_interval=Intervalo de la Caché
-config.cache_conn=Conexión de la Caché
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Configuración de la Sesión
-config.session_provider=Proveedor de la Sesión
-config.provider_config=Configuración del Proveedor
-config.cookie_name=Nombre de la Cookie
-config.enable_set_cookie=Activar Establecimiento de Cookie
-config.gc_interval_time=Intervalo de tiempo del GC
-config.session_life_time=Tiempo de Vida de la Sesión
-config.https_only=Sólo HTTPS
-config.cookie_life_time=Tiempo de Vida de la Cookie
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Configuración de la Caché
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=Configuración HTTP
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Configuración de Imagen
-config.picture_service=Servicio de Imágen
-config.disable_gravatar=Desactivar Gravatar
-config.enable_federated_avatar=Habilitar Avatares Federados
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Configuración de Webhooks
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Configuración de Git
-config.git_disable_diff_highlight=Desactivar resaltado de sintaxis del Diff
-config.git_max_diff_lines=Líneas de Diff máximas (por un solo archivo)
-config.git_max_diff_line_characters=Carácteres de Diff máximos (para una sola línea)
-config.git_max_diff_files=Máximo de archivos de Diff (que se mostrarán)
-config.git_gc_args=Argumentos de GC
-config.git_migrate_timeout=Tiempo de espera de migración
-config.git_mirror_timeout=Tiempo de espera de actualización de réplicas
-config.git_clone_timeout=Tiempo de espera de operación de clones
-config.git_pull_timeout=Tiempo de espera de operación de pull
-config.git_gc_timeout=Tiempo de espera de operación de GC
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Configuración del Log
+config.log_file_root_path=Ruta de los Ficheros de Log
 config.log_mode=Modo
 config.log_options=Opciones
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Las notificaciones del sistema han sido eliminadas satisf
 
 [action]
 create_repo=creó el repositorio <a href="%s">%s</a>
-fork_repo=ha hecho un Fork en <a href="%s">%s</a>
 rename_repo=repositorio renombrado de <code>%[1]s</code> a <a href="%[2]s">%[3]s</a>
 commit_repo=hizo push a <a href="%[1]s/src/%[2]s">%[3]s</a> en <a href="%[1]s">%[4]s</a>
 compare_commits=Ver comparación de estos %d commits
@@ -1295,11 +1379,15 @@ comment_issue=`comentó en la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`creado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`cerró el pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`reabrió el pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-merge_pull_request=`fusionado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
+merge_pull_request=`fusionó el pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 create_branch=nueva rama <a href="%[1]s/src/%[2]s">%[3]s</a> creada en <a href="%[1]s">%[4]s</a>
 delete_branch=borrada rama <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=hizo push del tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>
 delete_tag=borrada etiqueta <code>%[2]s</code> en <a href="%[1]s">%[3]s</a>
+fork_repo=ha hecho un Fork en <a href="%s">%s</a>
+mirror_sync_push=sincronizados commits a <a href="%[1]s/src/%[2]s">%[3]s</a> en <a href="%[1]s">%[4]s</a> desde la réplica
+mirror_sync_create=sincronizada nueva referencia <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a> desde la réplica
+mirror_sync_delete=sincronizada y eliminada referencia <code>%[2]s</code> en <a href="%[1]s">%[3]s</a> desde la réplica
 
 [tool]
 ago=hace
@@ -1321,6 +1409,7 @@ months=%[2]s %[1]d meses
 years=%[2]s %[1]d años
 raw_seconds=segundos
 raw_minutes=minutos
+raw_hours=hours
 
 [dropzone]
 default_message=Suéltelos aquí o pulse para cargar archivos.

conf/locale/locale_fi-FI.ini

@@ -9,7 +9,6 @@ sign_out=Kirjaudu ulos
 sign_up=Rekisteröidy
 register=Rekisteröidy
 website=Nettisivut
-version=Versio
 page=Sivu
 template=Malli
 language=Kieli
@@ -44,6 +43,10 @@ issues=Ongelmat
 
 cancel=Peruuta
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Asennus
 title=Asennusvaiheet ottaessa ensi kertaa käyttöön
@@ -72,9 +75,9 @@ run_user=Suorita käyttäjänä
 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=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=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.
@@ -122,6 +125,7 @@ run_user_not_match=Suoritus käyttäjä ei ole nykyinen käyttäjä: %s -> %s
 smtp_host_missing_port=SMTP-isännältä puuttuu portin osoite.
 invalid_smtp_from=SMTP From kenttä ei ole kelvollinen: %v
 save_config_failed=Asetuksien tallennus epäonnistui: %v
+init_failed=Failed to initialize application: %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.
 invalid_log_root_path=Loki juurihakemisto ei kelpaa: %v
@@ -151,6 +155,8 @@ register_hepler_msg=On jo tili? Kirjaudu sisään nyt!
 social_register_hepler_msg=On jo tili? Liitä nyt!
 disable_register_prompt=Sori, rekisteröinti on poistettu käytöstä. Ole hyvä ja ota yhteyttä sivuston ylläpitoon.
 disable_register_mail=Sori, rekisteröinti sähköpostivarmistukset on poistettu käytöstä.
+auth_source=Todennuslähde
+local=Paikallinen
 remember_me=Muista minut
 forgot_password=Unohtuiko salasana
 forget_password=Unohtuiko salasana?
@@ -229,6 +235,7 @@ org_name_been_taken=Organisaation nimi on jo käytössä.
 team_name_been_taken=Tiimin nimi on jo käytössä.
 email_been_used=Sähköpostiosoite on jo käytössä.
 username_password_incorrect=Käyttäjätunnus tai salasana ei ole oikein.
+auth_source_mismatch=Valittua todennuslähdettä ei liitetä käyttäjään.
 enterred_invalid_repo_name=Ole hyvä ja varmista että kirjoittamasi repon nimi on oikein.
 enterred_invalid_owner_name=Ole hyvä ja varmista että kirjoittamasi omistajan nimi on oikein.
 enterred_invalid_password=Ole hyvä ja varmista että kirjoittamasi salasana on oikein.
@@ -256,8 +263,7 @@ following=Seurataan
 follow=Seuraa
 unfollow=Lopeta seuraaminen
 
-form.name_reserved=Käyttäjätunnus '%s' on varattu.
-form.name_pattern_not_allowed=Käyttäjätunnus mallia '%s' ei ole sallittu.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profiili
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Tai kirjoita salaisuus:
 two_factor_then_enter_passcode=Sitten kirjoita salasana:
 two_factor_verify=Vahvista
 two_factor_invalid_passcode=Kirjoittamasi salasana ei kelpaa, yritä uudelleen!
+two_factor_reused_passcode=Antamasi salasana on jo käytetty, kokeile toista!
 two_factor_enable_error=Ota käyttöön kaksivaiheinen todennus epäonnistui: %v
 two_factor_enable_success=Kaksivaiheinen todennus on otettu käyttöön tilissäsi menestyksekkäästi!
 two_factor_recovery_codes_title=Kaksivaiheinen todennus palautuskoodit
@@ -370,6 +377,7 @@ delete_token=Poista
 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.
+token_name_exists=Saman nimen tunnus on jo olemassa.
 
 orgs.none=Et ole yhdenkään organisaation jäsen.
 orgs.leave_title=Poistu organisaatiosta
@@ -417,10 +425,11 @@ mirror_last_synced=Synkronoitu viimeksi
 watchers=Tarkkailijat
 stargazers=Tähtiharrastajat
 forks=Haarat
+repo_description_helper=Repon kuvaus. Enintään 512 merkkiä.
+repo_description_length=Käytettävissä olevat merkit
 
 form.reach_limit_of_creation=Omistaja on saavuttanut maksimi luontirajan %d repoa.
-form.name_reserved=Repon nimi '%s' on varattu.
-form.name_pattern_not_allowed=Repon nimi mallia '%s' ei ole sallittu.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Tarvitaan lupa
 migrate_type=Siirtotyyppi
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Tiedoston sisältöä on muutettu aloittamises
 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.fail_to_delete_file=Tiedoston '%s' poistaminen epäonnistui virheellä: %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'
@@ -616,7 +626,7 @@ pulls.compare_compare=vertaa
 pulls.filter_branch=Suodata branch
 pulls.no_results=Tuloksia ei löytynyt.
 pulls.nothing_to_compare=Ei ole mitään verrattavaa koska base ja head branchit ovat tasoissa.
-pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history.
+pulls.nothing_merge_base=Ei ole mitään verrattavaa, koska kahdella haaralla on täysin erilainen historia.
 pulls.has_pull_request=`On olemassa jo pull pyyntö näiden kohteiden välillä: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create=Luo Pull-pyyntö
 pulls.title_desc=haluaa yhdistää %[1]d committia lähteestä <code>%[2]s</code> kohteeseen <code>%[3]s</code>
@@ -632,8 +642,9 @@ pulls.is_checking=Konfliktin tarkistus on yhä meneillään, ole hyvä ja päivi
 pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti.
 pulls.cannot_auto_merge_desc=Tätä pull-pyyntöä ei voi yhdistää automaattisesti koska on konflikteja.
 pulls.cannot_auto_merge_helper=Ole hyvä ja yhdistä manuaalisesti konfliktien ratkaisemiseksi.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Luo yhdistämistoiminto
+pulls.rebase_before_merging=Rebase ennen yhdistämistä
+pulls.commit_description=Toimituksen kuvaus
 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=Poista haara
@@ -738,7 +749,7 @@ 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.pulls_desc=Enable pull requests to accept contributions between repositories and branches
 settings.pulls.ignore_whitespace=Ignore changes in whitespace
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Vaaravyöhyke
@@ -761,10 +772,10 @@ settings.wiki_deletion_success=Repo wiki tiedot on poistettu onnistuneesti.
 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_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
 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.update_settings_success=Repon asetukset on päivitetty onnistuneesti.
 settings.transfer_owner=Uusi omistaja
 settings.make_transfer=Tee siirto
 settings.transfer_succeed=Arkiston omistusoikeus on siirretty onnistuneesti.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Lisää webkoukku
 settings.webhook_deletion=Poista webkoukku
 settings.webhook_deletion_desc=Tämän webkoukun poistaminen poistaa sen tiedot ja kaiken toimitushistorian. Haluatko jatkaa?
 settings.webhook_deletion_success=Webkoukku on poistettu onnistuneesti!
@@ -792,6 +805,8 @@ settings.webhook.response=Vastaus
 settings.webhook.headers=Otsikot
 settings.webhook.payload=Payload
 settings.webhook.body=Body
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git koukkujen voimanlähteenä on Git itse, voit muokata tuettujen koukkujen tiedostoja allaolevassa luettelossa suorittaaksesi mukautettuja toimintoja.
 settings.githook_edit_desc=Jos koukku ei ole käytössä, esitellään esimerkkisisältö. Sisällön jättäminen tyhjäksi arvoksi poistaa tämän koukun käytöstä.
 settings.githook_name=Koukun nimi
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push repoon
 settings.event_issues=Ongelmat
 settings.event_issues_desc=Ongelma avattu, suljettu, uudelleenavattu, muokattu, annettu, anto vedottu, tarra päivitetty, tarra poistettu, merkkipaalutettu, tai poistettu merkkipaalu.
-settings.event_issue_comment=Ongelman kommentti
-settings.event_issue_comment_desc=Ongelman kommentti luotu, muokattu, tai poistettu.
 settings.event_pull_request=Pull-pyyntö
 settings.event_pull_request_desc=Pull-pyyntö avattu, suljettu, uudelleenavattu, muokattu, annettu, anto vedottu, tarra päivitetty, tarra poistettu, merkkipaalutettu, poistettu merkkipaalu, tai synkronoitu.
+settings.event_issue_comment=Ongelman kommentti
+settings.event_issue_comment_desc=Ongelman kommentti luotu, muokattu, tai poistettu.
 settings.event_release=Julkaisu
 settings.event_release_desc=Julkaisu julkaistu repoon.
 settings.active=Aktiivinen
@@ -835,7 +850,7 @@ 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.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository.
+settings.add_dingtalk_hook_desc=Lisää <a href="%s">Dingtalk</a> integraatio repositoryysi.
 settings.slack_token=Pääsymerkki
 settings.slack_domain=Verkkotunnus
 settings.slack_channel=Kanava
@@ -852,6 +867,8 @@ settings.add_key_success=Uusi deploy avain '%s' on lisätty onnistuneesti!
 settings.deploy_key_deletion=Poista deploy avain
 settings.deploy_key_deletion_desc=Deploy avaimen poistaminen poistaa myös kaikki liitetyt käyttötiedot tästä reposta. Haluatko jatkaa?
 settings.deploy_key_deletion_success=Deploy avain on poistettu onnistuneesti!
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=Selaa lähdekoodia
 diff.parent=vanhempi
@@ -916,9 +933,8 @@ team_name_helper=Käytät tätä nimeä mainitessasi tämän tiimin keskusteluis
 team_desc_helper=Mistä on kyse tässä tiimissä?
 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.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Asetukset
 settings.options=Valinnaiset
@@ -990,12 +1006,19 @@ first_page=Ensimmäinen
 last_page=Viimeisin
 total=Yhteensä: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Statistiikka
 dashboard.operations=Toiminnot
 dashboard.system_status=Järjestelmänvalvonnan tila
 dashboard.statistic_info=Gogs tietokannassa on <b>%d</b> käyttäjää, <b>%d</b> organisaatiota, <b>%d</b> julkista avainta, <b>%d</b> repoa, <b>%d</b> tarkkailijaa, <b>%d</b> tähteä, <b>%d</b> toimea, <b>%d</b> sisäänkirjautunutta, <b>%d</b> ongelmaa, <b>%d</b> kommenttia, <b>%d</b> sosiaalista tiliä, <b>%d</b> seuraajaa, <b>%d</b> peiliä, <b>%d</b> julkaisua, <b>%d</b> kirjautumis lähdettä, <b>%d</b> webkoukkua, <b>%d</b> merkkipaalua, <b>%d</b> tunnistetta, <b>%d</b> koukku tehtävää, <b>%d</b> tiimiä, <b>%d</b> päivitys tehtävää, <b>%d</b> liitetiedostoa.
 dashboard.operation_name=Toiminnon nimi
 dashboard.operation_switch=Vaihda
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Suorita
 dashboard.clean_unbind_oauth=Puhdista ei-liitetyt OAuthit
 dashboard.clean_unbind_oauth_success=Kaikki ei-liitetyt OAuthit on poistettu onnistuneesti.
@@ -1087,11 +1110,12 @@ repos.stars=Äänet
 repos.issues=Ongelmat
 repos.size=Koko
 
-auths.auth_manage_panel=Todennus hallintapaneeli
+auths.auth_sources=Authentication Sources
 auths.new=Lisää uusi lähde
 auths.name=Nimi
 auths.type=Tyyppi
 auths.enabled=Käytössä
+auths.default=Oletus
 auths.updated=Päivitetty
 auths.auth_type=Todennustyyppi
 auths.auth_name=Todennusnimi
@@ -1128,9 +1152,9 @@ auths.enable_tls=Ota käyttöön TLS-salaus
 auths.skip_tls_verify=Ohita TLS tarkistaminen
 auths.pam_service_name=PAM palvelun nimi
 auths.enable_auto_register=Ota käyttöön automaattinen rekisteröinti
-auths.tips=Vinkit
 auths.edit=Muokkaa todennusasetusta
 auths.activated=Tämä todennus on aktivoitu
+auths.default_auth=This authentication is default login source
 auths.new_success=Uusi todennus '%s' on luotu onnistuneesti.
 auths.update_success=Todennusasetus on päivitetty onnistuneesti.
 auths.update=Päivitä todennusasetus
@@ -1140,119 +1164,180 @@ 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=Kirjautumislähde '%s' on jo olemassa
+auths.github_api_endpoint=API päätepiste
 
-config.not_set=(not set)
-config.server_config=Palvelin asetukset
-config.app_name=Sovellus nimi
-config.app_ver=Sovellus versio
-config.app_url=Sovellus URL
-config.domain=Verkkotunnus
-config.offline_mode=Offline-tila
-config.disable_router_log=Poista käytöstä reitittimen loki
+config.not_set=(ei ole asetettu)
+config.server_config=Palvelinasetukset
+config.brand_name=Brand name
 config.run_user=Suorita käyttäjänä
 config.run_mode=Suoritustila
-config.git_version=Git versio
-config.static_file_root_path=Staattisen tiedoston juuren polku
-config.log_file_root_path=Lokitiedoston juuren polku
-config.reverse_auth_user=Käänteinen todennus käyttäjä
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH asetukset
-config.ssh_enabled=Käytössä
-config.ssh_start_builtin_server=Käynnistä sisäänrakennettu palvelin
-config.ssh_domain=Verkkotunnus
-config.ssh_port=Portti
-config.ssh_listen_port=Kuuntele porttia
-config.ssh_root_path=Juuren polku
-config.ssh_key_test_path=Polku jossa avaimet testataan
-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.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 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=Ensisijaiset lisenssit
-config.disable_http_git=Poista käytöstä HTTP Git
-config.enable_local_path_migration=Ota käyttöön paikallisen polun migraatio
-config.commits_fetch_concurrency=Committien noudon samanaikaisuus
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Tietokannan asetukset
-config.db_type=Tyyppi
-config.db_host=Isäntä
-config.db_name=Nimi
-config.db_user=Käyttäjä
-config.db_ssl_mode=SSL tila
-config.db_ssl_mode_helper=(vain "postgres")
-config.db_path=Polku
-config.db_path_helper=("sqlite3" ja "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Palvelu asetukset
-config.register_email_confirm=Vaadi sähköpostivahvistus
-config.disable_register=Poista käytöstä rekisteröinti
-config.show_registration_button=Näytä rekisteröidy painike
-config.require_sign_in_view=Vaadi sisäänkirjautuminen nähdäksesi
-config.mail_notify=Sähköposti ilmoitukset
-config.disable_key_size_check=Poista käytöstä avaimen vähimmäiskoko tarkistus
-config.enable_captcha=Ota käyttöön Captcha
-config.active_code_lives=Aktiivinen koodi elämät ennen vanhenemista
-config.reset_password_code_lives=Nollaa salasana koodi elämät
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Webkoukku asetukset
-config.queue_length=Jonon pituus
-config.deliver_timeout=Toimitus aikakatkaisu
-config.skip_tls_verify=Ohita TLS tarkistaminen
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Sähköpostipalvelin asetukset
-config.mailer_enabled=Käytössä
-config.mailer_disable_helo=Poista käytöstä HELO
-config.mailer_name=Nimi
-config.mailer_host=Isäntä
-config.mailer_user=Käyttäjä
-config.send_test_mail=Lähetä testi sähköposti
-config.test_mail_failed=Testi sähköpostin lähettäminen vastaanottajalle '%s': %v epäonnistui
-config.test_mail_sent=Testi sähköposti on lähetetty vastaanottajalle '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth asetukset
-config.oauth_enabled=Käytössä
-
-config.cache_config=Välimuistin asetukset
-config.cache_adapter=Välimuistin sovitin
-config.cache_interval=Välimuistin aikaväli
-config.cache_conn=Välimuistin yhteys merkkijono
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Istunnon asetukset
-config.session_provider=Istunnon toimittaja
-config.provider_config=Toimittajan asetukset
-config.cookie_name=Evästenimi
-config.enable_set_cookie=Ota käyttöön aseta eväste
-config.gc_interval_time=GC aikaväli aika
-config.session_life_time=Istunnon elinikä
-config.https_only=Vain HTTPS
-config.cookie_life_time=Evästeen elinikä
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Välimuistin asetukset
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP-asetukset
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Kuva asetukset
-config.picture_service=Kuva palvelu
-config.disable_gravatar=Poista käytöstä Gravatar
-config.enable_federated_avatar=Käytä ulkopuolisia profiilikuvia
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Webkoukku asetukset
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 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.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Loki asetukset
+config.log_file_root_path=Lokitiedoston juuren polku
 config.log_mode=Tila
 config.log_options=Valinnaiset
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Järjestelmän ilmoitukset on poistettu onnistuneesti.
 
 [action]
 create_repo=luotu repo <a href="%s">%s</a>
-fork_repo=forkattu repo kohteeseen <a href="%s"> %s</a>
 rename_repo=uudelleennimetty repo <code>%[1]s</code> nimelle <a href="%[2]s">%[3]s</a>
 commit_repo=pushattu kohteeseen <a href="%[1]s/src/%[2]s">%[3]s</a> paikassa <a href="%[1]s">%[4]s</a>
 compare_commits=Näytä vertailu näille %d commiteille
@@ -1300,6 +1384,10 @@ create_branch=luotu uusi haara <a href="%[1]s/src/%[2]s">%[3]s</a> kohteeseen <a
 delete_branch=poistettu haara <code>%[2]s</code> kohteesta <a href="%[1]s">%[3]s</a>
 push_tag=pushattu tagi <a href="%s/src/%s">%[2]s</a> kohteeseen <a href="%[1]s">%[3]s</a>
 delete_tag=poistettu tagi <code>%[2]s</code> kohteesta <a href="%[1]s">%[3]s</a>
+fork_repo=forkattu repo kohteeseen <a href="%s"> %s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=sitten
@@ -1321,6 +1409,7 @@ months=%d kuukautta %s
 years=%d vuotta %s
 raw_seconds=sekuntia
 raw_minutes=minuuttia
+raw_hours=hours
 
 [dropzone]
 default_message=Pudota tiedostot tähän tai klikkaa lataamista varten.

conf/locale/locale_fr-FR.ini

@@ -9,7 +9,6 @@ sign_out=Déconnexion
 sign_up=Inscription
 register=S'inscrire
 website=Site web
-version=Version
 page=Page
 template=Modèle
 language=Langue
@@ -44,6 +43,10 @@ issues=Tickets
 
 cancel=Annuler
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Installation
 title=Instructions pour la première exécution
@@ -122,6 +125,7 @@ run_user_not_match=L'utilisateur d'exécution saisi n'est pas l'utilisateur d'ex
 smtp_host_missing_port=Le numéro de port est manquant dans l'adresse de l'Hôte SMTP.
 invalid_smtp_from=Le champ SMTP Provenant de n'est pas valide: %v
 save_config_failed=La sauvegarde de la configuration a échoué : %v
+init_failed=Failed to initialize application: %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.
 invalid_log_root_path=L'emplacement racine des fichiers logs est invalide : %v
@@ -151,6 +155,8 @@ register_hepler_msg=Déjà enregistré ? Connectez-vous !
 social_register_hepler_msg=Déjà enregistré ? Associez-le !
 disable_register_prompt=Désolé, les enregistrements ont été désactivés. Veuillez contacter l'administrateur du site.
 disable_register_mail=Désolé, la confirmation par courriel des enregistrements a été désactivée.
+auth_source=Sources d'authentification
+local=Locale
 remember_me=Se souvenir de moi
 forgot_password=Mot de passe oublié
 forget_password=Mot de passe oublié ?
@@ -229,6 +235,7 @@ org_name_been_taken=Nom d'organisation déjà pris.
 team_name_been_taken=Nom d'équipe déjà pris.
 email_been_used=Adresse e-mail déjà utilisée.
 username_password_incorrect=Nom d'utilisateur ou mot de passe incorrect.
+auth_source_mismatch=La source d’authentification sélectionnée n’est pas associée à l’utilisateur.
 enterred_invalid_repo_name=Veuillez vérifier que le nom saisi du dépôt soit correct.
 enterred_invalid_owner_name=Veuillez vérifier que le nom du propriétaire saisi soit correct.
 enterred_invalid_password=Veuillez vérifier que le mot de passe saisi soit correct.
@@ -256,8 +263,7 @@ following=Abonnements
 follow=Suivre
 unfollow=Ne plus suivre
 
-form.name_reserved=Le nom '%s' est réservé.
-form.name_pattern_not_allowed=Motif '%s' interdit pour les noms d'utilisateur.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profil
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Ou entrez la phrase secrète :
 two_factor_then_enter_passcode=Puis entrez le mot de passe :
 two_factor_verify=Vérifier
 two_factor_invalid_passcode=Le mot de passe que vous avez entré n'est pas valide, veuillez réessayer.
+two_factor_reused_passcode=Le mot de passe que vous avez entré a déjà été utilisé, veuillez en essayez un autre !
 two_factor_enable_error=L'activation de l'authentification en deux étapes a échoué : %v
 two_factor_enable_success=L'authentification en deux étapes a été bien été activée pour votre compte.
 two_factor_recovery_codes_title=Codes de secours pour l'authentification en deux étapes
@@ -370,6 +377,7 @@ delete_token=Supprimer
 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.
+token_name_exists=Token with same name already exists.
 
 orgs.none=Vous n'êtes membre d'aucune organisation.
 orgs.leave_title=Quitter une organisation
@@ -393,7 +401,7 @@ repo_name_helper=Idéalement, le nom d'un dépot devrait être court, mémorable
 visibility=Visibilité
 visiblity_helper=Ce dépôt est <span class="ui red text"> privé</span>
 visiblity_helper_forced=L'administrateur du site a forcé tous les nouveaux dépôts à être <span class="ui red text">privés</span>
-visiblity_fork_helper=(Les changement de cette valeur affecteront tous les forks)
+visiblity_fork_helper=(Les changements de cette valeur affecteront tous les forks)
 clone_helper=Besoin d'aide pour dupliquer ? Visitez <a target="_blank" href="%s">l'aide</a> !
 fork_repo=Créer un fork du dépôt
 fork_from=Fork de
@@ -417,10 +425,11 @@ mirror_last_synced=Dernière synchronisation
 watchers=Observateurs
 stargazers=Stargazers
 forks=Forks
+repo_description_helper=Description du dépôt. 512 caractères maximum.
+repo_description_length=Caractères disponibles
 
 form.reach_limit_of_creation=Le propriétaire a atteint le nombre maximal de %d dépôts créés.
-form.name_reserved=Le nom de dépôt '%s' est réservé.
-form.name_pattern_not_allowed=Motif '%s' interdit pour les noms de dépôt.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Nécessite une Autorisation
 migrate_type=Type de migration
@@ -469,7 +478,7 @@ file_raw=Raw
 file_history=Historique
 file_view_raw=Voir le Raw
 file_permalink=Lien permanent
-file_too_large=Ce fichier est trop gros pour être afficher
+file_too_large=Ce fichier est trop gros pour être affiché
 video_not_supported_in_browser=Votre navigateur ne supporte pas la balise video HTML5.
 
 branches.overview=Résumé
@@ -495,10 +504,10 @@ editor.filename_help=Pour ajouter un répertoire, il suffit de le taper puis d'a
 editor.or=ou
 editor.cancel_lower=annuler
 editor.commit_changes=Commit les modifications
-editor.add_tmpl=Ajouter '%s/<filename>'
-editor.add=Ajouter '%s'
-editor.update=Mettre à jour '%s'
-editor.delete=Supprimer '%s'
+editor.add_tmpl=Ajout de '%s/<filename>'
+editor.add=Ajout de '%s'
+editor.update=Mise à jour de '%s'
+editor.delete=Suppression de '%s'
 editor.commit_message_desc=Ajouter une optionnelle description détaillée...
 editor.commit_directly_to_this_branch=Soumettre directement à la branche <strong class="branch-name">%s</strong>.
 editor.create_new_branch=Créer une <strong>nouvelle branche</strong> pour cette validation et envoyer une nouvelle pull request.
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Le contenu du fichier à changé depuis que vo
 editor.file_already_exists=La branche '%s' existe déjà dans ce dépôt.
 editor.no_changes_to_show=Il n’y a aucun changement à afficher.
 editor.fail_to_update_file=Échec lors de la mise à jour/création du fichier '%s' avec l'erreur : %v
+editor.fail_to_delete_file=Impossible de supprimer le fichier «%s» avec l’erreur : %v
 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'
@@ -617,14 +627,14 @@ pulls.filter_branch=Filtre de branche
 pulls.no_results=Aucun résultat trouvé.
 pulls.nothing_to_compare=Il n'y a rien de comparable parce que les deux branches sont égales.
 pulls.nothing_merge_base=Il n'y a rien à comparer parce que les deux branches ont un historique complètement différent.
-pulls.has_pull_request=`Il y a déjà une demande de tirer entre ces deux cibles : <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
-pulls.create=Creer une Pull Request
+pulls.has_pull_request=`Il y a déjà une pull request entre ces deux cibles : <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
+pulls.create=Créer une Pull Request
 pulls.title_desc=veut fusionner %[1]d commits à partir de <code>%[2]s</code> vers <code>%[3]s</code>
-pulls.merged_title_desc=à fusionné %[1]d commits à partir de <code>%[2]s</code> vers <code>%[3]s</code> %[4]s
+pulls.merged_title_desc=a fusionné %[1]d commits à partir de <code>%[2]s</code> vers <code>%[3]s</code> %[4]s
 pulls.tab_conversation=Conversation
 pulls.tab_commits=Commits
 pulls.tab_files=Fichiers modifiés
-pulls.reopen_to_merge=Veuillez rouvrir cette demande de Pull Request pour effectuer l'opération de fusion.
+pulls.reopen_to_merge=Veuillez rouvrir cette Pull Request pour effectuer l'opération de fusion.
 pulls.merged=Fusionné
 pulls.has_merged=Cette Pull Request a été fusionnée avec succès !
 pulls.data_broken=Les données de cette pull request ont été compromises en raison de la suppression d'informations sur le fork.
@@ -632,8 +642,9 @@ pulls.is_checking=La recherche de conflits est toujours en cours, veuillez rafra
 pulls.can_auto_merge_desc=Cette pull request peut être fusionnée automatiquement.
 pulls.cannot_auto_merge_desc=Cette pull request ne peut être fusionnée automatiquement à cause de conflits.
 pulls.cannot_auto_merge_helper=Fusionner manuellement afin de résoudre les conflits.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Créer un commit de fusion
+pulls.rebase_before_merging=Rebaser avant la fusion
+pulls.commit_description=Description du commit
 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
@@ -702,7 +713,7 @@ 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=Exiger une pull request 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 des fusions directes de cette branche. Les utilisateurs dans cette liste blanche passeront outre la nécessité de valider leurs requêtes de fusion.
@@ -738,9 +749,9 @@ settings.tracker_issue_style=Style de nommage des bugs du tracker externe :
 settings.tracker_issue_style.numeric=Numérique
 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.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Activer les pull requests pour accepter les contributions depuis des dépôts et des branches
+settings.pulls.ignore_whitespace=Ignorer les changements quand ce sont des espaces
+settings.pulls.allow_rebase_merge=Autoriser l'utilisation de rebase pour fusionner les validations
 settings.danger_zone=Zone de danger
 settings.cannot_fork_to_same_owner=Vous ne pouvez par créer un fork d'un dépot à son propriétaire actuel.
 settings.new_owner_has_same_repo=Le nouveau propriétaire a déjà un dépôt nommé ainsi.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Ajouter un Webhook
 settings.webhook_deletion=Supprimer le Webhook
 settings.webhook_deletion_desc=Supprimer ce webhook va supprimer ses informations et l'historique de livraison. Voulez-vous continuer ?
 settings.webhook_deletion_success=Le webhook a été supprimé avec succès !
@@ -792,6 +805,8 @@ settings.webhook.response=Réponse
 settings.webhook.headers=Entêtes 
 settings.webhook.payload=Payload
 settings.webhook.body=Corps
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Les Hooks Git sont alimentés par Git lui même. Les Hooks compatibles sont modifiables dans la liste ci-dessous pour effectuer des opérations personnalisées.
 settings.githook_edit_desc=Si un Hook est inactif, un exemple de contenu vous sera proposé. Un contenu laissé vide signifie un Hook inactif.
 settings.githook_name=Nom du Hook
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push vers un dépôt
 settings.event_issues=Tickets
 settings.event_issues_desc=Ticket ouvert, fermé, réouvert, modifié, assigné, non-assigné, étiquette mise à jour, étiquette nettoyée, jalonnée, ou déjalonnée.
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull requests ouverte, fermée, réouverte, modifiée, assignée, non-assignée, étiquette mise à jour, étiquette nettoyée, jalonnée, déjalonnée, ou synchronisée.
 settings.event_issue_comment=Commentaire du ticket
 settings.event_issue_comment_desc=Commentaire du ticket créé, modifié, ou supprimé.
-settings.event_pull_request=Pull Request
-settings.event_pull_request_desc=Requête de fusion ouverte, fermée, réouverte, modifiée, assignée, non-assignée, étiquette mise à jour, étiquette nettoyée, jalonnée, déjalonnée, ou synchronisée.
 settings.event_release=Version publiée
 settings.event_release_desc=Version publiée dans un dépôt.
 settings.active=Actif
@@ -835,7 +850,7 @@ 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.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository.
+settings.add_dingtalk_hook_desc=Ajouter l'intégration de <a href="%s">Dingtalk</a> à votre dépôt.
 settings.slack_token=Jeton
 settings.slack_domain=Domaine
 settings.slack_channel=Canal
@@ -852,6 +867,8 @@ settings.add_key_success=La nouvelle clé de déploiement '%s' a été ajoutée
 settings.deploy_key_deletion=Supprimer la Clé de Déploiement
 settings.deploy_key_deletion_desc=Supprimer cette clé de déploiement effacera tous les accès relatifs pour ce référentiel. Voulez-vous continuer ?
 settings.deploy_key_deletion_success=La clé de déploiement a été supprimée avec succès !
+settings.description_desc=Description du dépôt. 512 caractères maximum.
+settings.description_length=Caractères disponibles
 
 diff.browse_source=Parcourir la source
 diff.parent=Parent
@@ -916,9 +933,8 @@ team_name_helper=Ce nom sera utilisé pour mentionner l'équipe dans les convers
 team_desc_helper=Présentation de l'équipe
 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é.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Paramètres
 settings.options=Options
@@ -935,7 +951,7 @@ settings.delete_prompt=Cela supprimera cette organisation définitivement. Cette
 settings.confirm_delete_account=Confirmez la suppression
 settings.delete_org_title=Suppression d'organisation
 settings.delete_org_desc=Cette organisation sera définitivement supprimée. Continuer ?
-settings.hooks_desc=Ajoute des vebhooks qui seront activés pour <strong>tous les dépôts</strong> de cette organisation.
+settings.hooks_desc=Ajoute des webhooks qui seront activés pour <strong>tous les dépôts</strong> de cette organisation.
 
 members.membership_visibility=Visibilité des membres:
 members.public=Public
@@ -990,12 +1006,19 @@ first_page=Première
 last_page=Dernière
 total=Total : %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Statistiques
 dashboard.operations=Opérations
 dashboard.system_status=État du système
 dashboard.statistic_info=La base de données Gogs contient <b>%d</b> utilisateurs, <b>%d</b> organisations, <b>%d</b> clés publiques, <b>%d</b> dépôts, <b>%d</b> surveillances de dépôts, <b>%d</b> votes, <b>%d</b> actions, <b>%d</b> accès, <b>%d</b> tickets, <b>%d</b> commentaires, <b>%d</b> comptes de réseaux sociaux, <b>%d</b> abonnements, <b>%d</b> miroirs, <b>%d</b> versions, <b>%d</b> connexions d'origine, <b>%d</b> webhooks, <b>%d</b> versions, <b>%d</b> labels, <b>%d</b> tâches hook, <b>%d</b> équipes, <b>%d</b> tâches de mise à jour, <b>%d</b> fichiers.
 dashboard.operation_name=Nom de l'Opération
 dashboard.operation_switch=Basculer
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Exécuter
 dashboard.clean_unbind_oauth=Nettoyer les associations OAuthes
 dashboard.clean_unbind_oauth_success=Tous unbind OAuthes ont été supprimés avec succès.
@@ -1087,11 +1110,12 @@ repos.stars=Votes
 repos.issues=Tickets
 repos.size=Taille
 
-auths.auth_manage_panel=Panel d'administration des authentifications
+auths.auth_sources=Sources d'authentification
 auths.new=Ajouter une nouvelle source d'authentification
 auths.name=Nom
 auths.type=Type
 auths.enabled=Activé
+auths.default=Par défaut
 auths.updated=Mis à jour
 auths.auth_type=Type d'authentification
 auths.auth_name=Nom de l'authentification
@@ -1100,21 +1124,21 @@ auths.domain=Domaine
 auths.host=Hôte
 auths.port=Port
 auths.bind_dn=Bind DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Vous pouvez utiliser « %s » qui sera remplacé par le nom d'utilisateur, par exemple « DOM\%s »
 auths.bind_password=Bind mot de passe
 auths.bind_password_helper=Avertissement : Ce mot de passe est stocké en clair. N'utilisez pas le mot de passe d'un compte doté de privilèges élevés.
 auths.user_base=Utilisateur Search Base
 auths.user_dn=Utilisateur DN
 auths.attribute_username=Attribut nom d'utilisateur
 auths.attribute_username_placeholder=Laisser vide pour utiliser la valeur du formulaire d'authentification comme nom d'utilisateur.
-auths.attribute_name=First Name Attribute
+auths.attribute_name=Attribut du prénom
 auths.attribute_surname=Attribut du nom de famille
 auths.attribute_mail=Attribut de l'e-mail
 auths.verify_group_membership=Vérifier l'appartenance à un groupe
-auths.group_search_base_dn=Group Search Base DN
+auths.group_search_base_dn=Recherche de groupe basée sur le nom de domaine
 auths.group_filter=Filtre par groupe
 auths.group_attribute_contain_user_list=Attribut de groupe contenant la liste des utilisateurs
-auths.user_attribute_listed_in_group=User Attribute Listed in Group
+auths.user_attribute_listed_in_group=Attribut de l'utilisateur listé dans le groupe
 auths.attributes_in_bind=Aller chercher les attributs dans le contexte de liaison DN
 auths.filter=Filtre utilisateur
 auths.admin_filter=Filtre administrateur
@@ -1128,9 +1152,9 @@ auths.enable_tls=Activer le Chiffrement TLS
 auths.skip_tls_verify=Ne pas vérifier TLS
 auths.pam_service_name=Nom du Service PAM
 auths.enable_auto_register=Connexion Automatique
-auths.tips=Conseils
 auths.edit=Modifier les paramètres d'authentification
 auths.activated=Authentification activée
+auths.default_auth=Cette authentification est la source de connexion par défaut
 auths.new_success=Nouvelle authentification «%s » a été ajoutée avec succès.
 auths.update_success=Les paramètre d'authentification a été mis à jour avec succès.
 auths.update=Mettre à jour les paramètres d'authentifications
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Cette authentification va être supprimée. voulez-vous c
 auths.still_in_used=Cette authentification est encore utilisée par d'autres utilisateurs, supprimez-les ou convertir ces utilisateurs vers un autre type de session, avant.
 auths.deletion_success=L'authentification a été supprimée avec succès !
 auths.login_source_exist=La source de connexion « %s » existe déjà.
+auths.github_api_endpoint=API Endpoint
 
-config.not_set=(not set)
+config.not_set=(non défini)
 config.server_config=Configuration du Serveur
-config.app_name=Nom de l'application
-config.app_ver=Version de l'application
-config.app_url=URL de l'application
-config.domain=Domaine
-config.offline_mode=Mode hors-ligne
-config.disable_router_log=Désactiver la Journalisation du Routeur
+config.brand_name=Brand name
 config.run_user=Utilisateur système
 config.run_mode=Mode d'Éxécution
-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.reverse_auth_user=Annuler l'Authentification de l'Utilisateur
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=Configuration SSH
-config.ssh_enabled=Activé
-config.ssh_start_builtin_server=Démarrer le serveur intégré
-config.ssh_domain=Domaine
-config.ssh_port=Port
-config.ssh_listen_port=Port d'écoute
-config.ssh_root_path=Emplacement racine
-config.ssh_key_test_path=Chemin de test des clés
-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.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Configuration de la Base de Données
-config.db_type=Type
-config.db_host=Hôte
-config.db_name=Nom
-config.db_user=Utilisateur
-config.db_ssl_mode=Mode SSL
-config.db_ssl_mode_helper=("postgres" uniquement)
-config.db_path=Emplacement
-config.db_path_helper=(pour « sqlite3 » et « TIDB »)
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Configuration du Service
-config.register_email_confirm=Nécessite une confirmation par e-mail
-config.disable_register=Désactiver les inscriptions
-config.show_registration_button=Afficher le bouton d'enregistrement
-config.require_sign_in_view=Connexion obligatoire pour visualiser
-config.mail_notify=Notifier par mail
-config.disable_key_size_check=Désactiver la vérification de la taille de clé minimale
-config.enable_captcha=Activez le Captcha
-config.active_code_lives=Limites de Code Actif
-config.reset_password_code_lives=Réinitialiser le Mot De Passe des Limites de Code
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Configuration Webhook
-config.queue_length=Longueur de la file d'attente
-config.deliver_timeout=Expiration d'Envoi
-config.skip_tls_verify=Ne pas vérifier TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Configuration du service de mail
-config.mailer_enabled=Activé
-config.mailer_disable_helo=Désactiver HELO
-config.mailer_name=Nom
-config.mailer_host=Hôte
-config.mailer_user=Utilisateur
-config.send_test_mail=Envoyer courriel de Test
-config.test_mail_failed=Impossible d'envoyer un e-mail de test à '%s': %v
-config.test_mail_sent=Un e-mail de test à été envoyé à '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Configuration OAuth
-config.oauth_enabled=Activé
-
-config.cache_config=Configuration du Cache
-config.cache_adapter=Adaptateur du Cache
-config.cache_interval=Intervales du Cache
-config.cache_conn=Liaison du Cache
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Configuration de session
-config.session_provider=Fournisseur de session
-config.provider_config=Configuration du fournisseur
-config.cookie_name=Nom du cookie
-config.enable_set_cookie=Activer les cookies
-config.gc_interval_time=Intervals GC
-config.session_life_time=Durée des sessions
-config.https_only=HTTPS uniquement
-config.cookie_life_time=Expiration du cookie
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Configuration du Cache
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=Configuration HTTP
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Configuration d'Image
-config.picture_service=Service d'Imagerie
-config.disable_gravatar=Désactiver Gravatar
-config.enable_federated_avatar=Activer les avatars unifiés
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Configuration Webhook
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Configuration de Git
-config.git_disable_diff_highlight=Désactiver la surbrillance syntaxique de Diff
-config.git_max_diff_lines=Lignes de Diff Max (pour un seul fichier)
-config.git_max_diff_line_characters=Nombre max de caractères de Diff (pour une seule ligne)
-config.git_max_diff_files=Nombre max de fichiers de Diff (à afficher)
-config.git_gc_args=Arguments de GC
-config.git_migrate_timeout=Délai imparti pour une migration
-config.git_mirror_timeout=Délai imparti pour mettre à jour le miroir
-config.git_clone_timeout=Délai imparti pour l'opération "Clone"
-config.git_pull_timeout=Délai imparti pour l'opération "Pull"
-config.git_gc_timeout=Délai imparti pour l'opération "GC"
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Configuration du Journal
+config.log_file_root_path=Emplacement Racine du Fichier Journal
 config.log_mode=Mode
 config.log_options=Options
 
@@ -1273,7 +1358,7 @@ notices.actions=Actions
 notices.select_all=Tout Sélectionner
 notices.deselect_all=Tous déselectionner
 notices.inverse_selection=Inverser la sélection
-notices.delete_selected=Supprimé les éléments sélectionnés
+notices.delete_selected=Supprimer les éléments sélectionnés
 notices.delete_all=Supprimer toutes les notifications
 notices.type=Type
 notices.type_1=Dépôt
@@ -1283,7 +1368,6 @@ notices.delete_success=Notifications système supprimées avec succès.
 
 [action]
 create_repo=a créé le dépôt <a href="%s">%s</a>
-fork_repo=a créé sa branche du dépôt vers <a href="%s">%s</a>
 rename_repo=a rebaptisé le dépôt de <code>%[1]s</code> vers <a href="%[2]s">%[3]s</a>
 commit_repo=a commité dans <a href="%[1]s/src/%[2]s">%[3]s</a> sur <a href="%[1]s">%[4]s</a>
 compare_commits=Comparer ces %d commits
@@ -1293,13 +1377,17 @@ close_issue=`tickets clos <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`tickets ré-ouverts <a href="%s/issues/%s">%s#%[2]s</a>`
 comment_issue=`a commenté le problème <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`pull request créée le <a href="%s/pulls/%s">%s#%[2]s</a>`
-close_pull_request=`pull request fermé <a href="%s/pulls/%s">%s#%[2]s</a>`
+close_pull_request=`pull request fermée <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`pull request ré-ouverte <a href="%s/pulls/%s">%s#%[2]s</a>`
 merge_pull_request=`pull request fusionné le <a href="%s/pulls/%s">%s#%[2]s</a>`
 create_branch=nouvelle branche créée <a href="%[1]s/src/%[2]s">%[3]s</a> sur <a href="%[1]s">%[4]s</a>
 delete_branch=branche supprimée <code>%[2]s</code> sur <a href="%[1]s">%[3]s</a>
 push_tag=a soumis le tag <a href="%s/src/%s">%[2]s</a> sur <a href="%[1]s">%[3]s</a>
 delete_tag=étiquette supprimée <code>%[2]s</code> sur <a href="%[1]s">%[3]s</a>
+fork_repo=a créé sa branche du dépôt vers <a href="%s">%s</a>
+mirror_sync_push=a commité dans <a href="%[1]s/src/%[2]s">%[3]s</a> sur <a href="%[1]s">%[4]s</a>
+mirror_sync_create=a synchronisé la nouvelle référence <a href="%s/src/%s">%[2]s</a> vers <a href="%[1]s">%[3]s</a> depuis le miroir
+mirror_sync_delete=Référence synchronisés et supprimé <code>%[2]s</code> sur <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=il y a
@@ -1321,6 +1409,7 @@ months=%[2]s %[1]d mois
 years=%[2]s %[1]d ans
 raw_seconds=secondes
 raw_minutes=minutes
+raw_hours=hours
 
 [dropzone]
 default_message=Déposez les fichiers ici ou cliquez pour télécharger.

conf/locale/locale_gl-ES.ini

@@ -9,7 +9,6 @@ sign_out=Cerrar sesión
 sign_up=Rexistro
 register=Rexistro
 website=Páxina web
-version=Versión
 page=Páxina
 template=Modelo
 language=Idioma
@@ -44,11 +43,15 @@ issues=Incidencias
 
 cancel=Cancelar
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 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 requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs require MySQL, PostgreSQL, SQLite3, MSSQL ouTiDB.
 db_title=Configuración de base de datos
 db_type=Tipo de base de datos
 host=Host
@@ -58,8 +61,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=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=A ruta do ficheiro da base de datos SQLite3. <br> Utilice a ruta absoluta cando arrique o servicio.
+err_empty_db_path=A ruta da base de datos SQLite3 non pode estar baleira.
 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.
 
@@ -74,16 +77,16 @@ 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.
+use_builtin_ssh_server=Utilizar Builin en Sevidor SSH
+use_builtin_ssh_server_popup=Inicia o servidor SSH integrado para que as operacións de Git sexan distintas do demonio SSH do sistema.
 http_port=Porto HTTP
 http_port_helper=Porto no que escoitará a aplicación.
 app_url=URL da aplicación
 app_url_helper=Isto afecta ás URLs para clonar por HTTP/HTTPS e a algúns correos electrónicos.
 log_root_path=Ruta do rexistro
 log_root_path_helper=Directorio onde almacenar os rexistros.
-enable_console_mode=Enable Console Mode
-enable_console_mode_popup=In addition to file mode, also print logs to console.
+enable_console_mode=Habilitar Modo Consola
+enable_console_mode_popup=Ademáis do modo de ficheiro, tamén imprime os rexistros para a consola.
 
 optional_title=Configuración opcional
 email_title=Configuración do servizo de correo
@@ -119,9 +122,11 @@ sqlite3_not_available=A túa versión non soporta SQLite3, por favor, descarga o
 invalid_db_setting=A configuración da base de datos non é correcta: %v
 invalid_repo_path=A ruta da raíz do repositorio é inválida: %v
 run_user_not_match=A persoa usuaria que está executando a aplicación non é a persoa usuaria actual: %s -> %s
-smtp_host_missing_port=SMTP Host is missing port in address.
+smtp_host_missing_port=Falta o porto do Host SMTP
+
 invalid_smtp_from=O campo From do SMTP non é valido: %v
 save_config_failed=Erro ao gardar a configuración: %v
+init_failed=Failed to initialize application: %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.
 invalid_log_root_path=A ruta para os rexistros é inválida: %v
@@ -151,6 +156,8 @@ register_hepler_msg=Xa tes unha conta? Inicia sesión!
 social_register_hepler_msg=Xa tes unha conta? Enlázaa!
 disable_register_prompt=Sentímolo, o rexistro está deshabilitado. Por favor, contacta co administrador do sitio.
 disable_register_mail=Sentímolo. Os correos de confirmación de rexistro están deshabilitados.
+auth_source=Fonte de Autenticación
+local=Configuración rexional
 remember_me=Recórdame
 forgot_password=Esquecín o meu contrasinal
 forget_password=Esqueciches o teu contrasinal?
@@ -169,13 +176,13 @@ reset_password_helper=Prema aquí para restablecer o seu contrasinal
 password_too_short=A lonxitude do contrasinal non pode ser menor de 6.
 non_local_account=Contas que non son locais non poden cambiar os contrasinais a través de Gogs.
 
-login_two_factor=Two-factor Authentication
-login_two_factor_passcode=Authentication Passcode
-login_two_factor_enter_recovery_code=Enter a two-factor recovery code
-login_two_factor_recovery=Two-factor Recovery
-login_two_factor_recovery_code=Recovery Code
-login_two_factor_enter_passcode=Enter a two-factor passcode
-login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+login_two_factor=Autenticación en dous pasos
+login_two_factor_passcode=Código de Autenticación
+login_two_factor_enter_recovery_code=Introduza o código de recuperación da verificación en dous pasos
+login_two_factor_recovery=Recuperación en dous pasos
+login_two_factor_recovery_code=Codigo de Recuperación
+login_two_factor_enter_passcode=Introduza o código de acceso en dous pasos
+login_two_factor_invalid_recovery_code=O código de recuperación foi usado ou non é válido.
 
 [mail]
 activate_account=Por favor, activa a túa conta
@@ -212,7 +219,7 @@ Content=Contido
 require_error=` non pode estar baleiro.`
 alpha_dash_error=` os caracteres deben ser alfanuméricos ou dash(-_).`
 alpha_dash_dot_error=` debe ser un carácter alfanumérivo válido, un guión alto ou baixo (-_) ou un signo de puntuación.`
-alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
+alpha_dash_dot_slash_error=` debe ser un carácter válido : numérico, alfabético, guión(-_)  puntos ou barras.`
 size_error=` debe ser de tamaño %s.`
 min_size_error=` debe conter polo menos %s caracteres.`
 max_size_error=` debe conter como máximo %s caracteres.`
@@ -229,6 +236,7 @@ org_name_been_taken=Xa existe unha organización con este nome.
 team_name_been_taken=Xa existe un equipo con este nome.
 email_been_used=Este enderezo de correo electrónico xa está en uso.
 username_password_incorrect=Nome de usuario ou contrasinal incorrectos.
+auth_source_mismatch=A fonte de autenticación seleccionada non está asociada co usuario.
 enterred_invalid_repo_name=Por favor, asegúrate de que introduciches correctamente o nome do repositorio.
 enterred_invalid_owner_name=Por favor, asegúrate de que introduciches correctamente o nome do propietario.
 enterred_invalid_password=Por favor, asegúrate de que introduciches correctamente o teu contrasinal.
@@ -256,16 +264,15 @@ following=Seguindo
 follow=Seguir
 unfollow=Deixar de seguir
 
-form.name_reserved=O usuario '%s' está reservado.
-form.name_pattern_not_allowed=O patrón de nome de usuario '%s' non está permitido.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Perfil
 password=Contrasinal
 avatar=Avatar
 ssh_keys=Claves SSH
-security=Security
-repos=Repositories
+security=Seguridade
+repos=Repositorios
 orgs=Organizacións
 applications=Aplicacións
 delete=Eliminar conta
@@ -334,28 +341,29 @@ no_activity=Non hai actividade recente
 key_state_desc=Esta clave foi usada nos últimos 7 días
 token_state_desc=Token usado nos últimos 7 días
 
-two_factor=Two-factor Authentication
-two_factor_status=Status:
-two_factor_on=On
-two_factor_off=Off
-two_factor_enable=Enable
-two_factor_disable=Disable
+two_factor=Autenticación en Dous Pasos
+two_factor_status=Estado:
+two_factor_on=Si
+two_factor_off=Non
+two_factor_enable=Activar
+two_factor_disable=Desactivar
 two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
 two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
 two_factor_enable_title=Enable Two-factor Authentication
 two_factor_scan_qr=Please use your authentication application to scan the image:
 two_factor_or_enter_secret=Or enter the secret:
-two_factor_then_enter_passcode=Then enter passcode:
-two_factor_verify=Verify
+two_factor_then_enter_passcode=A continuación, introduza o código:
+two_factor_verify=Verificar
 two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_reused_passcode=The passcode you entered has already been used, please try another one!
 two_factor_enable_error=Enable Two-factor authentication failed: %v
 two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
 two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
 two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
-two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes=Rexenerar Códigos de Recuperación
 two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
 two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
-two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_title=Desactivar a verificación en dous pasos
 two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
 two_factor_disable_success=Two-factor authentication has disabled successfully!
 
@@ -370,13 +378,14 @@ delete_token=Eliminar
 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.
+token_name_exists=Token with same name already exists.
 
 orgs.none=Non es membro de nengunha organización.
 orgs.leave_title=Deixar unha organización
 orgs.leave_desc=Deixarás de ter aceso ao tódolos repositorios e equipos despois de deixar a organización. Desexas abandonala?
 
-repos.leave=Leave
-repos.leave_title=Leave repository
+repos.leave=Abandoar
+repos.leave_title=Deixar repositorio
 repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
 repos.leave_success=You have left repository '%s' successfully!
 
@@ -417,10 +426,11 @@ mirror_last_synced=Sincronizado por última vez
 watchers=Seguidores
 stargazers=Fans
 forks=Forks
+repo_description_helper=Description of repository. Maximum 512 characters length.
+repo_description_length=Available characters
 
 form.reach_limit_of_creation=El propietario ha alcanzado el límite máximo de %d repositorios creados.=O propietario acadou o límite máximo de %d repositorios creados.
-form.name_reserved=El nombre del repositorio '%s' está reservado.=O nome do repositorio '%s' está reservado.
-form.name_pattern_not_allowed=El patrón del nombre del repositorio '%s' no está permitido.=O patrón do nome do repositorio '%s' non está permitido.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Requiere autorización=Require autorización
 migrate_type=Tipo de migración
@@ -514,6 +524,7 @@ editor.file_changed_while_editing=O contido do arquivo cambiou desde que comezac
 editor.file_already_exists=Un arquivo co nome '%s' xa existe no repositorio.
 editor.no_changes_to_show=Non hai cambios que mostrar.
 editor.fail_to_update_file=Fallou o actualizar/crear o arquivo '%s' co erro: %v
+editor.fail_to_delete_file=Failed to delete file '%s' with error: %v
 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'
@@ -634,6 +645,7 @@ pulls.cannot_auto_merge_desc=Este Pull Request non pode ser fusionado automatica
 pulls.cannot_auto_merge_helper=Por favor, fusiona manualmente para resolver os conflitos.
 pulls.create_merge_commit=Create a merge commit
 pulls.rebase_before_merging=Rebase before merging
+pulls.commit_description=Commit Description
 pulls.merge_pull_request=Fusionar Pull Request
 pulls.open_unmerged_pull_exists=`Vostede non pode realizar a operación de reapertura porque nestes momentos existe unha solicitude de pull request (#%d) para o mesmo repositorio coa mesma información que se encontra á espera de aprobación`
 pulls.delete_branch=Eliminar branch
@@ -738,7 +750,7 @@ settings.tracker_issue_style=Estilo de etiquetaxe do tracker externo de incidenc
 settings.tracker_issue_style.numeric=Numérico
 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.pulls_desc=Enable pull requests to accept contributions between repositories and branches
 settings.pulls.ignore_whitespace=Ignore changes in whitespace
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Zona de perigo
@@ -761,7 +773,7 @@ settings.wiki_deletion_success=Os datos da wiki do repositorio foron borrados co
 settings.delete=Eliminar este repositorio
 settings.delete_desc=Unha vez que eliminaches un repositorio, non hai volta atrás. Por favor, asegúrate de que é o que queres.
 settings.delete_notices_1=- Esta operación <strong>NON SE PODE</strong> reverter.
-settings.delete_notices_2=- Esta operación eliminará de maneira permanente todo o contido deste repositorio, incluíndo os datos de git, as incidencias, os comentarios e os permisos de acceso dos colaboradores.
+settings.delete_notices_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
 settings.delete_notices_fork_1=- Todos os forks converteranse en independentes tras o borrado.
 settings.deletion_success=O repositorio foi eliminado satisfactoriamente!
 settings.update_settings_success=As opcións do repositorio actualizáronse correctamente.
@@ -777,8 +789,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Engadir Webhook
 settings.webhook_deletion=Eliminar Webhook
 settings.webhook_deletion_desc=Ao borrar este webhook eliminarase a súa información e todo o seu historial. Desexa continuar?
 settings.webhook_deletion_success=Webhook eliminado con éxito!
@@ -792,6 +806,8 @@ settings.webhook.response=Resposta
 settings.webhook.headers=Encabezado
 settings.webhook.payload=Payload
 settings.webhook.body=Corpo da mensaxe
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Os Git Hooks son unha funcionalidade do propio Git, podes editar os ficheiros dos hooks soportados na seguinte lista para aplicar operacións personalizadas.
 settings.githook_edit_desc=Se o hook non está activo, mostrarase contido de exemplo. Deixar o contido baleiro deshabilitará este hook.
 settings.githook_name=Nome do Hook
@@ -819,10 +835,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push a un repositorio
 settings.event_issues=Issues
 settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment=Issue Comment
-settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_pull_request=Pull Request
 settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_release=Release
 settings.event_release_desc=Release published in a repository.
 settings.active=Activo
@@ -852,6 +868,8 @@ settings.add_key_success=A nova clave de despregamento '%s' foi creada con éxit
 settings.deploy_key_deletion=Eliminar clave de despregamento
 settings.deploy_key_deletion_desc=Ao eliminar esta clave de despregamento perderase o permiso de acceso a este repositorio coa dita clave. Desexas continuar?
 settings.deploy_key_deletion_success=Clave de despregamento eliminada con éxito!
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=Explorar o código
 diff.parent=pai
@@ -916,9 +934,8 @@ team_name_helper=Utiliza este nome para mencionar este equipo nas conversas.
 team_desc_helper=En que consiste este equipo?
 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.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Configuración
 settings.options=Opcións
@@ -990,12 +1007,19 @@ first_page=Primeira
 last_page=Última
 total=Total: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Estatísticas
 dashboard.operations=Operacións
 dashboard.system_status=Estado do Monitor do Sistema
 dashboard.statistic_info=A base de datos de Gogs contén <b>%d</b> usuarios, <b>%d</b> organizacións, <b>%d</b> claves públicas, <b>%d</b> repositorios, <b>%d</b> vixiados, <b>%d</b> destacados, <b>%d</b> accións, <b>%d</b> accesos, <b>%d</b> incidencias, <b>%d</b> comentarios, <b>%d</b> contas de redes sociais, <b>%d</b> seguidores, <b>%d</b> mirrors, <b>%d</b> releases, <b>%d</b> fontes de login, <b>%d</b> webhooks, <b>%d</b> milestones, <b>%d</b> etiquetas, <b>%d</b> hooks, <b>%d</b> equipos, <b>%d</b> tarefas actualizadas, <b>%d</b> adxuntos.
 dashboard.operation_name=Nome da operación
 dashboard.operation_switch=Interruptor
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Executar
 dashboard.clean_unbind_oauth=Limpar solicitudes de OAuth sen confirmar
 dashboard.clean_unbind_oauth_success=As solicitudes de OAuth sen confirmar elimináronse correctamente.
@@ -1087,11 +1111,12 @@ repos.stars=Estrelas
 repos.issues=Incidencias
 repos.size=Size
 
-auths.auth_manage_panel=Panel de administración de autenticación
+auths.auth_sources=Authentication Sources
 auths.new=Engadir nova orixe
 auths.name=Nome
 auths.type=Tipo
 auths.enabled=Activo
+auths.default=Default
 auths.updated=Actualizado
 auths.auth_type=Tipo de autenticación
 auths.auth_name=Nome de autenticación
@@ -1128,9 +1153,9 @@ auths.enable_tls=Habilitar cifrado TLS
 auths.skip_tls_verify=Omitir a verificación TLS
 auths.pam_service_name=Nome do servizo PAM
 auths.enable_auto_register=Habilitar auto-rexistro
-auths.tips=Consellos
 auths.edit=Editar a configuración de autenticación
 auths.activated=Esta autenticación foi activada
+auths.default_auth=This authentication is default login source
 auths.new_success=A autenticación '%s' foi engadida con éxito!
 auths.update_success=A configuración de autenticación foi actualizada con éxito.
 auths.update=Actualizar a configuración de autenticación
@@ -1140,119 +1165,180 @@ auths.delete_auth_desc=Esta autenticación será eliminada. Desexas continuar?
 auths.still_in_used=Este método de autentificación aínda é utilizado por algúns usuarios, por favor elimine ou converta estes usuarios a outro tipo de autentificación.
 auths.deletion_success=A autenticación foi eliminada con éxito!
 auths.login_source_exist=Login source '%s' xa existe.
+auths.github_api_endpoint=API Endpoint
 
 config.not_set=(not set)
 config.server_config=Configuración do servidor
-config.app_name=Nome da aplicación
-config.app_ver=Versión da aplicación
-config.app_url=URL da aplicación
-config.domain=Dominio
-config.offline_mode=Modo sen conexión
-config.disable_router_log=Deshabilitar log do router
+config.brand_name=Brand name
 config.run_user=Executada como usuario
 config.run_mode=Modo de execución
-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.reverse_auth_user=Autenticación inversa de usuario
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=Configuración SSH
-config.ssh_enabled=Habilitado
-config.ssh_start_builtin_server=Iniciar servidor integrado
-config.ssh_domain=Dominio
-config.ssh_port=Porto
-config.ssh_listen_port=Porto de escoita
-config.ssh_root_path=Ruta raíz
-config.ssh_key_test_path=Ruta da clave de proba
-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.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
-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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo_config=Repository configuration
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Configuración da base de datos
-config.db_type=Tipo
-config.db_host=Host
-config.db_name=Nome
-config.db_user=Usuario
-config.db_ssl_mode=Modo SSL
-config.db_ssl_mode_helper=(só para "postgres")
-config.db_path=Ruta
-config.db_path_helper=(para "sqlite3" e "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Configuración do servizo
-config.register_email_confirm=Solicitar confirmación por correo electrónico
-config.disable_register=Deshabilitar o rexistro
-config.show_registration_button=Mostrar botón de rexistro
-config.require_sign_in_view=Solicitar a vista de inicio de sesión
-config.mail_notify=Notificación por correo electrónico
-config.disable_key_size_check=Deshabilitar a comprobación de tamaño mínimo de clave
-config.enable_captcha=Activar captcha
-config.active_code_lives=Habilitar vida do código
-config.reset_password_code_lives=Restablecer contrasinal de vida do código
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Configuración de Webhooks
-config.queue_length=Tamaño de cola de envío
-config.deliver_timeout=Timeout de entrega
-config.skip_tls_verify=Omitir a verificación TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Configuración do servidor de correo
-config.mailer_enabled=Activado
-config.mailer_disable_helo=Desactivar HELO
-config.mailer_name=Nome
-config.mailer_host=Host
-config.mailer_user=Usuario
-config.send_test_mail=Enviar correo electrónico de proba
-config.test_mail_failed=Fallo ao enviar o correo electrónico de proba a '%s': %v
-config.test_mail_sent=O correo electrónico de proba foi enviado a '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Configuración OAuth
-config.oauth_enabled=Activado
-
-config.cache_config=Configuración da caché
-config.cache_adapter=Adaptador da caché
-config.cache_interval=Intervalo da caché
-config.cache_conn=Conexión da caché
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Configuración da sesión
-config.session_provider=Provedor da sesión
-config.provider_config=Configuración do provedor
-config.cookie_name=Nome da cookie
-config.enable_set_cookie=Activar establecemento de cookie
-config.gc_interval_time=Intervalo de tempo do GC
-config.session_life_time=Tempo de vida da sesión
-config.https_only=Só HTTPS
-config.cookie_life_time=Tempo de vida da cookie
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Configuración da caché
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP configuration
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Configuración de imaxe
-config.picture_service=Servizo de imaxe
-config.disable_gravatar=Desactivar gravatar
-config.enable_federated_avatar=Habilitar avatares federados
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Configuración de Webhooks
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Configuración de git
-config.git_disable_diff_highlight=Desactivar resaltado de sintaxe do Diff
-config.git_max_diff_lines=Liñas de Diff máximas (por un só arquivo)
-config.git_max_diff_line_characters=Caracteres de Diff máximos (para unha soa liña)
-config.git_max_diff_files=Máximo de arquivos de Diff (que se mostrarán)
-config.git_gc_args=Argumentos de GC
-config.git_migrate_timeout=Tempo de espera de migración
-config.git_mirror_timeout=Tempo de espera de actualización de réplicas
-config.git_clone_timeout=Tempo de espera de operación de clóns
-config.git_pull_timeout=Tempo de espera de operación de pull
-config.git_gc_timeout=Tempo de espera de operación de GC
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Configuración do log
+config.log_file_root_path=Ruta dos ficheiros de log
 config.log_mode=Mode
 config.log_options=Options
 
@@ -1283,7 +1369,6 @@ notices.delete_success=As notificacións do sistema foron eliminadas satisfactor
 
 [action]
 create_repo=creou o repositorio <a href="%s">%s</a>
-fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=repositorio renomeado de <code>%[1]s</code> a <a href="%[2]s">%[3]s</a>
 commit_repo=fixo push a <a href="%[1]s/src/%[2]s">%[3]s</a> en <a href="%[1]s">%[4]s</a>
 compare_commits=Ver comparación destas %d achegas
@@ -1300,6 +1385,10 @@ create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href=
 delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=fixo push do tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>
 delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=hai
@@ -1321,6 +1410,7 @@ months=%[2]s %[1]d meses
 years=%s %d anos
 raw_seconds=segundos
 raw_minutes=minutos
+raw_hours=hours
 
 [dropzone]
 default_message=Sólteos aquí ou pulse para cargar arquivos.

conf/locale/locale_hu-HU.ini

@@ -9,7 +9,6 @@ sign_out=Kijelentkezés
 sign_up=Regisztráció
 register=Regisztráció
 website=Weboldal
-version=Verzió
 page=Oldal
 template=Sablon
 language=Nyelv
@@ -44,6 +43,10 @@ issues=Problémák
 
 cancel=Mégse
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Telepítés
 title=Telepítés első indításkor
@@ -101,7 +104,7 @@ disable_gravatar=Gravatar kikapcsolása
 disable_gravatar_popup=Gravatar és egyedi források kikapcsolása, minden avatárt a felhasználók töltenek fel.
 federated_avatar_lookup=Engedélyezi a független avatarokat
 federated_avatar_lookup_popup=Eggyesített profilkép keresés a nyílt forráskódú libravatar szolgáltatás segítségével.
-disable_registration=Ön-regisztráció kikapcsolása
+disable_registration=Önregisztráció kikapcsolása
 disable_registration_popup=Ön-regisztráció kikapcsolása, csak a rendszergazda hozhat létre fiókot.
 enable_captcha=Ellenőrző kód engedélyezése
 enable_captcha_popup=Ellenőrző kódot kér a felhasználói regisztrációnál.
@@ -122,6 +125,7 @@ run_user_not_match=Futtató felhasználó más, mint az aktuális felhasználó:
 smtp_host_missing_port=Az SMTP kiszolgáló címéből hiányzik a portszám.
 invalid_smtp_from=Érvénytelen SMTP Feladó mező: %v
 save_config_failed=Hiba a beállítások tárolásakor: %v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=Hibás a rendszergazdai fiók beállítása: %v
 install_success=Üdv! Örülünk, hogy a Gogs-ot választottad, érezd jól magad és viseld gondját.
 invalid_log_root_path=Naplózás gyökérmappa érvénytelen: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Van már felhasználói fiókja? Jelentkezz be!
 social_register_hepler_msg=Van már fiókod? Csatold most!
 disable_register_prompt=Elnézést, a regisztrációt kikapcsolták. Kérlek szólj az oldal adminisztrátorának.
 disable_register_mail=Elnézést, az email regisztráció megerősítését kikapcsolták.
+auth_source=Hitelesítési forrás
+local=Helyi
 remember_me=Emlékezz rám
 forgot_password=Elfelejtett jelszó
 forget_password=Elfelejtette a jelszavát?
@@ -229,6 +235,7 @@ org_name_been_taken=A szervezet neve már foglalt.
 team_name_been_taken=Az a csapatnév már foglalt.
 email_been_used=Ezt az email címet már felhasználták.
 username_password_incorrect=Felhasználó név vagy jelszó hibás.
+auth_source_mismatch=A kijelölt hitelesítési forráshoz nincs társítva a felhasználó.
 enterred_invalid_repo_name=Kérjük, ellenőrizze, hogy a tároló neve helyes.
 enterred_invalid_owner_name=Kérjük, ellenőrizze, hogy a tulajdonos neve helyes.
 enterred_invalid_password=Kérlek ellenőrizd, hogy a beírt jelszó helyes.
@@ -256,8 +263,7 @@ following=Követve
 follow=Követés
 unfollow=Követés törlése
 
-form.name_reserved='%s' felhasználónév már foglalt.
-form.name_pattern_not_allowed=A felhasználónév ('%s') nem engedélyezett.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profil
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Vagy adja meg a titkos kódot:
 two_factor_then_enter_passcode=Ezután írja be ezt a jelkódot:
 two_factor_verify=Ellenőrzés
 two_factor_invalid_passcode=Érvénytelen a megadott jelkód, próbálja meg újra!
+two_factor_reused_passcode=A megadott PIN-kód már használatban van. Kérem válasszon másikat!
 two_factor_enable_error=Kétlépcsős hitelesítés engedélyezése sikertelen: %v
 two_factor_enable_success=Kétlépcsős hitelesítés sikeresen engedélyezve a fiókjához!
 two_factor_recovery_codes_title=Kettőlépcsős hitelesítés helyreállítási kódok
@@ -370,6 +377,7 @@ delete_token=Törlés
 access_token_deletion=Személyes hozzáférési jegy törlése
 access_token_deletion_desc=Az SSH kulcs törlése minden kapcsolódó hozzáférést töröl a fiókodból. Biztosan folytatod?
 delete_token_success=A személyes hozzáférési tokened eltávolítása megtörtént! Ne felejtsd el frissíteni az alkalmazásod is.
+token_name_exists=Már létezik ilyen nevű szerepkör.
 
 orgs.none=Nem vagy tagja egy szervezeti elemnek sem.
 orgs.leave_title=Szervezet elhagyása
@@ -417,10 +425,11 @@ mirror_last_synced=Utoljára szinkr.
 watchers=Figyelők
 stargazers=Csillagvizsgálók
 forks=Másolások
+repo_description_helper=Tároló leírása. Maximum 512 karakter hosszúságú.
+repo_description_length=Rendelkezésre álló karakterek
 
 form.reach_limit_of_creation=A tulajdonos túllépte a maximum létrehozható tárolók számát (%d).
-form.name_reserved=Ez a tároló név ('%s') le van foglalva.
-form.name_pattern_not_allowed=Ez a tároló név ('%s') nem megengedett.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Hitelesítés szükséges
 migrate_type=Migráció típusa
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=A fájl tartalma megváltozott mióta elkezdte
 editor.file_already_exists=A(z) '%s' nevű fájl már létezik a tárolóban.
 editor.no_changes_to_show=Nincsen megjeleníthető változás.
 editor.fail_to_update_file=Nem sikerült frissíteni/létrehozni a következő fájlt: '%s' A hiba oka: %v
+editor.fail_to_delete_file=Nem sikerült törölni a következő fájlt: '%s' A hiba oka: %v
 editor.add_subdir=Alkönyvtár hozzáadása...
 editor.unable_to_upload_files=Nem sikerült feltölteni a fájlokat a "%s" hiba: %v
 editor.upload_files_to_dir=Fájlok feltöltése '%s'
@@ -632,8 +642,9 @@ pulls.is_checking=Az ütközés ellenőrzés még folyamatban van, frissítsd az
 pulls.can_auto_merge_desc=Ez a beolvasztási kérés automatikusán egyesíthető.
 pulls.cannot_auto_merge_desc=Ez a beolvasztási kérés ütközések miatt nem egyesíthető automatikusan.
 pulls.cannot_auto_merge_helper=Kérlek, egyesítsd kézileg a konfliktusok megoldásához.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Eggyesítő commit létrehozása
+pulls.rebase_before_merging=Rebase eggyesítés előtt
+pulls.commit_description=Commit leírása
 pulls.merge_pull_request=Beolvasztási kérés egyesítése
 pulls.open_unmerged_pull_exists=`Nem tudja újranyitni, mert már van egy nyitott egyesítési kérés (#%d) ugyanebben a tárolóban, ugyanezekket az egyesítési információkkal, és végrehajtásra vár.`
 pulls.delete_branch=Ág törlése
@@ -738,9 +749,9 @@ settings.tracker_issue_style=Külső hibajegykezelő elnevezési stílus:
 settings.tracker_issue_style.numeric=Numerikus
 settings.tracker_issue_style.alphanumeric=Alfanumerikus
 settings.tracker_url_format_desc=Az alábbiak helyettesítik a felhasználónevet, repository nevet és hibajegy számot: <code>{user} {repo} {index}</code>.
-settings.pulls_desc=Beolvasztási kérések engedélyezése a nyilvános hozzájárulások végett
-settings.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Beolvasztási kérések engedélyezése tárolók és ágak közi hozzájárulásokhoz
+settings.pulls.ignore_whitespace=Whitespacek figyelmen kívül hagyása
+settings.pulls.allow_rebase_merge=Rebase engedélyezése eggyesítő commitokhoz
 settings.danger_zone=Veszélyes terület
 settings.cannot_fork_to_same_owner=Nem másolható a tároló az eredeti tulajdonosához.
 settings.new_owner_has_same_repo=Az új tulaj már rendelkezik ilyen nevű repository-val. Kérlek, válassz másik nevet.
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=Ennek a felhasználónak nem lesz joga közr
 settings.remove_collaborator_success=Az eggyüttműködő eltávolítva.
 settings.search_user_placeholder=Felhasználók keresése...
 settings.org_not_allowed_to_be_collaborator=Szervezet hozzáadása együttműködőként nem engedélyezett.
-settings.add_webhook=Webhook hozzáadása
 settings.hooks_desc=A Webhook-ok olyanok, mint az alapvető HTTP POST esemény triggerek. Amikor valami történik a Gogsban, akkor küldünk róla értesítést a címre amit beállítasz. Többet olvashatsz erről a <a target="_blank" href="%s">Webhooks Guide-ban</a>.
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Webhook hozzáadása
 settings.webhook_deletion=Webhook Törlése
 settings.webhook_deletion_desc=Ennek a Webhook-nak a törlése eltávolít róla minden információt, és a korábbi kézbesítéseknek a naplóját is. Biztosan folytatja?
 settings.webhook_deletion_success=Webhook sikeresen törölve lett!
@@ -792,6 +805,8 @@ settings.webhook.response=Válasz
 settings.webhook.headers=Fejlécek
 settings.webhook.payload=Tartalom
 settings.webhook.body=Törzs
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=A GIT hook-okat maga a Git működteti, szerkesztheted a támogatott hook-ok fájljait a következő listában hogy egyéni műveleteket is végezzenek.
 settings.githook_edit_desc=Ha a hook nincs aktiválva, akkor egy minta sablon lesz mutatva. Ha a tartalmát üresen hagyja, akkor ez a hook ki lesz kapcsolva.
 settings.githook_name=Hook megnevezés
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Push-olás egy repository-ba
 settings.event_issues=Problémák
 settings.event_issues_desc=A probléma meg left nyitva, le left zárva, újranyitva, szerkesztve, hozzárendelve, visszarendelve, cimkézve, cimketelenítve, mérföldkövezve, vagy mérföldkőtelenítve.
-settings.event_issue_comment=Probléma hozzászólás
-settings.event_issue_comment_desc=Probléma megjegyzés létrehozva, szerkesztve vagy törölve.
 settings.event_pull_request=Beolvasztási kérés
 settings.event_pull_request_desc=Beolvasztási kérés megnyitva, lezárva, újranyitva, hozzárendelve, visszarendelve, címkézve, címke eltávolítva, mérföldkövezve, mérföldkő eltávolítva vagy szinkronizálva.
+settings.event_issue_comment=Probléma hozzászólás
+settings.event_issue_comment_desc=Probléma megjegyzés létrehozva, szerkesztve vagy törölve.
 settings.event_release=Kiadás
 settings.event_release_desc=Kiadás publikálva a tárolóban.
 settings.active=Aktív
@@ -852,6 +867,8 @@ settings.add_key_success=Az új deploy kulcsot ('%s') sikeresen hozzáadtuk!
 settings.deploy_key_deletion=Deploy Kulcs Törlése
 settings.deploy_key_deletion_desc=A deploy kulcs törlése minden kapcsolódó hozzáférést töröl a repository-ból. Biztosan folytatod?
 settings.deploy_key_deletion_success=A deploy kulcs sikeresen törölve!
+settings.description_desc=Tároló leírása. Maximum 512 karakter hosszúságú.
+settings.description_length=Rendelkezésre álló karakterek
 
 diff.browse_source=Forráskód Böngészése
 diff.parent=szülő
@@ -916,9 +933,8 @@ team_name_helper=Ezzel a névvel tudsz majd a csapatra hivatkozni.
 team_desc_helper=Miről szól ez a csapat?
 team_permission_desc=Milyen jogosultsága legyen ennek a csapatnak?
 
-form.name_reserved=Ez a szervezetnév ('%s') le van foglalva.
-form.name_pattern_not_allowed=A szervezetnév ('%s') nem engedélyezett.
-form.team_name_reserved=A csoportnév ('%s') a rendszer számára van fenntartva.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Beállítások
 settings.options=Opciók
@@ -990,12 +1006,19 @@ first_page=Első
 last_page=Utolsó
 total=Összesen: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Statisztika
 dashboard.operations=Műveletek
 dashboard.system_status=Rendszerfigyelő Állapota
 dashboard.statistic_info=Az adatbázisban található: <b>%d</b> felhasználó, <b>%d</b> szervezet, <b>%d</b> publikus kulcs, <b>%d</b> tároló, <b>%d</b> figyelő, <b>%d</b> csillagozás, <b>%d</b> művelet, <b>%d</b> hozzáférés, <b>%d</b> probléma, <b>%d</b> megjegyzés, <b>%d</b> közösségi fiók, <b>%d</b> követő, <b>%d</b> tükör, <b>%d</b> kiadás, <b>%d</b> authentikáció, <b>%d</b> webhook, <b>%d</b> mérföldkő, <b>%d</b> cimke, <b>%d</b> hook feladat, <b>%d</b> csoport, <b>%d</b> frissítési feladat, <b>%d</b> csatolmány.
 dashboard.operation_name=Művelet neve
 dashboard.operation_switch=Átváltás
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Futtatás
 dashboard.clean_unbind_oauth=A nem használt OAuthok kitakarítása
 dashboard.clean_unbind_oauth_success=Minden nem használt OAuth sikeresen kitakarítva.
@@ -1087,11 +1110,12 @@ repos.stars=Csillagok
 repos.issues=Problémák
 repos.size=Méret
 
-auths.auth_manage_panel=Hitelesítés kezelő Panel
+auths.auth_sources=Hitelesítési források
 auths.new=Új forrás hozzáadása
 auths.name=Név
 auths.type=Típus
 auths.enabled=Engedélyezett
+auths.default=Alapértelmezett
 auths.updated=Frissítve
 auths.auth_type=Hitelesítés típusa
 auths.auth_name=Hitelesítési név
@@ -1100,7 +1124,7 @@ auths.domain=Tartomány
 auths.host=Állomás
 auths.port=Port
 auths.bind_dn=Bind DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Használhatja a '%s'-t felhasználónév helyett, pl.: DOM\%s
 auths.bind_password=Bind jelszó
 auths.bind_password_helper=Figyelmeztetés: Ez a jelszó egyszerű szöveges formátumban kerül metésre. Ne használjon egy magas szintű jogosultsággal rendelkező fiókot.
 auths.user_base=Felhasználókeresés alapja
@@ -1128,9 +1152,9 @@ auths.enable_tls=TLS titkosítás engedélyezése
 auths.skip_tls_verify=TLS ellenőrzése mellőzése
 auths.pam_service_name=PAM szolgáltatás neve
 auths.enable_auto_register=Automatikus regisztráció engedélyezése
-auths.tips=Tippek
 auths.edit=Hitelesítési beállítások szerkesztése
 auths.activated=Ez a hitelesítés mód aktiválva van
+auths.default_auth=This authentication is default login source
 auths.new_success=Az új hitelesítési mód '%s' sikeresen hozzáadva.
 auths.update_success=A hitelesítési beállítások sikeresen firssítve lettek.
 auths.update=Hitelesítési forrás frissítése
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=A hitelesítési mód törlésre kerül, biztosan folytat
 auths.still_in_used=A hitelesítési mód még használatban van, mielőtt törölné válasszon más hitelesítési módot az érintett fiókokhoz.
 auths.deletion_success=Hitelesítési forrás sikeresen törölve!
 auths.login_source_exist=Bejelentkezési forrás "%s" már létezik.
+auths.github_api_endpoint=API végpont
 
-config.not_set=(not set)
+config.not_set=(nincs beállítva)
 config.server_config=Kiszolgáló konfiguráció
-config.app_name=Alkalmazás neve
-config.app_ver=Alkalmazás verziója
-config.app_url=Alkalmazás URL-je
-config.domain=Tartomány
-config.offline_mode=Kapcsolat nélküli mód
-config.disable_router_log=Útválasztás naplózásának letiltása
+config.brand_name=Brand name
 config.run_user=Futtató felhasználó
 config.run_mode=Futtatás módja
-config.git_version=Git verzió
-config.static_file_root_path=Statikus fájl gyökérútvonal
-config.log_file_root_path=Naplófájl gyökérútvonal
-config.reverse_auth_user=Visszafelé hitelesítés felhasználója
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH konfiguráció
-config.ssh_enabled=Engedélyezett
-config.ssh_start_builtin_server=Beépített kiszolgáló indítása
-config.ssh_domain=Tartomány
-config.ssh_port=Port
-config.ssh_listen_port=Figyelő port
-config.ssh_root_path=Gyökér elérési útvonal
-config.ssh_key_test_path=Kulcs ellenőrzés útvonala
-config.ssh_keygen_path=Kulcsgeneráló ('ssh-keygen') elérési útja
-config.ssh_minimum_key_size_check=Minimális kulcsméret ellenőrzés
-config.ssh_minimum_key_sizes=Kulcsok Minimális Mérete
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 config.repo_config=Tároló konfiguráció
-config.repo_root_path=Tárolók gyökérkönyvtára
-config.script_type=Szkript típus
-config.repo_force_private=Privát erőltetése
-config.max_creation_limit=Maximum létrehozási korlát
-config.preferred_licenses=Előnyben részesített licencek
-config.disable_http_git=A HTTP protokoll letiltása GIT-hez
-config.enable_local_path_migration=Engedélyezi a migrációt helyi elérési út alapján
-config.commits_fetch_concurrency=Konkurens lekérés
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Adatbázis konfiguráció
-config.db_type=Típus
-config.db_host=Állomás
-config.db_name=Név
-config.db_user=Felhasználó
-config.db_ssl_mode=SSL-mód
-config.db_ssl_mode_helper=(csak "postgres" )
-config.db_path=Elérési út
-config.db_path_helper=("sqlite3" és "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Szolgáltatás beállításai
-config.register_email_confirm=E-mail megerősítés szükséges
-config.disable_register=Regisztráció tiltása
-config.show_registration_button=Regisztráció gomb megjelenítése
-config.require_sign_in_view=Bejelentkező Nézet
-config.mail_notify=E-mail értesítés
-config.disable_key_size_check=Minimális kulcsméret ellenőrzés letiltása
-config.enable_captcha=Ellenőrző kód engedélyezése
-config.active_code_lives=Aktivál kód élet
-config.reset_password_code_lives=Jelkód élettartamának visszaálítása
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Webhook beállítás
-config.queue_length=Várólista hossza
-config.deliver_timeout=Kézbesítési időtúllépés
-config.skip_tls_verify=TLS ellenőrzése mellőzése
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Levelező beállítások
-config.mailer_enabled=Engedélyezett
-config.mailer_disable_helo=HELO letiltása
-config.mailer_name=Név
-config.mailer_host=Állomás
-config.mailer_user=Felhasználó
-config.send_test_mail=Teszt E-mail küldése
-config.test_mail_failed=Nem sikerült kiküldeni az e-mailt '%s': %v
-config.test_mail_sent=Teszt e-mail kiküldve '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth-konfiguráció
-config.oauth_enabled=Engedélyezett
-
-config.cache_config=Cache beállítás
-config.cache_adapter=Gyorsítótár-adapter
-config.cache_interval=Gyorsítótár intervallum
-config.cache_conn=Cache kapcsolat
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Munkamenet beállítások
-config.session_provider=Munkamenet szolgáltató
-config.provider_config=Szolgáltató beállítás
-config.cookie_name=Süti neve
-config.enable_set_cookie=Süti használatának engedélyezése
-config.gc_interval_time=GC intervallum idő
-config.session_life_time=Munkamenet élettartama
-config.https_only=Csak HTTPS
-config.cookie_life_time=Cookie-k élettartama
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Cache beállítás
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP beállítások
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Kép beállítások
-config.picture_service=Kép szolgáltatás
-config.disable_gravatar=Tiltsa le a Gravatart
-config.enable_federated_avatar=Összevont profilkép lekérés engedélyezése
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Webhook beállítás
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Git konfiguráció
-config.git_disable_diff_highlight=Különbségi nézetben a szintakszis kiemelés kikapcsolása
-config.git_max_diff_lines=Maximális sorok száma különbségi nézetben (egy fájl esetén)
-config.git_max_diff_line_characters=Maximális karakterek száma különbségi nézetben (egy fájl esetén)
-config.git_max_diff_files=Maximális fájlok száma különbségi nézetben
-config.git_gc_args=Szemétgyűjtő (GC) argumentumok
-config.git_migrate_timeout=Migráció időtúllépés
-config.git_mirror_timeout=Tükör frissítési időtúllépés
-config.git_clone_timeout=Migráció időtúllépés
-config.git_pull_timeout=Frissítő időtúllépés
-config.git_gc_timeout=Szemétgyűjtő (GC) időtúllépés
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Naplózás beállítása
+config.log_file_root_path=Naplófájl gyökérútvonal
 config.log_mode=Mód
 config.log_options=Opciók
 
@@ -1283,7 +1368,6 @@ notices.delete_success=A rendszer értesítések sikeresen törölve.
 
 [action]
 create_repo=létrehozott tárolót: <a href="%s"> %s</a>
-fork_repo=lemásolta a(z) <a href="%s">%s</a> tárolót
 rename_repo=átnevezte a <code>%[1]s</code> tárolót <a href="%[2]s">%[3]s</a>-ra
 commit_repo=feltöltött a <a href="%[1]s/src/%[2]s">%[3]s</a> ágba ide: <a href="%[1]s">%[4]s</a>
 compare_commits=%d commit összehasonlítása
@@ -1300,6 +1384,10 @@ create_branch=létrehozott egy új <a href="%[1]s/src/%[2]s">%[3]s</a> ágat ebb
 delete_branch=törölt egy ágat <code>%[2]s</code> ekkor: <a href="%[1]s">%[3]s</a>
 push_tag=feltöltött egy cimkét: <a href="%s/src/%s">%[2]s</a> ide: <a href="%[1]s">%[3]s</a>
 delete_tag=törölt egy cimkét <code>%[2]s</code> ekkor: <a href="%[1]s">%[3]s</a>
+fork_repo=lemásolta a(z) <a href="%s">%s</a> tárolót
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago= 
@@ -1307,20 +1395,21 @@ from_now=mostantól
 now=most
 1s=1 másodperce %s
 1m=1 perce %s
-1h=1 órája
+1h=1 órája %s
 1d=1 napja %s
 1w=1 hete %s
 1mon=1 hónapja %s
 1y=1 éve %s
 seconds=%d másodperce %s
 minutes=%d perce %s
-hours=%d órája
+hours=%d órája %s
 days=%d napja %s
 weeks=%d hete %s
 months=%d hónapja %s
 years=%d éve %s
 raw_seconds=másodperc
 raw_minutes=perc
+raw_hours=hours
 
 [dropzone]
 default_message=Húzz ide fájlokat vagy kattints a feltöltéshez.

conf/locale/locale_it-IT.ini

@@ -9,7 +9,6 @@ sign_out=Esci
 sign_up=Registrati
 register=Registrati
 website=Sito Web
-version=Versione
 page=Pagina
 template=Template
 language=Lingua
@@ -44,6 +43,10 @@ issues=Problemi
 
 cancel=Annulla
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Installazione
 title=Passi d'installazione per il primo avvio
@@ -119,9 +122,10 @@ sqlite3_not_available=Questa versione non supporta SQLite3, si prega di scaricar
 invalid_db_setting=La configurazione del database non è corretta: %v
 invalid_repo_path=Percorso root del repository invalido: %v
 run_user_not_match=Run user non è l'utente corrente:  %s -> %s
-smtp_host_missing_port=SMTP Host is missing port in address.
+smtp_host_missing_port=All'Host SMTP manca la porta nell'indirizzo.
 invalid_smtp_from=Campo SMTP From non valido: %v
 save_config_failed=Fallito il salvataggio della configurazione: %v
+init_failed=Failed to initialize application: %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=Percorso deilog non valido: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Hai già un account? Accedi ora!
 social_register_hepler_msg=Hai già un account? Associalo ora!
 disable_register_prompt=Siamo spiacenti, registrazione è stata disabilitata. Si prega di contattare l'amministratore del sito.
 disable_register_mail=Siamo spiacenti, la conferma di registrazione via Mail è stata disattivata.
+auth_source=Fonte di autenticazione
+local=Locale
 remember_me=Ricordami
 forgot_password=Password dimenticata
 forget_password=Password dimenticata?
@@ -170,12 +176,12 @@ password_too_short=La lunghezza della password non può essere meno 6 caratteri.
 non_local_account=Gli account non locali non possono modificare le password tramite Gogs.
 
 login_two_factor=Autenticazione in Due Passaggi
-login_two_factor_passcode=Authentication Passcode
+login_two_factor_passcode=Codice di autenticazione
 login_two_factor_enter_recovery_code=Inserisci il codice di recupero dell'Autenticazione a due Fattori
-login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery=Recupero a due fattori
 login_two_factor_recovery_code=Recupera il codice
-login_two_factor_enter_passcode=Enter a two-factor passcode
-login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+login_two_factor_enter_passcode=Inserisci un codice di accesso a due fattori
+login_two_factor_invalid_recovery_code=Il codice di recupero è stato utilizzato o non è valido.
 
 [mail]
 activate_account=Per favore attiva il tuo account
@@ -212,7 +218,7 @@ Content=Contenuto
 require_error=` non può essere vuoto.`
 alpha_dash_error=` ammessi solo caratteri alfanumerici o trattini(-_).`
 alpha_dash_dot_error=` ammessi solo caratteri alfanumerici o trattini(-_) o punti.`
-alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
+alpha_dash_dot_slash_error=` ammessi solo caratteri alfanumerici o trattini(-_) o punti o slash.`
 size_error='deve essere %s.'
 min_size_error=` deve contenere almeno %s caratteri.`
 max_size_error=` deve contenere massimo %s caratteri.`
@@ -229,6 +235,7 @@ org_name_been_taken=Il nome dell'Organizzazione è già utlizzato.
 team_name_been_taken=Il nome del Team è già utilizzato.
 email_been_used=L'indirizzo E-mail è già utilizzato.
 username_password_incorrect=Nome utente o password incorretti.
+auth_source_mismatch=La sorgente di autenticazione selezionata non è associata all'utente.
 enterred_invalid_repo_name=Si prega di assicurarsi che il nome del repository inserito sia corretto.
 enterred_invalid_owner_name=Si prega di assicurarsi che il nome del proprietario inserito sia corretto.
 enterred_invalid_password=Verificare che la  password inserita sia corretta.
@@ -256,15 +263,14 @@ following=Seguiti
 follow=Segui
 unfollow=Non seguire più
 
-form.name_reserved=L'username '%s' è riservato.
-form.name_pattern_not_allowed=La struttura del nome utente '%s' non è consentita.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profilo
 password=Password
 avatar=Avatar
 ssh_keys=Chiavi SSH
-security=Security
+security=Sicurezza
 repos=Repository
 orgs=Organizzazioni
 applications=Applicazioni
@@ -335,29 +341,30 @@ key_state_desc=Hai utilizzato questa chiave negli ultimi 7 giorni
 token_state_desc=Questo token e' satato utilizzato negli ultimi 7 giorni
 
 two_factor=Autenticazione in Due Passaggi
-two_factor_status=Status:
+two_factor_status=Stato:
 two_factor_on=Attiva
-two_factor_off=Off
-two_factor_enable=Enable
+two_factor_off=Non attivo
+two_factor_enable=Abilita
 two_factor_disable=Disattivata
-two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
-two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_view_recovery_codes=Visualizza e memorizza i tuoi <a href="%s%s">codici di recupero</a> in un posto sicuro. Puoi utilizzarli come codice di sicurezza se perdi gli accessi all'applicazione di autenticazione.
+two_factor_http=Per le operazioni HTTP/HTTPS, non sei più in grado di utilizzare nome utente e password. Si prega di creare e utilizzare <a href="%[1]s%[2]s">Token di accesso personale</a> come credenziali, ad esempio. <code>%[3]s</code>.
 two_factor_enable_title=Abilita l'autenticazione in due passaggi
-two_factor_scan_qr=Please use your authentication application to scan the image:
-two_factor_or_enter_secret=Or enter the secret:
-two_factor_then_enter_passcode=Then enter passcode:
+two_factor_scan_qr=Per favore, utilizza la tua applicazione di autenticazione per scansionare l'immagine:
+two_factor_or_enter_secret=O inserisci la chiave segreta:
+two_factor_then_enter_passcode=Poi inserisci la chiave di sicurezza:
 two_factor_verify=Verifica
-two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
-two_factor_enable_error=Enable Two-factor authentication failed: %v
-two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
-two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
-two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
-two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
-two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
-two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
-two_factor_disable_title=Disable Two-factor Authentication
-two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
-two_factor_disable_success=Two-factor authentication has disabled successfully!
+two_factor_invalid_passcode=La chiave di sicurezza che hai inserito non è valida, riprova!
+two_factor_reused_passcode=La chiave di sicurezza che hai inserito è già stata utilizzata, provane un'altra!
+two_factor_enable_error=Impossibile abilitare l'autenticazione a due fattori: %v
+two_factor_enable_success=Autenticazione a due fattori abilitata per il tuo account con successo!
+two_factor_recovery_codes_title=Codici di recupero autenticazione a due fattori
+two_factor_recovery_codes_desc=I codici di recupero vengono utilizzati quando si perde temporaneamente l'accesso all'applicazione di autenticazione. Ogni codice di recupero può essere utilizzato solo una volta, <b>si prega di mantenere questi codici in un posto sicuro</b>.
+two_factor_regenerate_recovery_codes=Rigenera codici di recupero
+two_factor_regenerate_recovery_codes_error=Impossibile rigenerare codici di recupero: %v
+two_factor_regenerate_recovery_codes_success=I nuovi codici di recupero sono stati generati correttamente!
+two_factor_disable_title=Disabilita autenticazione a due fattori
+two_factor_disable_desc=Il livello di sicurezza del tuo account diminuirà disabilitando l'autenticazione a due fattori. Vuoi continuare?
+two_factor_disable_success=L'autenticazione a due fattori è stata disabilitata!
 
 manage_access_token=Gestisci i Token di Accesso Personale
 generate_new_token=Genera Nuovo Token
@@ -370,15 +377,16 @@ delete_token=Elimina
 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.
+token_name_exists=Token with same name already exists.
 
 orgs.none=Non sei membro di alcuna organizzazione.
 orgs.leave_title=Abbandona una organizzazione
 orgs.leave_desc=Abbandonando l'organizzazione perderai l'accesso a tutti i repository e i gruppi. Confermi?
 
 repos.leave=Abbandona
-repos.leave_title=Leave repository
-repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
-repos.leave_success=You have left repository '%s' successfully!
+repos.leave_title=Lascia il repository
+repos.leave_desc=Perderai l'accesso al repository dopo che hai lasciato. Vuoi continuare?
+repos.leave_success=Hai lasciato il repository '%s' con successo!
 
 delete_account=Elimina Account
 delete_prompt=L'operazione eliminerà permanentemente l'account e <strong>NON POTRÀ</strong> essere annullata!
@@ -417,10 +425,11 @@ mirror_last_synced=Ultimo aggiornamento
 watchers=Osservatori
 stargazers=Fan
 forks=Fork
+repo_description_helper=Description of repository. Maximum 512 characters length.
+repo_description_length=Caratteri disponibili
 
 form.reach_limit_of_creation=Il proprietario ha raggiunto il limite massimo di %d repository creati.
-form.name_reserved=Il nome repository %s è riservato.
-form.name_pattern_not_allowed=La struttura del nome del repository %s non è consentita.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Richiesta di autorizzazione
 migrate_type=Tipo di migrazione
@@ -463,7 +472,7 @@ pulls=Pull Requests
 labels=Etichette
 milestones=Traguardi
 commits=Commit
-git_branches=Branches
+git_branches=Rami (Branch)
 releases=Rilasci
 file_raw=Originale
 file_history=Cronologia
@@ -472,12 +481,12 @@ file_permalink=Permalink
 file_too_large=Questo file è troppo grande per essere mostrato
 video_not_supported_in_browser=Il tuo browser non supporta i tag "video" di HTML5.
 
-branches.overview=Overview
-branches.active_branches=Active Branches
+branches.overview=Panoramica
+branches.active_branches=Rami (Branch) attivi
 branches.stale_branches=Stale Branches
-branches.all=All Branches
+branches.all=Tutti i rami (branch)
 branches.updated_by=Updated %[1]s by %[2]s
-branches.change_default_branch=Change Default Branch
+branches.change_default_branch=Cambia branch di default
 
 editor.new_file=Nuovo file
 editor.upload_file=Carica File
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Il file è stato cambiato in un'altra posizion
 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.fail_to_delete_file=Failed to delete file '%s' with error: %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'
@@ -576,8 +586,8 @@ issues.next=Pagina successiva
 issues.open_title=Aperto
 issues.closed_title=Chiuso
 issues.num_comments=%d commenti
-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=`ha commentato <a href="#%s">%s</a>`
+issues.delete_comment_confirm=Sei sicuro/a di voler eliminare questo commento?
 issues.no_content=Non ci sono ancora contenuti.
 issues.close_issue=Chiudi
 issues.close_comment_issue=Commenta e chiudi
@@ -633,10 +643,11 @@ pulls.can_auto_merge_desc=La pull request può essere mergiata automaticamente.
 pulls.cannot_auto_merge_desc=Questa pull request non può essere mergiata automaticamente perchè ci sono dei conflitti.
 pulls.cannot_auto_merge_helper=Effettua il merge manualmente per risolvere i conflitti.
 pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.rebase_before_merging=Effettua un Rebase prima del Merge
+pulls.commit_description=Descrizione del Commit
 pulls.merge_pull_request=Unisci Pull Request
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
-pulls.delete_branch=Delete Branch
+pulls.delete_branch=Elimina Ramo
 pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Nuova Milestone
@@ -684,62 +695,62 @@ wiki.last_updated=Ultimo aggiornamento: %s
 settings=Impostazioni
 settings.options=Opzioni
 settings.collaboration=Collaborazione
-settings.collaboration.admin=Admin
-settings.collaboration.write=Write
-settings.collaboration.read=Read
-settings.collaboration.undefined=Undefined
-settings.branches=Branches
+settings.collaboration.admin=Amministratore
+settings.collaboration.write=Scrivi
+settings.collaboration.read=Leggi
+settings.collaboration.undefined=Indefinito
+settings.branches=Divisioni
 settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
-settings.default_branch=Default Branch
+settings.default_branch=Ramo di default
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=Aggiorna
 settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
 settings.protected_branches=Branch protetti
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
-settings.choose_a_branch=Choose a branch...
-settings.branch_protection=Branch Protection
+settings.choose_a_branch=Scegli un ramo...
+settings.branch_protection=Protezione Ramo
 settings.branch_protection_desc=Please choose protect options for branch <b>%s</b>.
-settings.protect_this_branch=Protect this branch
+settings.protect_this_branch=Proteggere questo ramo
 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. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
-settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_search_users=Cerca utenti
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
-settings.protect_whitelist_search_teams=Search teams
+settings.protect_whitelist_search_teams=Cerca 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
-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=Impostazioni mirror
+settings.sync_mirror=Sincronizza ora
+settings.mirror_sync_in_progress=Sincronizzazione del mirror in corso, aggiorna la pagina tra un minuto.
 settings.site=Sito Ufficiale
 settings.update_settings=Aggiorna Impostazioni
 settings.change_reponame_prompt=Questa modifica influirà i link al repository.
 settings.advanced_settings=Opzioni avanzate
-settings.wiki_desc=Enable wiki system
-settings.use_internal_wiki=Use builtin wiki
+settings.wiki_desc=Abilita wiki
+settings.use_internal_wiki=Usa wiki incorporato
 settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Usa Wiki esterno
 settings.external_wiki_url=URL Wiki esterno
 settings.external_wiki_url_desc=I visitatori verranno reindirizzati all'URL quando cliccano sulla scheda.
-settings.issues_desc=Enable issue tracker
-settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.issues_desc=Abilita tracking problemi
+settings.use_internal_issue_tracker=Utilizza il segnalatore di problemi integrato (molto leggero)
 settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Utilizza gestore di problemi esterno
-settings.external_tracker_url=External Issue Tracker URL
-settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
+settings.external_tracker_url=URL di un segnalatore di problemi esterno
+settings.external_tracker_url_desc=I visitatori verranno reindirizzati all'URL quando faranno click sulla scheda.
 settings.tracker_url_format=Formato URL Gestore Problemi Esterno
 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.numeric=Numerico
+settings.tracker_issue_style.alphanumeric=Alfanumerico
 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.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls_desc=Enable pull requests to accept contributions between repositories and branches
+settings.pulls.ignore_whitespace=Ignora cambiamenti di spazi bianchi
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Zona Pericolosa
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=I dati della wiki del repository sono stati elimi
 settings.delete=Elimina questo repository
 settings.delete_desc=Una volta che hai cancellato il repository, non puoi tornare indietro. Si prega di fare attenzione.
 settings.delete_notices_1=-Questa operazione <strong>NON PUÒ</strong> essere annullata.
-settings.delete_notices_2=-Questa operazione eliminerà definitivamente il tutto il contenuto del repository, inclusi i dati di Git, incidenti, commenti e accessi dei collaboratori.
+settings.delete_notices_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
 settings.delete_notices_fork_1=- All forks will become independent after deletion.
 settings.deletion_success=Il repository è stato eliminato con successo!
 settings.update_settings_success=Le opzioni repository sono state aggiornate con successo.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Aggiungi Webhook
 settings.webhook_deletion=Elimina Webhook
 settings.webhook_deletion_desc=Delete this webhook will remove its information and all delivery history. Do you want to continue?
 settings.webhook_deletion_success=Il Webhook è stato eliminato con successo!
@@ -792,6 +805,8 @@ settings.webhook.response=Risposta
 settings.webhook.headers=Headers
 settings.webhook.payload=Payload
 settings.webhook.body=Body
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Gli Hooks di Git sono una funzionalità di Git stesso, puoi modificare i file degli hooks supportati nell'elenco qui sotto per compiere azioni personalizzate.
 settings.githook_edit_desc=Se l'hook è inattivo, sarà presentato un contenuto esempio. Lasciando il contenuto vuoto disattiverai questo hook.
 settings.githook_name=Nome hook
@@ -811,19 +826,19 @@ 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_delete=Delete
-settings.event_delete_desc=Branch or tag deleted
+settings.event_delete=Elimina
+settings.event_delete_desc=Branch o tag eliminato
 settings.event_fork=Forka
 settings.event_fork_desc=Repository Forkata
 settings.event_push=Push
 settings.event_push_desc=Git push in un repository
-settings.event_issues=Issues
+settings.event_issues=Problemi
 settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment=Issue Comment
-settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_pull_request=Pull request
 settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
-settings.event_release=Release
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_release=Versione
 settings.event_release_desc=Release published in a repository.
 settings.active=Attivo
 settings.active_helper=Anche i dettagli riguardanti l'evento che ha innescato l'hook saranno inviati.
@@ -852,6 +867,8 @@ settings.add_key_success=La nuova deploy key '%s' è stata aggiunta con successo
 settings.deploy_key_deletion=Elimina Deploy Key
 settings.deploy_key_deletion_desc=Cancellando questa deploy key verrà rismosso ogni accesso relativo a questa repository. Vuoi continuare?
 settings.deploy_key_deletion_success=Deploy key eliminata con successo!
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=Sfoglia il codice sorgente
 diff.parent=parent
@@ -889,12 +906,12 @@ release.cancel=Annulla
 release.publish=Pubblica Rilascio
 release.save_draft=Salva Bozza
 release.edit_release=Modifica Rilascio
-release.delete_release=Cancela questa Release
+release.delete_release=Cancella questa Release
 release.deletion=Eliminazione Release
 release.deletion_desc=Eliminando questa release cancellarai anche i tag Git corrispondenti. Vuoi continuare?
 release.deletion_success=La release è stata eliminata con successo!
 release.tag_name_already_exist=Un rilascio con questo tag esiste già.
-release.tag_name_invalid=Tag name is not valid.
+release.tag_name_invalid=Il nome del Tag non è valido.
 release.downloads=Download
 
 [org]
@@ -916,9 +933,8 @@ team_name_helper=Verrà usato questo nome per riferirsi a questo team nella conv
 team_desc_helper=In cosa consiste questo team?
 team_permission_desc=Quale livello di autorizzazione dovrebbe avere questa squadra?
 
-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.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Impostazioni
 settings.options=Opzioni
@@ -990,12 +1006,19 @@ first_page=Prima
 last_page=Ultima
 total=Totale: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Statistiche
 dashboard.operations=Operazioni
 dashboard.system_status=Stato del Monitor di Sistema
 dashboard.statistic_info=Il database di Gogs ha <b>%d</b> utenti, <b>%d</b> organizzazioni, <b>%d</b> chiavi pubbliche, <b>%d</b> repository, <b>%d</b> utenti che seguono, <b>%d</b> voti, <b>%d</b> azioni, <b>%d</b> accessi, <b>%d</b> problemi, <b>%d</b> commenti, <b>%d</b> account sociali, <b>%d</b> utenti seguiti, <b>%d</b> mirror, <b>%d</b> rilasci, <b>%d</b> fonti di accesso, <b>%d</b> webhook, <b>%d</b> traguardi, <b>%d</b> etichette, <b>%d</b> incarichi hook, <b>%d</b> team, <b>%d</b> attività di aggiornamento, <b>%d</b> allegati.
 dashboard.operation_name=Nome Operazione
 dashboard.operation_switch=Cambia
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Esegui
 dashboard.clean_unbind_oauth=Pulire OAuthes non associati
 dashboard.clean_unbind_oauth_success=Tutti gli OAuthes non associati eliminati con successo.
@@ -1085,13 +1108,14 @@ repos.private=Privati
 repos.watches=Segue
 repos.stars=Voti
 repos.issues=Problemi
-repos.size=Size
+repos.size=Dimensione
 
-auths.auth_manage_panel=Pannello di configurazione dei meccanismi di autenticazione
+auths.auth_sources=Authentication Sources
 auths.new=Aggiungi Nuova Origine
 auths.name=Nome
 auths.type=Tipo
 auths.enabled=Attivo
+auths.default=Default
 auths.updated=Aggiornato
 auths.auth_type=Tipo di autenticazione
 auths.auth_name=Nome di autenticazione
@@ -1110,7 +1134,7 @@ auths.attribute_username_placeholder=Se vuoto, verrà usato il nome di login del
 auths.attribute_name=First Name Attribute
 auths.attribute_surname=Attributo Cognome
 auths.attribute_mail=Attributo Email
-auths.verify_group_membership=Verify group membership
+auths.verify_group_membership=Verifica gruppo di appartenenza
 auths.group_search_base_dn=Group Search Base DN
 auths.group_filter=Group Filter
 auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
@@ -1128,9 +1152,9 @@ auths.enable_tls=Abilitare Crittografia TLS
 auths.skip_tls_verify=Salta verifica TLS
 auths.pam_service_name=Nome del Servizio PAM
 auths.enable_auto_register=Abilitare Registrazione Automatica
-auths.tips=Consigli
 auths.edit=Modifica impostazioni di autenticazione
 auths.activated=Questa Autenticazione è stata attivata
+auths.default_auth=This authentication is default login source
 auths.new_success=Nuovo meccanismo di autenticazione '%s' aggiunto.
 auths.update_success=Parametro di autenticazione aggiornato.
 auths.update=Aggiornare le impostazioni di autenticazione
@@ -1140,121 +1164,182 @@ 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à.
+auths.github_api_endpoint=API Endpoint
 
-config.not_set=(not set)
+config.not_set=(non impostata)
 config.server_config=Configurazione Server
-config.app_name=Nome Applicazione
-config.app_ver=Versione Applicazione
-config.app_url=URL Applicazione
-config.domain=Dominio
-config.offline_mode=Modalità Offline
-config.disable_router_log=Disattivare Log del Router
+config.brand_name=Brand name
 config.run_user=Utente Esecutore
 config.run_mode=Modalità Esecuzione
-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.reverse_auth_user=Autenticazione Utente Inversa
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=Configurazione SSH
-config.ssh_enabled=Attivo
-config.ssh_start_builtin_server=Avvia server builtin
-config.ssh_domain=Dominio
-config.ssh_port=Porta
-config.ssh_listen_port=Porta in ascolto
-config.ssh_root_path=Percorso Root
-config.ssh_key_test_path=Percorso chiave di test
-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.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
-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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo_config=Configurazione Repository
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Configurazione Database
-config.db_type=Tipo
-config.db_host=Host
-config.db_name=Nome
-config.db_user=Utente
-config.db_ssl_mode=Modalità SSL
-config.db_ssl_mode_helper=(solo per "postgres")
-config.db_path=Percorso
-config.db_path_helper=(per "sqlite3" e "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Configurazione Servizio
-config.register_email_confirm=Richiedono Conferma dell'Email
-config.disable_register=Disabilita 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
-config.enable_captcha=Abilita Captcha
-config.active_code_lives=Attiva Vita del Codice
-config.reset_password_code_lives=Reimpostare Password della Vita del Codice
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Configurazione Webhook
-config.queue_length=Lunghezza della coda
-config.deliver_timeout=Tempo Limite di Consegna
-config.skip_tls_verify=Salta verifiche TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Configurazione Mailer
-config.mailer_enabled=Attivo
-config.mailer_disable_helo=Disattiva HELO
-config.mailer_name=Nome
-config.mailer_host=Host
-config.mailer_user=Utente
-config.send_test_mail=Invia email di test
-config.test_mail_failed=Impossibile inviare mail a '%s': %v
-config.test_mail_sent=Una mail di prova è stata inviata a '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Configurazione OAuth
-config.oauth_enabled=Attivo
-
-config.cache_config=Configurazione Cache
-config.cache_adapter=Adattatore Cache
-config.cache_interval=Intervallo Cache
-config.cache_conn=Connessione Cache
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Configurazione Sessione
-config.session_provider=Fornitore Sessione
-config.provider_config=Impostazioni Provider
-config.cookie_name=Nome del Cookie
-config.enable_set_cookie=Abilita Uso dei Cookie
-config.gc_interval_time=Intervallo di tempo della GC
-config.session_life_time=Durata Sessione
-config.https_only=Solo HTTPS
-config.cookie_life_time=Durata Cookie
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Configurazione Cache
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=Configurazione HTTP
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Configurazione Foto
-config.picture_service=Servizio foto
-config.disable_gravatar=Disabilita Gravatar
-config.enable_federated_avatar=Attiva Federated Avatars
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Configurazione Webhook
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 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.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Configurazione Log
+config.log_file_root_path=Percorso Root del File di Log
 config.log_mode=Modalità
-config.log_options=Options
+config.log_options=Opzioni
 
 monitor.cron=Incarici di cron
 monitor.name=Nome
@@ -1283,7 +1368,6 @@ notices.delete_success=Gli avvisi di sistema sono stati successivamente eliminat
 
 [action]
 create_repo=ha creato il repository <a href="%s">%s</a>
-fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=repository rinominato da <code>%[1]s</code> a <a href="%[2]s">[3]s</a>
 commit_repo=ha pushato nel <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a>
 compare_commits=Visualizza comparazione tra questi %d commit
@@ -1300,6 +1384,10 @@ create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href=
 delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=ha pushato il tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>
 delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=fa
@@ -1321,6 +1409,7 @@ months=%d mesi %s
 years=%d anni %s
 raw_seconds=secondi
 raw_minutes=minuti
+raw_hours=hours
 
 [dropzone]
 default_message=Trascina i file qui o clicca per caricare.

conf/locale/locale_ja-JP.ini

@@ -9,15 +9,14 @@ sign_out=サインアウト
 sign_up=サインアップ
 register=登録
 website=WEBサイト
-version=バージョン
 page=ページ
 template=テンプレート
 language=言語
 create_new=作成...
-user_profile_and_more=ユーザープロファイルなど
+user_profile_and_more=ユーザープロフィールなど
 signed_in_as=サインイン済み
 
-username=ユーザ名
+username=ユーザー名
 email=メールアドレス
 password=パスワード
 re_type=再入力
@@ -44,6 +43,10 @@ issues=課題
 
 cancel=キャンセル
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=インストール
 title=インストールをする前に必要な準備をしましょう
@@ -52,13 +55,13 @@ requite_db_desc=Gogs は、MySQL、PostgreSQL、SQLite3 または TiDB が必要
 db_title=データベース設定
 db_type=データベースの種類
 host=ホスト
-user=ユーザ
+user=ユーザー
 password=パスワード
 db_name=データベース名
 db_helper=MySQLではエンジンがINNODB、文字セットがutf8_general_ciである必要があります。
 ssl_mode=SSL モード
 path=パス
-sqlite_helper=SQLite3データベースのファイルパスです。<br>serviceとして起動する場合は、絶対パスを使用してください。
+sqlite_helper=SQLite3かTiDBのデータベースのファイルパス。<br>サービスとして開始する際には絶対パスを利用してください。
 err_empty_db_path=SQLite3 データベースのPATHを空にすることはできません。
 no_admin_and_disable_registration=管理者アカウントを作成せずに登録を無効にすることはできません。
 err_empty_admin_password=管理者パスワードは空白にできません。
@@ -68,7 +71,7 @@ app_name=アプリケーション名
 app_name_helper=素晴らしい組織名を入れてください！
 repo_path=リポジトリのルートパス
 repo_path_helper=すべての Git リモート リポジトリはこのディレクトリに保存されます。
-run_user=実行ユーザ
+run_user=実行ユーザー
 run_user_helper=ユーザーはリポジトリのルートパスへのアクセス権限、及び Gogs の実行権限を持っている必要があります。
 domain=ドメイン
 domain_helper=これはSSH用クローンURLに影響します。
@@ -101,35 +104,36 @@ disable_gravatar=Gravatarのサービスを無効にします
 disable_gravatar_popup=Gravatarとカスタムソースを無効にして、全てのアバターをユーザーによってアップロードされたものかデフォルトなものにします。
 federated_avatar_lookup=連合アバター検索を有効にする
 federated_avatar_lookup_popup=Libavatarに基づいたオープンソースサービスを使用するには、連合アバター検索を有効にします。
-disable_registration=自己登録を無効にする
-disable_registration_popup=自己登録を無効にし、管理者のみがアカウント作成できる
-enable_captcha=Captchaを有効にする
-enable_captcha_popup=ユーザによる自己登録のため、有効なcaptchaが必要です。
+disable_registration=誰でもユーザ登録ができないようにする
+disable_registration_popup=誰でもユーザ登録ができないようにすることで、管理者のみアカウントが作成できるようになります。
+enable_captcha=CAPTCHAを有効にする
+enable_captcha_popup=ユーザ登録にはCAPTCHA認証が必要です。
 require_sign_in_view=サインインしたユーザのみページ閲覧を許可
 require_sign_in_view_popup=サインインしたユーザのみがページを閲覧できます。ビジターはサインインもしくはサインアップページのみ見られます。
 admin_setting_desc=今管理者アカウントを作成する必要はありません。ID = 1のユーザ は自動的に管理者の権限を獲得します。
 admin_title=管理者アカウントの設定
-admin_name=ユーザ名
+admin_name=ユーザー名
 admin_password=パスワード
 confirm_password=パスワード確認
-admin_email=管理者の電子メール
+admin_email=管理者のメールアドレス
 install_gogs=Gogs をインストール
 test_git_failed='Git' コマンドテストに失敗: %v
 sqlite3_not_available=このリリース バージョンは SQLite3 をサポートしていません。gobuild バージョンではない、公式のバイナリ バージョンを %s からダウンロードしてください。
 invalid_db_setting=データベースの設定が正しくありません: %v
 invalid_repo_path=リポジトリのルートパスが無効です: %v
-run_user_not_match=実行ユーザーは、現在のユーザーではない: %s-> %s
+run_user_not_match=実行ユーザーは現在のユーザーではありません: %s -> %s
 smtp_host_missing_port=SMTPホストのポートが見つかりません。
 invalid_smtp_from=SMTP From フィールドの値が有効ではありません: %v
 save_config_failed=構成の保存に失敗した: %v
+init_failed=アプリケーションの初期化に失敗しました: %v
 invalid_admin_setting=管理者アカウントの設定が無効です: %v
 install_success=ようこそ！我々はあなたが Gogs を選んでくれて嬉しいです！楽しみましょう！
-invalid_log_root_path=ログのルートパスがむこうです: %v
+invalid_log_root_path=リポジトリのルート パスが無効です: %v
 
 [home]
-uname_holder=ユーザー名またはEメール
+uname_holder=ユーザー名またはメールアドレス
 password_holder=パスワード
-switch_dashboard_context=ダッシュ ボードのコンテキストを切替
+switch_dashboard_context=ダッシュボードコンテキストの切替
 my_repos=自分のリポジトリ
 show_more_repos=リポジトリをさらに表示…
 collaborative_repos=共同リポジトリ
@@ -141,7 +145,7 @@ issues.in_your_repos=あなたのリポジトリ
 
 [explore]
 repos=リポジトリ
-users=ユーザ
+users=ユーザー
 organizations=組織
 search=検索
 
@@ -151,6 +155,8 @@ register_hepler_msg=既にアカウントをお持ちですか？今すぐログ
 social_register_hepler_msg=既にアカウントをお持ちですか？連携しましょう！
 disable_register_prompt=申し訳ありませんが、現在登録は受け付けておりません。サイトの管理者にお問い合わせください。
 disable_register_mail=申し訳ありませんが、登録メールの確認機能が無効になっています。
+auth_source=認証ソース
+local=ローカル
 remember_me=ログインしたままにする
 forgot_password=パスワードを忘れた
 forget_password=パスワードを忘れましたか？
@@ -178,10 +184,10 @@ login_two_factor_enter_passcode=2段階認証用パスコードを入力
 login_two_factor_invalid_recovery_code=このリカバリーコードは使用済みか、正しくありません。
 
 [mail]
-activate_account=あなたのアカウントを有効にしてください。
-activate_email=電子メール アドレスを確認します。
+activate_account=アカウントを有効化してください。
+activate_email=メールアドレスを確認
 reset_password=パスワードをリセットします.
-register_success=ようこそ、登録成功
+register_success=登録完了です。ようこそ！
 register_notify=ボードへようこそ
 
 [modal]
@@ -200,7 +206,7 @@ HttpsUrl=HTTPS URL
 PayloadUrl=ペイロードの URL
 TeamName=チーム名
 AuthName=承認名
-AdminEmail=管理者の電子メール
+AdminEmail=管理者のメールアドレス
 
 NewBranchName=新しいブランチ名
 CommitSummary=コミットの概要
@@ -211,7 +217,7 @@ Content=コンテンツ
 
 require_error=空にできません
 alpha_dash_error=アルファベット、数字、ハイフン"-"、アンダースコア"_"のいずれかの必要があります
-alpha_dash_dot_error=' アルファベット、数値、ダッシュ(-)、アンダースコア(_) 、ドット(.)のいずれかを入力する必要があります。 '
+alpha_dash_dot_error=' アルファベット、数値、ハイフン(-)、アンダースコア(_) 、ドット(.) のいずれかを入力する必要があります。 '
 alpha_dash_dot_slash_error=` アルファベット、数字、ハイフン(-)、アンダースコア(_)、ドット(.)、スラッシュ(/) のみ利用できます。`
 size_error=`サイズは %s である必要があります`
 min_size_error=' 少なくとも %s 文字の必要があります '
@@ -220,26 +226,27 @@ email_error=' は有効なメールアドレスではありません '
 url_error=' は有効な URL はありません。 '
 include_error=' 文字列 '%s' を含める必要があります。 '
 unknown_error=不明なエラー:
-captcha_incorrect=Captcha が一致しませんでした。
-password_not_match=パスワードと確認用パスワードが一致同していません。
+captcha_incorrect=CAPTCHAが一致しませんでした。
+password_not_match=パスワードと確認用パスワードが一致していません。
 
 username_been_taken=ユーザー名は既に使用されています。
 repo_name_been_taken=リポジトリ名は既に使用されています。
 org_name_been_taken=組織名は既に使用されています。
 team_name_been_taken=チーム名は既に使用されています。
-email_been_used=電子メール アドレスは既に使用されています。
+email_been_used=メールアドレスは既に使用されています。
 username_password_incorrect=ユーザー名またはパスワードが正しくありません。
+auth_source_mismatch=選択されている認証ソースは、ユーザーに関連付けられていません。
 enterred_invalid_repo_name=入力したリポジトリの名前が正しいかどうかを確認してください。
 enterred_invalid_owner_name=入力された所有者名が正しいかどうかを確認してください。
-enterred_invalid_password=入力したパスワードが正しいかを確認してください。
+enterred_invalid_password=入力したパスワードが正しいか確認してください。
 user_not_exist=指定されたユーザーは存在しません。
-last_org_owner=削除するユーザーはチームの最後のメンバーです。別の所有者設定が必要です。
+last_org_owner=所有者のチームから最後のユーザーを削除することはできません。組織には常に最低でも1人の所有者が必要です。
 
-invalid_ssh_key=SSHを確認できません:%s
+invalid_ssh_key=申し訳ございませんが、SSH キーを検証することができません: %s
 unable_verify_ssh_key=GogsはあなたのSSH keyを確認できません。しかし、我々は有効とみなしますので、自分自身で確認してください。
 auth_failed=認証に失敗しました: %v
 
-still_own_repo=アカウント所有のリポジトリがあり、リポジトリの削除または所有者の移譲が必要です。
+still_own_repo=あなたのアカウントはまだ少なくとも1つのリポジトリの所有権を所持しています。まずそれらの削除または移譲を行う必要があります。
 still_has_org=あなたのアカウントは1つ以上の組織に所属しているため、先に組織を脱退するか削除する必要があります。
 org_still_own_repo=この組織はまだリポジトリの所有しています、リポジトリを削除または転送する必要があります。
 
@@ -256,8 +263,7 @@ following=フォロー
 follow=フォロー
 unfollow=フォロー解除
 
-form.name_reserved=ユーザー名 '%s' は使用されています。
-form.name_pattern_not_allowed=ユーザ名のパターン '%s' は許可されていません。
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=プロフィール
@@ -272,7 +278,7 @@ delete=アカウントを削除
 
 public_profile=パブリック プロフィール
 profile_desc=あなたのメールアドレスは公開され、任意のアカウント関連の通知に使用されます。また、Webベースの操作はサイトを介して行います。
-password_username_disabled=ローカルユーザ以外はユーザ名を変更できません。
+password_username_disabled=ローカルユーザー以外はユーザー名を変更できません。
 full_name=フルネーム
 website=WEBサイト
 location=ロケーション
@@ -297,8 +303,8 @@ old_password=現在のパスワード
 new_password=新しいパスワード
 retype_new_password=新しいパスワードを再入力します。
 password_incorrect=現在のパスワードが正しくありません。
-change_password_success=パスワードが正常に変更されました。今すぐ新しいパスワード経由でサインインすることができます。
-password_change_disabled=ローカルユーザ以外はパスワードを変更できません。
+change_password_success=パスワードが正常に変更されました。今すぐ新しいパスワードを使用してサインインすることができます。
+password_change_disabled=ローカルユーザー以外はパスワードを変更できません。
 
 emails=メールアドレス
 manage_emails=メールアドレスを管理
@@ -307,11 +313,11 @@ primary=プライマリー
 primary_email=プライマリに設定
 delete_email=削除
 email_deletion=電子メールの削除
-email_deletion_desc=この電子メール アドレスを削除すると、あなたのアカウントの関連情報も削除されます。続行しますか。
+email_deletion_desc=このメールアドレスを削除すると、あなたのアカウントの関連情報も削除されます。続行しますか?
 email_deletion_success=電子メールが正常に削除されました。
 add_new_email=新しいメールアドレスを追加
 add_email=メールアドレスの追加
-add_email_confirmation_sent='%s' に新しい確認メールを送信しました、次の %d 時間以内に受信トレイを確認し、確認プロセスを完了してください。
+add_email_confirmation_sent='%s' に新しい確認メールを送信しました。%d 時間以内に受信トレイを確認し、確認プロセスを完了してください。
 add_email_success=新しいメールアドレスが追加されました。
 
 manage_ssh_keys=SSH キーを管理
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=またはシークレットを入力:
 two_factor_then_enter_passcode=パスコードを入力してください:
 two_factor_verify=確認
 two_factor_invalid_passcode=入力されたパスコードは使用できません。もう一度お試しください。
+two_factor_reused_passcode=入力したパスコードは既に使用されています。別のパスコードを試してください。
 two_factor_enable_error=2段階認証の有効化に失敗しました: %v
 two_factor_enable_success=2段階認証があなたのアカウントで有効化されました！
 two_factor_recovery_codes_title=2段階認証のリカバリーコード
@@ -370,9 +377,10 @@ delete_token=削除
 access_token_deletion=パーソナルアクセストークンの削除
 access_token_deletion_desc=パーソナルアクセストークンを削除すると、関連するアプリケーションのすべてのアクセスが削除されます。続行しますか？
 delete_token_success=パーソナルアクセストークンは正常に削除されました！同時にあなたのアプリケーションを更新することを忘れないでください。
+token_name_exists=同じ名前のトークンがあります。
 
 orgs.none=あなたはどの組織のメンバーでもありません。
-orgs.leave_title=組織を作成
+orgs.leave_title=組織からの脱退
 orgs.leave_desc=組織から脱退すると、全てのリポジトリとチームへのアクセスができなくなります。続行しますか？
 
 repos.leave=脱退
@@ -412,15 +420,16 @@ mirror_prune=Prune
 mirror_prune_desc=リモートに存在しないリモート追跡参照を削除する
 mirror_interval=ミラー 間隔(時)
 mirror_address=ミラー アドレス
-mirror_address_desc=アドレスに必要なユーザーの資格情報を入力してください。
+mirror_address_desc=必要なユーザー資格情報をアドレスに含めてください。
 mirror_last_synced=最終同期
 watchers=ウォッチャー
-stargazers=Stargazers
+stargazers=スターゲイザー
 forks=フォーク
+repo_description_helper=リポジトリの説明 (512文字以内)
+repo_description_length=利用可能な文字
 
 form.reach_limit_of_creation=リポジトリの最大作成数 %d にすでに達しています。
-form.name_reserved=リポジトリ名 '%s' は使用されています。
-form.name_pattern_not_allowed=リポジトリ名に '%s' は使用できません。
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=認証が必要
 migrate_type=マイグレーションの種類
@@ -439,11 +448,11 @@ copy_link=コピー
 copy_link_success=コピーされました！
 copy_link_error=⌘ C または Ctrl-C キーを押してコピー
 copied=コピー成功
-unwatch=Unwatch
-watch=Watch
-unstar=Unstar
-star=Star
-fork=Fork
+unwatch=ウォッチ解除
+watch=ウォッチ
+unstar=スターを外す
+star=スター
+fork=フォーク
 
 no_desc=説明なし
 quick_guide=クイック ガイド
@@ -485,7 +494,7 @@ editor.edit_file=ファイルを編集
 editor.preview_changes=変更箇所のプレビュー
 editor.cannot_edit_non_text_files=テキストファイルでないため編集できません
 editor.edit_this_file=このファイルを編集
-editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.must_be_on_a_branch=このファイルを作成または変更の提案をするには、ブランチ上である必要があります。
 editor.fork_before_edit=ファイルを編集する前にこのリポジトリをフォークする必要があります。
 editor.delete_this_file=このファイルを削除
 editor.must_have_write_access=このファイルへの変更を作成・提案するには、書き込み権限が必要です
@@ -506,7 +515,7 @@ editor.new_branch_name_desc=新しいブランチ名...
 editor.cancel=キャンセル
 editor.filename_cannot_be_empty=ファイル名を空にすることはできません。
 editor.branch_already_exists=ブランチ '%s' は、このリポジトリに既に存在します。
-editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.directory_is_a_file=リポジトリのファイル '%s' はディレクトリではありません。
 editor.file_is_a_symlink=ファイル '%s' はシンボリックリンクのため、Webエディターから編集することができません。
 editor.filename_is_a_directory=ファイル名 '%s' は、このリポジトリに存在するディレクトリと同じ名前です。
 editor.file_editing_no_longer_exists=あなたが編集しているファイル '%s' は、すでにリポジトリに存在しません。
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=あなたが編集を開始してから、フ
 editor.file_already_exists=ファイル名 '%s' は、このリポジトリに既に存在します。
 editor.no_changes_to_show=表示する変更箇所はありません。
 editor.fail_to_update_file=ファイル '%s' の作成/更新に失敗しました: %v
+editor.fail_to_delete_file=ファイル '%s' エラーを削除できませんでした: %v
 editor.add_subdir=サブディレクトリを追加...
 editor.unable_to_upload_files='%s' へのファイルアップロード中にエラーが発生し、失敗しました: %v
 editor.upload_files_to_dir='%s' にファイルをアップロード
@@ -576,7 +586,7 @@ issues.next=次ページ
 issues.open_title=オープン
 issues.closed_title=クローズ
 issues.num_comments=%d コメント
-issues.commented_at=`<a href="#%s">%s</a> にコメント`
+issues.commented_at=`が <a href="#%s">%s</a> にコメントしました`
 issues.delete_comment_confirm=このコメントを削除してよろしいですか？
 issues.no_content=まだコンテンツがありません
 issues.close_issue=閉じる
@@ -616,28 +626,29 @@ pulls.compare_compare=比較
 pulls.filter_branch=フィルターブランチ
 pulls.no_results=結果が見つかりませんでした。
 pulls.nothing_to_compare=ベースブランチとヘッドブランチが同一であるため、比較するものがありません。
-pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history.
+pulls.nothing_merge_base=2 本の枝が完全に異なる歴史を持っているので、比較するものがありません。
 pulls.has_pull_request=`既にプルリクエストがこれらのターゲット間に存在します: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create=プルリクエストを作成します。
-pulls.title_desc=wants to merge %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code>
+pulls.title_desc=が <code>%[2]s</code> から <code>%[3]s</code> への %[1]d コミットのマージを希望しています
 pulls.merged_title_desc=%[4]s に %[1]d 件のコミットが <code>%[2]s</code> から <code>%[3]s</code> にマージされました
 pulls.tab_conversation=会話
 pulls.tab_commits=コミット
-pulls.tab_files=ファイルが変更された
+pulls.tab_files=変更されたファイル
 pulls.reopen_to_merge=マージ操作を実行するには、このプルリクエストを再び開いてください。
 pulls.merged=マージされた
-pulls.has_merged=このプルプルリクエストは正常にマージされました!
-pulls.data_broken=Data of this pull request has been broken due to deletion of fork information.
+pulls.has_merged=このプルリクエストは正常にマージされました!
+pulls.data_broken=フォーク情報の削除によってこのプルリクエストのデータは壊れています。
 pulls.is_checking=コンフリクトが発生していないかチェック中です、しばらく待ったのちページを更新してください。
 pulls.can_auto_merge_desc=このプルリクエストは自動的にマージできます。
 pulls.cannot_auto_merge_desc=コンフリクトが発生しているため、このプルリクエストを自動的にマージすることはできません。
 pulls.cannot_auto_merge_helper=競合を解決するためには、手動でマージする必要があります。
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=マージコミットを作成する
+pulls.rebase_before_merging=マージする前に再配置します。
+pulls.commit_description=コミットの説明
 pulls.merge_pull_request=プルリクエストをマージします。
-pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
+pulls.open_unmerged_pull_exists=`同じリポジトリに同じマージ情報持つ未解決のプルリクエスト (#%d) が存在するため再び開くことができません。`
 pulls.delete_branch=ブランチの削除
-pulls.delete_branch_has_new_commits=マージ後に新しいコミットがされているため、ブランチを削除することが出来ません。
+pulls.delete_branch_has_new_commits=マージ後に新しいコミットが行われているため、ブランチを削除することはできません。
 
 milestones.new=新しいマイルストーン
 milestones.open_tab=%d オープン
@@ -738,9 +749,9 @@ settings.tracker_issue_style=外部課題トラッキングシステムの命名
 settings.tracker_issue_style.numeric=数値
 settings.tracker_issue_style.alphanumeric=英数字
 settings.tracker_url_format_desc=ユーザー名、リポジトリ名、課題番号を埋め込むために <code>{user} {repo} {index}</code> が使用できます。
-settings.pulls_desc=誰でもコントリビュートできるよう、プルリクエストの受け付けを有効にします
-settings.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=プルリクエストを有効にし、リポジトリとブランチ間のコントリビューションを受け入れる
+settings.pulls.ignore_whitespace=空白の変更を無視する
+settings.pulls.allow_rebase_merge=コミットをマージするためのリベースの使用を許可する
 settings.danger_zone=危険地帯
 settings.cannot_fork_to_same_owner=元の持ち主に向けてフォークすることは出来ません。
 settings.new_owner_has_same_repo=新しいオーナーは、既に同じ名前のリポジトリを持っています。
@@ -750,19 +761,19 @@ settings.convert_notices_1=- この操作によりリポジトリはミラーリ
 settings.convert_confirm=変更を確認
 settings.convert_succeed=リポジトリは正常に通常リポジトリへ変更されました。
 settings.transfer=オーナー移転
-settings.transfer_desc=リポジトリをあなたが管理者権限を持っている別のユーザーまた組織に移譲します。
+settings.transfer_desc=このリポジトリを、別のユーザーまたはあなたが管理者権限を所持している組織に委譲します。
 settings.transfer_notices_1=-新しい所有者が個人ユーザーの場合、あなたがアクセスできなくなります。
-settings.transfer_notices_2=- You will conserve access if new owner is an organization and if you're one of the owners.
+settings.transfer_notices_2=- 新しい所有者が組織で、あなたがその組織の所有者である場合はアクセス権が残ります。
 settings.transfer_form_title=操作を確認するために、以下の情報を入力してください。
 settings.wiki_delete=Wikiのデータ消去
 settings.wiki_delete_desc=Wikiのデータを消去すると元に戻すことは出来ません。よく確認してください。
-settings.wiki_delete_notices_1=- This will delete and disable the wiki for %s
+settings.wiki_delete_notices_1=- %s の Wiki を削除して無効にします。
 settings.wiki_deletion_success=Wikiのデータ消去が完了しました。
 settings.delete=このリポジトリを削除
 settings.delete_desc=リポジトリを削除すると元に戻せません。確実に確認してください。
 settings.delete_notices_1=-この操作は<strong>元に戻せません</strong> 。
-settings.delete_notices_2=- この操作は、Git データ、課題、コメント、共同編集者のアクセス権などを含む、このリポジトリに関するすべてを完全に削除します。
-settings.delete_notices_fork_1=- All forks will become independent after deletion.
+settings.delete_notices_2=-この操作はこのリポジトリで、Git データ、問題、コメント協力アクセスなどすべて削除されます。
+settings.delete_notices_fork_1=- 削除後、すべてのフォークは独立したリポジトリになります。
 settings.deletion_success=リポジトリが正常に削除されました。
 settings.update_settings_success=リポジトリ オプションが更新されました。
 settings.transfer_owner=新しいオーナー
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=削除後、このユーザーはこのリ
 settings.remove_collaborator_success=共同編集者が削除されました。
 settings.search_user_placeholder=ユーザーを検索...
 settings.org_not_allowed_to_be_collaborator=組織を共同編集者として追加することはできません。
-settings.add_webhook=Webhook を追加
 settings.hooks_desc=Webhooksは、Gogsで特定のイベントの発生時に指定された外部サービスに通知を許可します。イベントが発生すると、それぞれ指定されたUrlに、POSTリクエストが送られます。詳細はこちらのの <a target="_blank"href="%s"> Webhooks ガイド</a>をご覧ください。
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Webhook を追加
 settings.webhook_deletion=Webhook を削除
 settings.webhook_deletion_desc=このwebhookを削除すると、すべての情報と配信履歴が削除されます。続行しますか？
 settings.webhook_deletion_success=Webhook が正常に削除されました。
@@ -792,6 +805,8 @@ settings.webhook.response=レスポンス
 settings.webhook.headers=ヘッダ
 settings.webhook.payload=ペイロード
 settings.webhook.body=ボディ
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git のフックは Git 自体によって提供されています。以下のリストのファイルを編集して、サポートされているフックのカスタム操作を適用することができます。
 settings.githook_edit_desc=もしフックがアクティブではない場合は、サンプルコンテンツが表示されます。コンテンツを空白にするにはこのフックを無効にします。
 settings.githook_name=フックの名前
@@ -801,8 +816,8 @@ 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.secret_desc=秘密キーは、 <code>X-Gogs-Signature</code> ヘッダーを介してペイロードの HMAC SHA256 六角ダイジェストとして送信されます。
+settings.slack_username=ユーザー名
 settings.slack_icon_url=アイコン URL
 settings.slack_color=カラー
 settings.event_desc=どのイベントをこの Webhook のトリガーにしますか？
@@ -819,10 +834,10 @@ settings.event_push=プッシュ
 settings.event_push_desc=リポジトリへのプッシュがされた時
 settings.event_issues=課題
 settings.event_issues_desc=課題の開始・終了・再開・編集・アサイン・アサイン解除・ラベル更新・ラベル削除・マイルストーン紐付け・マイルストーン紐付け解除がされた時
-settings.event_issue_comment=課題へのコメント
-settings.event_issue_comment_desc=課題へのコメントが作成・編集・削除された時
 settings.event_pull_request=プルリクエスト
 settings.event_pull_request_desc=プルリクエストの開始・終了・再開・編集・アサイン・アサイン解除・ラベル更新・ラベル削除・マイルストーン紐付け・マイルストーン紐付け解除・同期がされた時
+settings.event_issue_comment=課題へのコメント
+settings.event_issue_comment_desc=課題へのコメントが作成・編集・削除された時
 settings.event_release=リリース
 settings.event_release_desc=リポジトリでリリースが公開された時
 settings.active=アクティブ
@@ -835,7 +850,7 @@ 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.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository.
+settings.add_dingtalk_hook_desc=リポジトリに <a href="%s">Dingtalk</a> 連携を追加します。
 settings.slack_token=トークン
 settings.slack_domain=ドメイン
 settings.slack_channel=チャンネル
@@ -852,6 +867,8 @@ settings.add_key_success=新しいデプロイキー '%s'が正常に追加さ
 settings.deploy_key_deletion=デプロイキーを削除
 settings.deploy_key_deletion_desc=このデプロイキーを削除すると、このリポジトリに関連するすべてのアクセス権も削除されます。続行しますか。
 settings.deploy_key_deletion_success=デプロイキーが正常に削除された!
+settings.description_desc=リポジトリの説明(512文字以内)
+settings.description_length=利用可能な文字
 
 diff.browse_source=ソースを参照
 diff.parent=親
@@ -860,7 +877,7 @@ diff.data_not_available=差分データは利用できません。
 diff.show_diff_stats=差分情報を表示
 diff.show_split_view=分割表示
 diff.show_unified_view=一括表示
-diff.stats_desc=共有<strong>%d 個のファイルを変更した</strong>、<strong>%d 個の追加</strong> と <strong>%d 個の削除</strong>を含む
+diff.stats_desc=<strong>%d ファイル変更</strong>、<strong>%d 行追加</strong>、<strong>%d 行削除</strong>
 diff.bin=BIN
 diff.view_file=ファイルの表示
 diff.file_suppressed=ファイルの差分が大きいため隠しています
@@ -871,10 +888,10 @@ release.new_release=新しいリリース
 release.draft=ドラフト
 release.prerelease=プレリリース
 release.edit=編集
-release.ahead=このリリース以降 %s へ <strong>%d</strong> コミット
+release.ahead=このリリース以降 %[2]s へ <strong>%[1]d</strong> コミット
 release.source_code=ソース コード
-release.new_subheader=Publish releases to iterate product.
-release.edit_subheader=詳細な変更ログは、ユーザーに何が改善されたかの理解を助けることができます。
+release.new_subheader=製品を反復するためにリリースを公開する。
+release.edit_subheader=詳細な変更ログは、ユーザーが改善点を理解するのに役立つでしょう。
 release.tag_name=タグ名
 release.target=ターゲット
 release.tag_helper=既存のタグを選択するか、新しいタグを作成し発行します。
@@ -895,7 +912,7 @@ release.deletion_desc=このリリースを削除すると、対応するGitの
 release.deletion_success=リリースが正常に削除されました。
 release.tag_name_already_exist=このタグ名には既にリリースが存在します。
 release.tag_name_invalid=使用できないタグ名です。
-release.downloads=Downloads
+release.downloads=ダウンロード
 
 [org]
 org_name_holder=組織名
@@ -916,9 +933,8 @@ team_name_helper=会話の時、この名前を使用しチーム名を表明し
 team_desc_helper=このチームに関する全ての情報は？
 team_permission_desc=このチームに必要な権限レベルは？
 
-form.name_reserved=組織名 '%s' は使用されています。
-form.name_pattern_not_allowed=組織名のパターン '%s' は許可されていません。
-form.team_name_reserved=チーム名 '%s' は使用されています。
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=設定
 settings.options=オプション
@@ -927,7 +943,7 @@ settings.website=WEBサイト
 settings.location=ロケーション
 settings.update_settings=設定の更新
 settings.update_setting_success=組織の設定が更新されました。
-settings.change_orgname_prompt=This change will affect how links relate to the organization.
+settings.change_orgname_prompt=この変更は組織へのリンクに影響します。
 settings.update_avatar_success=組織のアバター画像が正常に更新されました。
 settings.delete=組織を削除
 settings.delete_account=この組織を削除
@@ -979,7 +995,7 @@ teams.add_nonexistent_repo=追加しようとしているリポジトリは存
 
 [admin]
 dashboard=ダッシュボード
-users=ユーザ
+users=ユーザー
 organizations=組織
 repositories=リポジトリ
 authentication=認証
@@ -990,12 +1006,19 @@ first_page=First
 last_page=Last
 total=合計: %d
 
+dashboard.build_info=ビルド情報
+dashboard.app_ver=アプリケーションのバージョン
+dashboard.git_version=Git バージョン
+dashboard.go_version=Go バージョン
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=統計
 dashboard.operations=操作
 dashboard.system_status=システム モニターのステータス
-dashboard.statistic_info=Gogs データベースは <b>%d</b> ユーザー, <b>%d</b> 組織, <b>%d</b> 公開鍵, <b>%d</b> リポジトリ, <b>%d</b> ウォッチ, <b>%d</b> スター, <b>%d</b> 行動, <b>%d</b> アクセス, <b>%d</b> 課題, <b>%d</b> コメント, <b>%d</b> ソーシャルアカウント, <b>%d</b> フォロー, <b>%d</b> ミラー, <b>%d</b> リリース, <b>%d</b> ログイン元, <b>%d</b> webhook, <b>%d</b> マイルストーン, <b>%d</b> ラベル, <b>%d</b> フックタスク, <b>%d</b> チーム, <b>%d</b> アップデートタスク, <b>%d</b> 添付ファイル の情報を持っています。
+dashboard.statistic_info=Gogs データベースは <b>%d</b> 人のユーザー、<b>%d</b> 個の組織、<b>%d</b> 個の公開鍵、<b>%d</b> 個のリポジトリ、<b>%d</b> 個のウォッチ、<b>%d</b> 個のスター、<b>%d</b> 回のアクション、<b>%d</b> 回のアクセス、<b>%d</b> 個の課題、<b>%d</b> 個のコメント、<b>%d</b> 個のソーシャルアカウント、<b>%d</b> 個のフォロー、<b>%d</b> 個のミラー、<b>%d</b> 個のリリース、<b>%d</b> 個のログイン元、<b>%d</b> 個の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.select_operation_to_run=Please select operation to run
 dashboard.operation_run=実行
 dashboard.clean_unbind_oauth=結び付けられていない OAuth をクリーン
 dashboard.clean_unbind_oauth_success=結び付けられていない全ての OAuth を正常に削除しました。
@@ -1009,10 +1032,10 @@ dashboard.git_gc_repos=リポジトリでのガベージコレクションを実
 dashboard.git_gc_repos_success=すべてのリポジトリは正常にガベージ コレクションを行いました。
 dashboard.resync_all_sshkeys='.ssh/ authorized_keys' ファイルを再生成します。（警告：Gogsキー以外は失われます）
 dashboard.resync_all_sshkeys_success=すべての公開鍵が正常に書き換えられました。
-dashboard.resync_all_hooks=Resync pre-receive, update and post-receive hooks of all repositories
-dashboard.resync_all_hooks_success=All repositories' pre-receive, update and post-receive hooks have been resynced successfully.
-dashboard.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.
+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ファイルを失ったレポジトリレコードが正常に再初期化されました。
 
 dashboard.server_uptime=サーバーの稼働時間
 dashboard.current_goroutine=現在のGoroutine
@@ -1082,16 +1105,17 @@ repos.repo_manage_panel=リポジトリの管理パネル
 repos.owner=オーナー
 repos.name=名前
 repos.private=非公開
-repos.watches=Watches
-repos.stars=Stars
+repos.watches=ウォッチ
+repos.stars=スター
 repos.issues=課題
 repos.size=容量
 
-auths.auth_manage_panel=認証管理パネル
+auths.auth_sources=認証ソース
 auths.new=新しいソースを追加
 auths.name=名前
 auths.type=タイプ
 auths.enabled=有効
+auths.default=デフォルト
 auths.updated=更新しました
 auths.auth_type=認証タイプ
 auths.auth_name=認証名
@@ -1100,23 +1124,23 @@ auths.domain=ドメイン
 auths.host=ホスト
 auths.port=ポート
 auths.bind_dn=バインド DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper='%s'はユーザー名のプレースホルダとして使用できます。 例）DOM \%s
 auths.bind_password=バインド パスワード
 auths.bind_password_helper=警告: このパスワードは暗号化されずに格納されます。特権を持つアカウントに使用しないでください。
-auths.user_base=ユーザ検索ベース
+auths.user_base=ユーザー検索ベース
 auths.user_dn=User DN
 auths.attribute_username=ユーザー名属性
-auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
-auths.attribute_name=First Name Attribute
+auths.attribute_username_placeholder=ログインフォームの値を使う場合は空にしてください。
+auths.attribute_name=名前属性
 auths.attribute_surname=名字属性
 auths.attribute_mail=Eメール属性
-auths.verify_group_membership=Verify group membership
-auths.group_search_base_dn=Group Search Base DN
-auths.group_filter=Group Filter
-auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
-auths.user_attribute_listed_in_group=User Attribute Listed in Group
-auths.attributes_in_bind=Fetch attributes in Bind DN context
-auths.filter=User フィルター
+auths.verify_group_membership=グループ メンバーシップを確認します。
+auths.group_search_base_dn=グループ サーチベースDN
+auths.group_filter=グループ フィルター
+auths.group_attribute_contain_user_list=ユーザーのリストを含むグループ属性
+auths.user_attribute_listed_in_group=グループのユーザー属性
+auths.attributes_in_bind=属性をバインドDNのコンテクストから取得する
+auths.filter=ユーザーフィルター
 auths.admin_filter=Admin フィルター
 auths.ms_ad_sa=Ms Ad SA
 auths.smtp_auth=SMTP 認証の種類
@@ -1128,9 +1152,9 @@ auths.enable_tls=TLS 暗号化を有効にする
 auths.skip_tls_verify=TLSベリファイを省略
 auths.pam_service_name=PAMサービス名
 auths.enable_auto_register=自動登録を有効にする
-auths.tips=ヒント
 auths.edit=認証設定を編集
 auths.activated=認証の有効化
+auths.default_auth=この認証を、既定のログイン ソースとする
 auths.new_success=新しい認証 '%s' が正常に追加されました。
 auths.update_success=認証の設定が正常に更新されました。
 auths.update=認証設定を更新
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=認証を削除します、継続しますか?
 auths.still_in_used=この認証を使用しているユーザーがいます。ユーザーを削除するか、別のログイン方法に割り当ててください。
 auths.deletion_success=認証が正常に削除されました。
 auths.login_source_exist=ログイン ソース '%s' は既に存在します。
+auths.github_api_endpoint=APIエンドポイント
 
-config.not_set=(not set)
+config.not_set=(未設定)
 config.server_config=サーバーの構成
-config.app_name=アプリケーション名
-config.app_ver=アプリケーションのバージョン
-config.app_url=アプリケーションの URL
-config.domain=ドメイン
-config.offline_mode=オフラインモード
-config.disable_router_log=ルーターのログを無効にする
-config.run_user=実行ユーザ
+config.brand_name=ブランド名
+config.run_user=実行ユーザー
 config.run_mode=実行モード
-config.git_version=Git バージョン
-config.static_file_root_path=静的ファイルのルートパス
-config.log_file_root_path=ログファイルのルートパス
-config.reverse_auth_user=リバース認証ユーザ
+config.server.external_url=外部 URL 
+config.server.domain=ドメイン
+config.server.protocol=プロトコル
+config.server.http_addr=HTTPアドレス
+config.server.http_port=HTTP ポート
+config.server.cert_file=証明書ファイル
+config.server.key_file=キーファイル
+config.server.tls_min_version=最小TLSバージョン
+config.server.unix_socket_permission=Unixソケットの権限
+config.server.local_root_url=Local root URL
+config.server.offline_mode=オフラインモード
+config.server.disable_router_log=ルーターログを無効にする
+config.server.enable_gzip=Gzip を有効化
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH設定
-config.ssh_enabled=有効
-config.ssh_start_builtin_server=内蔵サーバーの起動
-config.ssh_domain=ドメイン
-config.ssh_port=ポート
-config.ssh_listen_port=リッスンポート
-config.ssh_root_path=ルートパス
-config.ssh_key_test_path=キーテストパス
-config.ssh_keygen_path=鍵生成コマンド ('ssh-keygen') のパス
-config.ssh_minimum_key_size_check=最小キーサイズチェック
-config.ssh_minimum_key_sizes=最小キーサイズ
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=最小キーサイズチェック
+config.ssh.minimum_key_sizes=最小キーサイズ
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=内蔵サーバーを起動
+config.ssh.listen_host=待受ホスト
+config.ssh.listen_port=待受ポート
+config.ssh.server_ciphers=Server ciphers
 
 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=Enable Local Path Migration
-config.commits_fetch_concurrency=Commits Fetch Concurrency
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=非公開にする
+config.repo.max_creation_limit=最大作成数
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=HTTP Git の無効化
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=データベース設定
-config.db_type=タイプ
-config.db_host=ホスト
-config.db_name=名前
-config.db_user=ユーザ
-config.db_ssl_mode=SSL モード
-config.db_ssl_mode_helper=(「postgres」のみ）
-config.db_path=パス
-config.db_path_helper=（"sqlite3" および "tidb" の場合）
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL モード
+config.db.ssl_mode_helper=("postgres"のみ)
+config.db.path=Path
+config.db.path_helper=("sqlite3"のみ)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=サービスの設定
-config.register_email_confirm=電子メールの確認を必要
-config.disable_register=登録を無効にする
-config.show_registration_button=登録ボタンを表示
-config.require_sign_in_view=サインインを要求
-config.mail_notify=メール通知
-config.disable_key_size_check=最小キーサイズチェックを無効にする
-config.enable_captcha=Captchaを有効にする
-config.active_code_lives=コードリンクの有効期限をアクティブ
-config.reset_password_code_lives=パスワードリンクの有効期限をリセット
+config.security_config=セキュリティ設定
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=セキュアなクッキーを有効にする
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Webhook設定
-config.queue_length=キューの長さ
-config.deliver_timeout=送信タイムアウト
-config.skip_tls_verify=TLSの確認を省略
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=メーラーの設定
-config.mailer_enabled=有効にした
-config.mailer_disable_helo=HELOコマンド無効
-config.mailer_name=名前
-config.mailer_host=ホスト
-config.mailer_user=ユーザ
-config.send_test_mail=テストメールの送信
-config.test_mail_failed='%s' 宛のテストメールの送信に失敗しました: %v
-config.test_mail_sent=テストメールが '%s' に送信されました。
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth 構成
-config.oauth_enabled=有効
-
-config.cache_config=キャッシュの設定
-config.cache_adapter=キャッシュ アダプター
-config.cache_interval=キャッシュ間隔
-config.cache_conn=キャッシュ接続
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=セッションの設定
-config.session_provider=セッション プロバイダー
-config.provider_config=プロバイダーの構成
-config.cookie_name=クッキーの名前
-config.enable_set_cookie=クッキーの設定を有効にする
-config.gc_interval_time=GC 間隔
-config.session_life_time=セッションのライフタイム
-config.https_only=HTTPS のみ
-config.cookie_life_time=クッキーのライフタイム
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS のみ
+config.session.gc_interval=GC 間隔
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=キャッシュの設定
+config.cache.adapter=Adapter
+config.cache.interval=GC 間隔
+config.cache.host=Host
+
+config.http_config=HTTP の設定
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=サイズ制限
+config.attachment.max_files=ファイルの制限
+
+config.release_config=リリースの構成
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=添付ファイルのサイズ制限
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=画像の設定
-config.picture_service=画像サービス
-config.disable_gravatar=Gravatarを無効にする
-config.enable_federated_avatar=連合アバターを有効にする
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Gravatarを無効にする
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=ミラー構成
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Webhook設定
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Git 設定
-config.git_disable_diff_highlight=Diff のシンタックスハイライトを無効にする
-config.git_max_diff_lines=Diff の最大行数（１ファイルあたり）
-config.git_max_diff_line_characters=Diff の最大文字数（１行あたり）
-config.git_max_diff_files=Diff の最大ファイル数（表示）
-config.git_gc_args=GC の引数
-config.git_migrate_timeout=移行タイムアウト
-config.git_mirror_timeout=ミラー更新タイムアウト
-config.git_clone_timeout=Clone 操作のタイムアウト
-config.git_pull_timeout=Pull 操作のタイムアウト
-config.git_gc_timeout=GC 操作のタイムアウト
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC の引数
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull タイムアウト
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=ログの設定
+config.log_file_root_path=ログファイルのルートパス
 config.log_mode=モード
 config.log_options=オプション
 
@@ -1283,23 +1368,26 @@ notices.delete_success=システム通知が正常に削除されました。
 
 [action]
 create_repo=がリポジトリ <a href="%s"> %s</a> を作成しました
-fork_repo=リポジトリを <a href="%s">%s</a> にフォークしました
-rename_repo=<code>%[1]s</code> から <a href="%[2]s">[3]s</a> にリポジトリ名を変更しました
-commit_repo=<a href="%[1]s">%[4]s</a>を<a href="%[1]s/src/%[2]s">%[3]s</a>にプッシュしました
+rename_repo=が <code>%[1]s</code> から <a href="%[2]s">%[3]s</a> にリポジトリ名を変更しました
+commit_repo=が <a href="%[1]s">%[4]s</a> に <a href="%[1]s/src/%[2]s">%[3]s</a> をプッシュしました
 compare_commits=これらの %d コミットの比較を表示
 transfer_repo=リポジトリ <code>%s</code> を <a href="%s">%s</a> へ転送しました
 create_issue=`課題 <a href="%s/issues/%s">%s#%[2]s</a> を開きました`
 close_issue=`課題 <a href="%s/issues/%s">%s#%[2]s</a> を閉じました`
 reopen_issue=`課題 <a href="%s/issues/%s">%s#%[2]s</a> が再び開かれました`
-comment_issue=`課題 <a href="%s/issues/%s">%s#%[2]s</a> へのコメント`
+comment_issue=`が課題 <a href="%s/issues/%s">%s#%[2]s</a> にコメントしました`
 create_pull_request=`プルリクエスト <a href="%s/pulls/%s"> %s[2]s</a>を作成`
 close_pull_request=`プルリクエスト <a href="%s/pulls/%s">%s#%[2]s</a> を閉じました`
 reopen_pull_request=`プルリクエスト <a href="%s/pulls/%s">%s#%[2]s</a> が再び開かれました`
 merge_pull_request=`プルリクエスト <a href="%s/pulls/%s"> %s[2]s</a>をマージしました`
-create_branch=<a href="%[1]s">%[4]s</a> に、新しいブランチ <a href="%[1]s/src/%[2]s">%[3]s</a> を作成しました
+create_branch=が <a href="%[1]s">%[4]s</a> に新しいブランチ <a href="%[1]s/src/%[2]s">%[3]s</a> を作成しました
 delete_branch=<a href="%[1]s">%[3]s</a> のブランチ <code>%[2]s</code> を削除しました
-push_tag=<a href="%[1]s">%[3]s</a> に タグ <a href="%[1]s/src/%[2]s">%[2]s</a> をプッシュしました
+push_tag=が <a href="%[1]s">%[3]s</a> にタグ <a href="%[1]s/src/%[2]s">%[2]s</a> をプッシュしました
 delete_tag=<a href="%[1]s">%[3]s</a> のタグ <code>%[2]s</code> を削除しました
+fork_repo=リポジトリを <a href="%s">%s</a> にフォークしました
+mirror_sync_push=<a href="%[1]s">%[4]s</a> の <a href="%[1]s/src/%[2]s">%[3]s</a> へのコミットをミラーから反映しました
+mirror_sync_create=新しい参照<a href="%s/src/%s">%[2]s</a>を<a href="%[1]s">%[3]s</a>にミラーから反映しました
+mirror_sync_delete=<a href="%[1]s">%[3]s</a> の参照 <code>%[2]s</code> をミラーから同期および削除しました
 
 [tool]
 ago=前
@@ -1321,6 +1409,7 @@ months=%d ヶ月 %s
 years=%d 年 %s
 raw_seconds=秒
 raw_minutes=分
+raw_hours=hours
 
 [dropzone]
 default_message=ここにファイルをドロップまたはクリックしてアップロードします。

conf/locale/locale_ko-KR.ini

@@ -9,7 +9,6 @@ sign_out=로그아웃
 sign_up=가입하기
 register=가입하기
 website=웹 사이트
-version=버전
 page=페이지
 template=템플릿
 language=언어
@@ -44,6 +43,10 @@ issues=이슈
 
 cancel=취소
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=설치
 title=첫 실행을 위한 설치단계
@@ -122,6 +125,7 @@ run_user_not_match=실행 유저가 현재 유저가 아닙니다: %s -> %s
 smtp_host_missing_port=SMTP 호스트 포트가 주소에 없습니다.
 invalid_smtp_from=SMTP 보낸 사람 필드가 유효하지 않습니다: %v
 save_config_failed=설정을 저장할 수 없습니다: %v
+init_failed=프로그램을 초기화하는데 실패하였습니다: %v
 invalid_admin_setting=관리자 계정 설정이 잘못되었습니다: %v
 install_success=환영합니다! Gogs를 선택해 주셔서 감사합니다.
 invalid_log_root_path=로그 루트 경로가 올바르지 않습니다: %v
@@ -151,6 +155,8 @@ register_hepler_msg=이미 계정을 가지고 계신가요? 로그인하세요!
 social_register_hepler_msg=계정을 가지고 계신가요? 연결하세요!
 disable_register_prompt=죄송합니다, 가입이 비활성화 되어있습니다. 사이트 관리자에게 문의 해주세요.
 disable_register_mail=죄송합니다. 메일 등록이 비활성화 되었습니다.
+auth_source=인증 소스 편집
+local=로컬
 remember_me=자동 로그인
 forgot_password=비밀번호 찾기
 forget_password=비밀번호를 잊으셨습니까?
@@ -229,6 +235,7 @@ org_name_been_taken=이미 사용중인 조직 이름입니다.
 team_name_been_taken=이미 사용중인 팀 이름입니다.
 email_been_used=이미 사용중인 이메일 주소입니다.
 username_password_incorrect=사용자 이름이나 비밀번호가 올바르지 않습니다.
+auth_source_mismatch=선택 인증 소스는 사용자와 연결 됩니다.
 enterred_invalid_repo_name=입력한 저장소 이름이 올바른지 확인하십시오.
 enterred_invalid_owner_name=입력한 사용자 이름이 올바른지 확인하십시오.
 enterred_invalid_password=입력한 비밀번호가 올바른지 확인하십시오.
@@ -256,8 +263,7 @@ following=팔로우 중
 follow=추적하기
 unfollow=추적해제
 
-form.name_reserved=사용자 이름 '%s'는 예약되어 있습니다.
-form.name_pattern_not_allowed=사용자 이름 패턴 '%s'은 허용 되지 않습니다.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=프로필
@@ -348,15 +354,16 @@ two_factor_or_enter_secret=또는 이 비밀키를 입력하세요:
 two_factor_then_enter_passcode=그리고 코드를 입력하세요:
 two_factor_verify=확인
 two_factor_invalid_passcode=입력한 코드가 올바르지 않습니다. 다시 시도해 주세요!
+two_factor_reused_passcode=입력하신 비밀번호가 이미 사용되였습니.다른 비밀번호를 사용해보십시오!.
 two_factor_enable_error=2단계 인증 활성화 실패: %v
-two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
-two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
-two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
-two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
-two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
-two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_enable_success=2단계 인증이 성공적으로 활성화되었습니다!
+two_factor_recovery_codes_title=2단계 인증 복구 코드
+two_factor_recovery_codes_desc=복구 코드는 당신이 2단계 인증 프로그램에 접근할 수 없을때 사용합니다. 각 코드들은 한 번만 사용될 수 있습니다. <b>이 코드들은 안전한 장소에 보관하세요.</b>
+two_factor_regenerate_recovery_codes=복구 코드 재생성
+two_factor_regenerate_recovery_codes_error=복구 코드 재생성 실패: %v
+two_factor_regenerate_recovery_codes_success=성공적으로 새로운 복구 코드가 생성되었습니다!
 two_factor_disable_title=2단계 인증 비활성화
-two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_desc=2단계 인증을 끄면 보안 수준이 낮아집니다. 계속하시겠습니까?
 two_factor_disable_success=2단계 인증이 성공적으로 비활성화되었습니다!
 
 manage_access_token=개인 액세스 토큰 관리
@@ -370,15 +377,16 @@ delete_token=삭제
 access_token_deletion=개인 액세스 토큰 삭제
 access_token_deletion_desc=이 토큰을 사용하는 애플리케이션의 접근권한 또한 삭제됩니다. 계속 하시겠습니까?
 delete_token_success=액세스 토큰이 삭제되었습니다. 애플리케이션의 업데이트도 잊지 마세요.
+token_name_exists=같은 이름의 토큰이 이미 존재합니다.
 
 orgs.none=당신은 어떤 조직의 구성원도 아닙니다.
 orgs.leave_title=조직 떠나기
 orgs.leave_desc=조직을 떠난 후에는 모든 리포지토리와 팀에 액세스 할 수 없게 됩니다. 계속 하시겠습니까?
 
-repos.leave=Leave
-repos.leave_title=Leave repository
-repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
-repos.leave_success=You have left repository '%s' successfully!
+repos.leave=나가기
+repos.leave_title=저장소 나가기
+repos.leave_desc=이 페지를 떠나면 저장소에 액세스할수 없게 됩니다. 계속하시겠습니까?
+repos.leave_success=당신은 저장소  '%s' 에서 성공적으로 탈퇴하였습니다.!
 
 delete_account=계정 삭제
 delete_prompt=당신의 계정을 삭제합니다.  완료된 후에는 <strong>취소할 수 없습니다</strong>.
@@ -417,10 +425,11 @@ mirror_last_synced=마지막으로 동기화됨
 watchers=주시하고 있는 사람들
 stargazers=별을 준 사람들
 forks=포크
+repo_description_helper=저장소 설명.최대 512길이의 문자열이 가능합니다.
+repo_description_length=가능한 문자열입니다.
 
 form.reach_limit_of_creation=소유자가 저장소 만들기 최대 제한에 (%d개) 도달했습니다.
-form.name_reserved=저장소 이름 '%s'은 예약 되어 있습니다.
-form.name_pattern_not_allowed=저장소 이름 패턴 '%s'은 허용 되지 않습니다.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=인증 필요
 migrate_type=마이그레이션 유형
@@ -472,11 +481,11 @@ file_permalink=고유링크
 file_too_large=이 파일은 표시하기엔 너무 큽니다.
 video_not_supported_in_browser=이 브라우저는 HTML5 비디오 태그를 지원하지 않습니다.
 
-branches.overview=Overview
+branches.overview=개요
 branches.active_branches=활성 브랜치
 branches.stale_branches=오래된 브랜치
 branches.all=모든 브랜치
-branches.updated_by=Updated %[1]s by %[2]s
+branches.updated_by=%[2]s이 %[1]s를 업데이트
 branches.change_default_branch=기본 브랜치 변경
 
 editor.new_file=파일 생성
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=편집을 시작한 이후 파일 내용이
 editor.file_already_exists=이 저장소에 이름이 '%s'인 파일이 이미 존재합니다.
 editor.no_changes_to_show=표시할 변경사항이 없습니다.
 editor.fail_to_update_file=파일 '%s'를 변경/추가 하는데 실패하였습니다. 에러: %v
+editor.fail_to_delete_file=파일 '%s'를 삭제하는데 실패하였습니다. 오유: %v
 editor.add_subdir=하위 디렉토리 추가...
 editor.unable_to_upload_files=파일 '%s'를 업로드하는데 실패하였습니다. 에러: %v
 editor.upload_files_to_dir=파일 업로드 '%s'
@@ -616,7 +626,7 @@ pulls.compare_compare=비교
 pulls.filter_branch=Filter Branch
 pulls.no_results=결과 없음
 pulls.nothing_to_compare=Base 와 head 브랜치가 동일해서 비교할 게 없습니다.
-pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history.
+pulls.nothing_merge_base=두 브런치의 리력이 완전히 다르므로 비교할수 없습니다.
 pulls.has_pull_request=`이 두 타겟 사이엔 이미 풀 리퀘스트가 있습니다:<a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create=풀 리퀘스트 생성
 pulls.title_desc=<code>%[2]s</code> 에서 <code>%[3]s</code> 로 %[1]d commits 를 머지하려 합니다
@@ -633,8 +643,9 @@ pulls.is_checking=아직 컨플릭트 여부 체크 중입니다, 잠시 후 이
 pulls.can_auto_merge_desc=이 풀리퀘스트는 자동적으로 머지될 수 있습니다.
 pulls.cannot_auto_merge_desc=컨플릭이 존재해서 이 풀리퀘스트는 자동을 머지될 수 없습니다.
 pulls.cannot_auto_merge_helper=컨플릭을 해결하려면 수동으로 머지해 주십시오.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=합치기커밋 생성
+pulls.rebase_before_merging=병합 하기 전에 리베이스
+pulls.commit_description=커밋설명
 pulls.merge_pull_request=풀리퀘스트 머지
 pulls.open_unmerged_pull_exists=`같은 리파지토리에서 같은 머지 정보로 만들어진 풀리퀘스트 (#%d) 가 이미 오픈 상태이고 머지를 기다리고 있기 때문에 다시 열기 작업을 할 수 없습니다.`
 pulls.delete_branch=브랜치 삭제
@@ -690,7 +701,7 @@ settings.collaboration.write=쓰기
 settings.collaboration.read=읽기
 settings.collaboration.undefined=미정의
 settings.branches=브랜치
-settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
+settings.branches_bare=당신은 빈 저장소에 대한 브런치를 관리할수 없습니다. 먼저 저장소에 내용을 푸쉬하십시오.
 settings.default_branch=기본 브랜치
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=업데이트
@@ -710,7 +721,7 @@ settings.protect_whitelist_committers_desc=Add people or teams to whitelist of d
 settings.protect_whitelist_users=이 브랜치에 푸시를 할 수 있는 유저
 settings.protect_whitelist_search_users=유저 검색
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
-settings.protect_whitelist_search_teams=Search teams
+settings.protect_whitelist_search_teams=팀 검색
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
@@ -724,7 +735,7 @@ settings.change_reponame_prompt=이 변경은 이 저장소와 연관된 링크
 settings.advanced_settings=고급 설정
 settings.wiki_desc=위키 시스템 활성화
 settings.use_internal_wiki=내장 위키 사용
-settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
+settings.allow_public_wiki_desc=저장소가 비공개되어 있으면 위키에 공개적으로 접속할 수 있도록 허용하기
 settings.use_external_wiki=외부 위키 사용하기
 settings.external_wiki_url=외부 위키 URL
 settings.external_wiki_url_desc=탭을 클릭하면 URL로 리다이렉트됩니다.
@@ -739,7 +750,7 @@ settings.tracker_issue_style=외부 이슈 트래커 명명 스타일:
 settings.tracker_issue_style.numeric=숫자
 settings.tracker_issue_style.alphanumeric=문자 숫자
 settings.tracker_url_format_desc=<code>{user} {repo} {index}</code> 사용자 명, 저장소 명, 이슈 인덱스를 사용하여 표시자를 사용할 수 있습니다.
-settings.pulls_desc=끌어오기 요청을 공개적으로 기여받을 수 있도록 활성화합니다.
+settings.pulls_desc=Enable pull requests to accept contributions between repositories and branches
 settings.pulls.ignore_whitespace=Ignore changes in whitespace
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=위험 설정
@@ -762,7 +773,7 @@ settings.wiki_deletion_success=저장소의 Wiki 데이터가 성공적으로
 settings.delete=이 저장소 삭제
 settings.delete_desc=저장소를 지우고 나면 되돌릴 수 없습니다. 다시 한번 확인하세요.
 settings.delete_notices_1=- 이 작업은 취소할 수 <strong>없습니다.</strong>
-settings.delete_notices_2=- 이 작업은 저장소의 모든 항목을 영구적으로 삭제합니다. Git 데이터, 이슈, 주석 및 공동 작업자의 액세스를 포함합니다.
+settings.delete_notices_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
 settings.delete_notices_fork_1=- 모든 포크들은 삭제 후에도 독립적으로 유지됩니다.
 settings.deletion_success=저장소가 성공적으로 삭제 되었습니다!
 settings.update_settings_success=저장소 옵션이 성공적으로 업데이트 되었습니다.
@@ -778,21 +789,25 @@ settings.collaborator_deletion_desc=이 사용자는 더 이상 이 저장소의
 settings.remove_collaborator_success=공동작업자가 삭제 되었습니다.
 settings.search_user_placeholder=사용자 검색...
 settings.org_not_allowed_to_be_collaborator=조직을 공동 작업자로 추가할 수 없습니다.
-settings.add_webhook=Webhook 추가
 settings.hooks_desc=웹후크는 기본적인 HTTP POST 이벤트 트리거입니다. Gogs에서 무슨 일이 발생할 때마다, 지정한 대상 호스트에 알림을 보냅니다. <a target="_blank" href="%s">웹후크 안내서</a>에서 자세히 알아보십시오.
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Webhook 추가
 settings.webhook_deletion=Webhook 삭제
 settings.webhook_deletion_desc=이 웹훅을 삭제하면 정보와 모든 전송기록이 제거됩니다. 계속 하시겠습니까?
 settings.webhook_deletion_success=Webhook을 성공적으로 삭제했습니다!
 settings.webhook.test_delivery=전달 시험
 settings.webhook.test_delivery_desc=가짜 푸시 이벤트 전달하여 웹훅 설정을 테스트합니다.
 settings.webhook.test_delivery_success=Webhook 테스트가 delivery 큐에 추가되었습니다. delivery 기록에서 나오기까지 몇 초의 시간이 걸릴 것입니다.
-settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery=재전송
 settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=요청
 settings.webhook.response=응답
 settings.webhook.headers=제목
 settings.webhook.payload=페이로드
 settings.webhook.body=본문
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git Hooks는 Git 자체에서 제공되며, 아래 목록에서 지원되는 후크 파일을 편집하여 사용자 정의 작업을 수행 할 수 있습니다.
 settings.githook_edit_desc=후크가 비활성인 경우 샘플 콘텐츠가 표시됩니다. 내용을 빈 값으로 두면 이 훅은 비활성화됩니다.
 settings.githook_name=Hook 이름
@@ -815,17 +830,17 @@ settings.event_create_desc=브랜치 또는 태그를 생성합니다.
 settings.event_delete=삭제
 settings.event_delete_desc=브랜치나 태그 삭제됨
 settings.event_fork=포크
-settings.event_fork_desc=Repository forked
+settings.event_fork_desc=저장소 포크됨
 settings.event_push=푸시
 settings.event_push_desc=깃 저장소로 푸시
 settings.event_issues=이슈
 settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment=Issue Comment
-settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_pull_request=끌어오기 요청
 settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
-settings.event_release=Release
-settings.event_release_desc=Release published in a repository.
+settings.event_issue_comment=이슈 댓글
+settings.event_issue_comment_desc=이슈 댓글이 작성, 편집 또는 삭제되었습니다.
+settings.event_release=릴리즈
+settings.event_release_desc=저장소에 릴리즈가 출시되었습니다.
 settings.active=활성
 settings.active_helper=후크를 트리거하면 이벤트에 대한 세부 정보도 전달됩니다.
 settings.add_hook_success=새로운 웹훅이 생성되었습니다.
@@ -853,6 +868,8 @@ settings.add_key_success=새로운 배포 키 '%s'가 성공적으로 추가 되
 settings.deploy_key_deletion=배포 키 삭제
 settings.deploy_key_deletion_desc=이 배포키를 삭제하면 이 저장소와 관련된 모든 접근 권한이 삭제됩니다. 계속 하시겠습니까?
 settings.deploy_key_deletion_success=배포 키가 성공적으로 삭제되었습니다!
+settings.description_desc=저장소 설명입니다. 최대 512길이의 문자열이 가능합니다.
+settings.description_length=사용 가능한 문자열
 
 diff.browse_source=소스 검색
 diff.parent=부모
@@ -917,9 +934,8 @@ team_name_helper=대화에서 이 팀을 언급할 때 이 이름을 사용합
 team_desc_helper=이 팀은 무엇입니까?
 team_permission_desc=이 팀이 가진 권한이 무엇입니까?
 
-form.name_reserved=조직이름 '%s'는 예약되어있습니다.
-form.name_pattern_not_allowed=조직이름 패턴 '%s'는 허용되지 않았습니다.
-form.team_name_reserved=Team name '%s' is reserved.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=설정
 settings.options=옵션
@@ -991,12 +1007,19 @@ first_page=처음
 last_page=마지막
 total=총: %d
 
+dashboard.build_info=빌드정보
+dashboard.app_ver=애플리케이션 버전
+dashboard.git_version=Git 버전
+dashboard.go_version=Go 버전
+dashboard.build_time=태그 만들기
+dashboard.build_commit=빌드 커밋
 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> 웹훅, <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.select_operation_to_run=Please select operation to run
 dashboard.operation_run=실행
 dashboard.clean_unbind_oauth=연결되지 않은 OAuth들을 정리
 dashboard.clean_unbind_oauth_success=연결되지 않은 모든 OAuth들이 성공적으로 삭제되었습니다.
@@ -1086,13 +1109,14 @@ repos.private=비공개
 repos.watches=지켜보기
 repos.stars=Stars
 repos.issues=이슈
-repos.size=Size
+repos.size=크기
 
-auths.auth_manage_panel=인증 관리 패널
+auths.auth_sources=인증 소스
 auths.new=새로운 소스를 추가
 auths.name=이름
 auths.type=유형
 auths.enabled=활성화됨
+auths.default=기본값
 auths.updated=업데이트됨
 auths.auth_type=인증 유형
 auths.auth_name=인증 이름
@@ -1108,12 +1132,12 @@ auths.user_base=사용자 검색 기준
 auths.user_dn=사용자 DN
 auths.attribute_username=유저 명 속성
 auths.attribute_username_placeholder=사용자 이름에 대한 로그인 폼 필드 값을 사용하려면 비워 둡니다.
-auths.attribute_name=First Name Attribute
+auths.attribute_name=첫번째 이름 속성
 auths.attribute_surname=성씨 속성
 auths.attribute_mail=이메일 속성
-auths.verify_group_membership=Verify group membership
-auths.group_search_base_dn=Group Search Base DN
-auths.group_filter=Group Filter
+auths.verify_group_membership=그룹 구성원 자격을 확인
+auths.group_search_base_dn=그룹 설정 Base DN
+auths.group_filter=그룹 필터
 auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
 auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=DN 컨텍스트에서 속성을 가져와 연결합니다.
@@ -1129,9 +1153,9 @@ auths.enable_tls=TLS 암호화 활성화
 auths.skip_tls_verify=TLS 검증 건너뛰기
 auths.pam_service_name=PAM 서비스 명
 auths.enable_auto_register=자동 등록을 활성화
-auths.tips=도움말
 auths.edit=인증 설정 편집
 auths.activated=이 인증정보는 활성화되어있습니다.
+auths.default_auth=This authentication is default login source
 auths.new_success=새로운 인증 '%s'가 성공적으로 추가 되었습니다.
 auths.update_success=인증 설정이 성공적으로 변경되었습니다.
 auths.update=인증 설정 업데이트
@@ -1141,121 +1165,182 @@ auths.delete_auth_desc=이 인증이 삭제됩니다. 정말로 진행하시겠
 auths.still_in_used=이 인증은 아직 몇몇 사용자들이 사용하고 있습니다, 먼저 사용자들의 로그인 유형을 삭제하거나 변경해주십시오.
 auths.deletion_success=인증이 성공적으로 삭제 되었습니다!
 auths.login_source_exist=로그인 소스 '%s'는 이미 존재합니다.
+auths.github_api_endpoint=API 끝점
 
-config.not_set=(not set)
+config.not_set=(설정되지 않음)
 config.server_config=서버 설정
-config.app_name=애플리케이션 이름
-config.app_ver=응용 프로그램 버전
-config.app_url=애플리케이션 URL
-config.domain=도메인
-config.offline_mode=오프라인 모드
-config.disable_router_log=라우터 로그 비활성화
+config.brand_name=브랜드 이름
 config.run_user=데몬 실행 계정
 config.run_mode=실행 모드
-config.git_version=Git 버전
-config.static_file_root_path=정적 파일 최상위 경로
-config.log_file_root_path=로그 파일 최상위 경로
-config.reverse_auth_user=역방향 사용자 인증
+config.server.external_url=외부 URL
+config.server.domain=도메인
+config.server.protocol=프로토콜
+config.server.http_addr=HTTP 주소
+config.server.http_port=HTTP 포트
+config.server.cert_file=인증서 파일
+config.server.key_file=키 파일
+config.server.tls_min_version=최소 TLS 버전
+config.server.unix_socket_permission=Unix 소켓 권한
+config.server.local_root_url=로컬 최상위 URL
+config.server.offline_mode=오프라인 모드
+config.server.disable_router_log=라우터 로그 비활성화
+config.server.enable_gzip=Gzip 활성화
+config.server.app_data_path=애플리케이션 데이터 경로
+config.server.load_assets_from_disk=디스크에서 요소 불러오기
+config.server.landing_url=랜딩 URL
 
 config.ssh_config=SSH 설정
-config.ssh_enabled=활성화됨
-config.ssh_start_builtin_server=빌트인 서버 시작
-config.ssh_domain=도메인
-config.ssh_port=포트
-config.ssh_listen_port=수신 대기 포트
-config.ssh_root_path=최상위 경로
-config.ssh_key_test_path=주 테스트 경로
-config.ssh_keygen_path=키 생성 ('ssh-keygen') 경로
-config.ssh_minimum_key_size_check=최소 키 사이즈 검사
-config.ssh_minimum_key_sizes=최소 키 사이즈
+config.ssh.enabled=활성화됨
+config.ssh.domain=노출된 도메인
+config.ssh.port=노출 포트
+config.ssh.root_path=최상위 경로
+config.ssh.keygen_path=키 생성 경로
+config.ssh.key_test_path=키 테스트 경로
+config.ssh.minimum_key_size_check=최소 키 크기 검사
+config.ssh.minimum_key_sizes=최소 키 사이즈
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=빌트인 서버 시작
+config.ssh.listen_host=수신 대기 호스트
+config.ssh.listen_port=수신 대기 포트
+config.ssh.server_ciphers=서버 암호화
 
-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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo_config=저장소 설정
+config.repo.root_path=최상위 경로
+config.repo.script_type=스크립트 유형
+config.repo.ansi_chatset=ANSI 문자열
+config.repo.force_private=비공개 강제
+config.repo.max_creation_limit=최대 생성 제한
+config.repo.preferred_licenses=선호 라이선스
+config.repo.disable_http_git=HTTP Git 비활성화
+config.repo.enable_local_path_migration=로컬 경로 마이그레이션 활성화
+config.repo.enable_raw_file_render_mode=raw 파일 렌더링 모드 활성화
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=편집기 줄 바꿈 확장
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=업로드 활성화됨
+config.repo.upload.temp_path=임시 경로 업로드
+config.repo.upload.allowed_types=허용되는 유형 업로드
+config.repo.upload.file_max_size=업로드 파일 크기 제한
+config.repo.upload.max_files=업로드 파일 제한
 
 config.db_config=데이터베이스 설정
-config.db_type=유형
-config.db_host=호스트
-config.db_name=이름
-config.db_user=사용자
-config.db_ssl_mode=SSL 모드
-config.db_ssl_mode_helper=("postgres" 전용)
-config.db_path=경로
-config.db_path_helper=("sqlite3" 및 "tidb"만)
+config.db.type=유형
+config.db.host=호스트
+config.db.name=이름
+config.db.user=사용자
+config.db.ssl_mode=SSL 모드
+config.db.ssl_mode_helper=("postgres" 전용)
+config.db.path=경로
+config.db.path_helper={"sqlite3" 전용)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=서비스 설정
-config.register_email_confirm=이메일 확인 필수
-config.disable_register=등록 비활성화
-config.show_registration_button=등록 버튼을 표시
-config.require_sign_in_view=보기 위해선 로그인 필수
-config.mail_notify=메일 알림
-config.disable_key_size_check=최소 키 크기 검사를 비활성화
-config.enable_captcha=Captcha 활성화
-config.active_code_lives=코드 만료 기한
-config.reset_password_code_lives=비밀번호 코드 만료 기한
+config.security_config=보안 설정
+config.security.login_remember_days=로그인 기억 날짜
+config.security.cookie_remember_name=쿠키 기억하기
+config.security.cookie_username=사용자 이름 쿠키
+config.security.cookie_secure=보안 쿠키 활성화
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=로그인 상태 쿠키 활성화
+config.security.login_status_cookie_name=로그인 상태 쿠키
 
-config.webhook_config=웹훅 설정
-config.queue_length=큐 길이
-config.deliver_timeout=시간 제한 사용
-config.skip_tls_verify=TLS 확인 건너뛰기
+config.email_config=이메일 설정
+config.email.enabled=활성화됨
+config.email.subject_prefix=제목 접두어
+config.email.host=호스트
+config.email.from=보내는 사람
+config.email.user=사용자
+config.email.disable_helo=HELO 비활성화
+config.email.helo_hostname=HELO 호스트 이름
+config.email.skip_verify=인증서 검증 건너뛰기
+config.email.use_certificate=커스텀 인증서 사용하기
+config.email.cert_file=인증서 파일
+config.email.key_file=키 파일
+config.email.use_plain_text=평문 텍스트 사용
+config.email.add_plain_text_alt=평문 텍스트 대체 추가
+config.email.send_test_mail=테스트 이메일 보내기
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent='%s'로 테스트 이메일을 보냈습니다.
 
-config.mailer_config=메일러 설정
-config.mailer_enabled=활성화됨
-config.mailer_disable_helo=HELO 비활성화
-config.mailer_name=이름
-config.mailer_host=호스트
-config.mailer_user=사용자
-config.send_test_mail=테스트 이메일 보내기
-config.test_mail_failed='%s'로 테스트 이메일을 보내는데 실패하였습니다.: %v
-config.test_mail_sent='%s'로 테스트 이메일을 보냈습니다.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth 설정
-config.oauth_enabled=활성화됨
-
-config.cache_config=캐시 설정
-config.cache_adapter=캐시 어댑터
-config.cache_interval=캐시 간격
-config.cache_conn=캐시 연결
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=세션 설정
-config.session_provider=세션 공급자
-config.provider_config=공급자 설정
-config.cookie_name=쿠키 이름
-config.enable_set_cookie=쿠키 활성화
-config.gc_interval_time=GC 인터벌 시간
-config.session_life_time=세션 수명
-config.https_only=HTTPS만
-config.cookie_life_time=쿠키 수명
+config.session.provider=공급자
+config.session.provider_config=공급자 설정
+config.session.cookie_name=쿠키
+config.session.https_only=HTTPS만
+config.session.gc_interval=GC 간격
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF 쿠키
+
+config.cache_config=캐시 설정
+config.cache.adapter=Adapter
+config.cache.interval=GC 간격
+config.cache.host=호스트
+
+config.http_config=HTTP 설정
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=활성화됨
+config.attachment.path=경로
+config.attachment.allowed_types=허용 유형
+config.attachment.max_size=크기 제한
+config.attachment.max_files=파일 제한
+
+config.release_config=릴리즈 설정
+config.release.attachment.enabled=첨부 파일 활성화됨
+config.release.attachment.allowed_types=허용되는 첨부 파일 유형
+config.release.attachment.max_size=첨부 파일 크기 제한
+config.release.attachment.max_files=첨부 파일 제한
 
 config.picture_config=이미지 설정
-config.picture_service=이미지 서비스
-config.disable_gravatar=Gravatar 사용안함
-config.enable_federated_avatar=연합 아바타 사용
+config.picture.avatar_upload_path=사용자 아바타 업로드 경로
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=기본 간격
+
+config.webhook_config=웹훅 설정
+config.webhook.types=유형
+config.webhook.deliver_timeout=배달 제한 시간
+config.webhook.skip_tls_verify=TLS 검증 건너뛰기
 
 config.git_config=깃 설정
-config.git_disable_diff_highlight=변경 사항 구문 강조 비활성화
-config.git_max_diff_lines=변경사항 최대 표시 줄 수 (단일 파일에 대해)
-config.git_max_diff_line_characters=변경사항 최대 표시 문자 수 (단일 행에 대해)
-config.git_max_diff_files=변경사항 최대 파일 개 수 (표시 되는)
-config.git_gc_args=가비지 콜렉션 인수
-config.git_migrate_timeout=마이그레이션 제한 시간
-config.git_mirror_timeout=미러 업데이트 시간 제한
-config.git_clone_timeout=복제 작업 시간 제한
-config.git_pull_timeout=끌어오기 작업 시간 제한
-config.git_gc_timeout=가비지 콜렉션 작업 시간 제한
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC 인수
+config.git.migrate_timeout=마이그레이션 제한 시간
+config.git.mirror_timeout=미러 페치 제한 시간
+config.git.clone_timeout=클론 제한 시간
+config.git.pull_timeout=풀 제한 시간
+config.git.gc_timeout=GC 제한 시간
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=로그 설정
-config.log_mode=Mode
-config.log_options=Options
+config.log_file_root_path=로그 파일 최상위 경로
+config.log_mode=모드
+config.log_options=설정
 
 monitor.cron=Cron 작업
 monitor.name=이름
@@ -1284,7 +1369,6 @@ notices.delete_success=시스템 알림들이 성공적으로 삭제되었습니
 
 [action]
 create_repo=저장소를 만들었습니다. <a href="%s">%s</a>
-fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=<code>%[1]s에서</code>에서 <a href="%[2]s"> %[3]s</a>으로 저장소 이름을 바꾸었습니다.
 commit_repo=<a href="%[1]s">%[4]s</a>에서 <a href="%[1]s/src/%[2]s">%[3]s</a>으로 푸시함
 compare_commits=이 %d개의 커밋에 대한 비교 보기
@@ -1300,7 +1384,11 @@ merge_pull_request=`병합된 끌어오기 요청 <a href="%s/pulls/%s"> %s #%[2
 create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
 delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=태그 <a href="%s/src/%s">%[2]s</a>를 <a href="%[1]s">%[3]s</a>로 푸시함
-delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+delete_tag=<a href="%[1]s">%[3]s</a>에서 code>%[2]s</code> 태그 삭제됨
+fork_repo=forked a repository to <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=전
@@ -1322,6 +1410,7 @@ months=%d 달 %s
 years=%d 년 %s
 raw_seconds=초
 raw_minutes=분
+raw_hours=시간
 
 [dropzone]
 default_message=여기에 파일을 끌어 놓거나 클릭하여 업로드하세요.

conf/locale/locale_lv-LV.ini

@@ -9,7 +9,6 @@ sign_out=Izrakstīties
 sign_up=Reģistrēties
 register=Reģistrēties
 website=Mājas lapa
-version=Versija
 page=Lapa
 template=Sagatave
 language=Valoda
@@ -44,6 +43,10 @@ issues=Problēmas
 
 cancel=Atcelt
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Instalācija
 title=Instalācijas soļi pirmo reizi palaižot
@@ -119,9 +122,10 @@ sqlite3_not_available=Jūsu versija neatbalsta SQLite3, lūdzu lejupielādējiet
 invalid_db_setting=Datu bāzes iestatījums nav pareizs: %v
 invalid_repo_path=Repozitorija atrašanās vieta ir nekorekta: %v
 run_user_not_match=Izpildes lietotājs nav pašreizējais lietotājs: %s -> %s
-smtp_host_missing_port=SMTP Host is missing port in address.
+smtp_host_missing_port=SMTP adresē nav norādīts ports.
 invalid_smtp_from=SMTP sūtītāja lauks ir nekorekts: %v
 save_config_failed=Neizdevās saglabāt konfigurāciju: %v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=Nekorekts admin konta iestatījums: %v
 install_success=Laipni lūdzam! Mēs priecājamies, ka Jūs izvēlaties Gogs, patīkamu lietošanu!
 invalid_log_root_path=Norādītā žurnalizēšanas direktorija ir kļūdaina: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Jau ir konts? Pieraksties tagad!
 social_register_hepler_msg=Jau ir konts? Sasaisti tagad!
 disable_register_prompt=Atvainojiet, reģistrācija ir atspējota. Lūdzu, sazinieties ar vietnes administratoru.
 disable_register_mail=Atvainojiet, reģistrācijas e-pasta apstiprināšana ir atspējota.
+auth_source=Autentificēšanas avots
+local=Local
 remember_me=Atcerēties mani
 forgot_password=Aizmirsu paroli
 forget_password=Aizmirsi paroli?
@@ -212,7 +218,7 @@ Content=Saturs
 require_error=` nedrīkst būt tukšs.`
 alpha_dash_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus vai domuzīmes (-_).`
 alpha_dash_dot_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus, domuzīmes (-_) vai punktu.`
-alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
+alpha_dash_dot_slash_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus, domuzīmes (-_), slīpsvītru vai punktu.`
 size_error=` jābūt %s simbolus garam.`
 min_size_error=` jabūt vismaz %s simbolu garumā.`
 max_size_error=` jabūt ne mazāk kā %s simbolu garumā.`
@@ -229,6 +235,7 @@ org_name_been_taken=Organizācijas nosaukums ir jau aizņemts.
 team_name_been_taken=Komandas nosaukums ir jau aizņemts.
 email_been_used=E-pasta adrese jau tiek izmantota.
 username_password_incorrect=Lietotājvārds vai parole nav pareiza.
+auth_source_mismatch=Izvēlētais autentificēšanas avots nav saistīts ar lietotāju.
 enterred_invalid_repo_name=Lūdzu, pārliecinieties, vai ievadītā repozitorija nosaukums ir pareizs.
 enterred_invalid_owner_name=Lūdzu, pārliecinieties, vai ievadītā īpašnieka vārds ir pareizs.
 enterred_invalid_password=Lūdzu pārliecinieties, vai Jūsu ievadītā parole ir pareiza.
@@ -256,8 +263,7 @@ following=Seko
 follow=Sekot
 unfollow=Nesekot
 
-form.name_reserved=Lietotāja vārds '%s' jau ir aizņemts.
-form.name_pattern_not_allowed=Lietotāja vārds '%s' nav atļauts.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profils
@@ -347,8 +353,9 @@ two_factor_scan_qr=Please use your authentication application to scan the image:
 two_factor_or_enter_secret=Vai ievadiet noslēpumu:
 two_factor_then_enter_passcode=Pēc tam ievadiet kodu:
 two_factor_verify=Pārbaudīt
-two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
-two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_invalid_passcode=Ievadītais piekļuves kods nav derīgs. Lūdzu mēģiniet vēlreiz!
+two_factor_reused_passcode=Ievadītais piekļuves kods jau ir izmantots. Lūdzu mēģiniet citu!
+two_factor_enable_error=Divu faktoru autentifikācijas iespējošana neizdevās: %v
 two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
 two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
 two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
@@ -357,7 +364,7 @@ two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
 two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
 two_factor_disable_title=Atspējot divu faktoru autentifikāciju
 two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
-two_factor_disable_success=Two-factor authentication has disabled successfully!
+two_factor_disable_success=Divu faktoru autentificēšana ir atspējota!
 
 manage_access_token=Pārvaldīt personīgos piekļuves talonus
 generate_new_token=Ģenerēt jaunu talonu
@@ -370,8 +377,9 @@ delete_token=Dzēst
 access_token_deletion=Personīgā piekļuves talona dzēšana
 access_token_deletion_desc=Dzēšot personīgo piekļuves talonu, tiks liegta piekļuve aplikācijām, kas to izmanto. Vai vēlaties turpināt?
 delete_token_success=Personīgās piekļuves talons veiksmīgi izdzēsts! Neaizmirstiet nomainīt uz citu aplikācijās, kas to izmantoja.
+token_name_exists=Token with same name already exists.
 
-orgs.none=You are not a member of any organizations.
+orgs.none=Jūs neesat nevienas organizācijas dalībnieks.
 orgs.leave_title=Pamest organizāciju
 orgs.leave_desc=You will lose access to all repositories and teams after you left the organization. Do you want to continue?
 
@@ -417,10 +425,11 @@ mirror_last_synced=Pēdējo reizi sinhronizēts
 watchers=Novērotāji
 stargazers=Zvaigžņdevēji
 forks=Atdalītie repozitoriji
+repo_description_helper=Repozitorija apraksts. Maksimālais garums 512 rakstzīmes.
+repo_description_length=Pieejamās rakstzīmes
 
 form.reach_limit_of_creation=Īpašnieks sasniedza maksimālu pieļaujamo (%d) izveidoto repozitoriju skaitu.
-form.name_reserved=Repozitorija nosaukums '%s' ir rezervēts.
-form.name_pattern_not_allowed=Repozitorija nosaukums '%s' nav atļauts.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Nepieciešama autorizācija
 migrate_type=Migrācijas veids
@@ -470,13 +479,13 @@ file_history=Vēsture
 file_view_raw=Rādīt neapstrādātu
 file_permalink=Patstāvīgā saite
 file_too_large=Šis fails ir par lielu, lai to parādītu
-video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
+video_not_supported_in_browser=Jūsu pārlūks neatbalsta HTML5 video.
 
 branches.overview=Pārskats
 branches.active_branches=Aktīvie atzari
 branches.stale_branches=Pamests atzars
 branches.all=Visi atzari
-branches.updated_by=Updated %[1]s by %[2]s
+branches.updated_by=%[2]s atjaunoja %[1]s
 branches.change_default_branch=Mainīt noklusēto atzaru
 
 editor.new_file=Jauns fails
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Faila saturs ir mainījies kopš brīža, kad
 editor.file_already_exists=Fails ar nosaukumu '%s' repozitorijā jau eksistē.
 editor.no_changes_to_show=Nav izmaiņu, ko rādīt.
 editor.fail_to_update_file=Neizdevās izmainīt/izveidot failu '%s', kļūda: %v
+editor.fail_to_delete_file=Neizdevās dzēst failu '%s', kļūda: %v
 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'
@@ -634,6 +644,7 @@ pulls.cannot_auto_merge_desc=Šis izmaiņu pieprasījums nevar tikt automātiski
 pulls.cannot_auto_merge_helper=Lūdzu sapludiniet manuāli, lai atrisinātu konfliktus.
 pulls.create_merge_commit=Create a merge commit
 pulls.rebase_before_merging=Rebase before merging
+pulls.commit_description=Commit Description
 pulls.merge_pull_request=Izmaiņu pieprasījuma sapludināšana
 pulls.open_unmerged_pull_exists=`Jūs nevarat veikt atkārtotas atvēršanas darbību, jo jau eksistē izmaiņu pieprasījums (#%d) no šī repozitorija ar tādu pašu sapludināšanas informāciju un gaida sapludināšanu.`
 pulls.delete_branch=Dzēst atzaru
@@ -738,8 +749,8 @@ settings.tracker_issue_style=Ārējā problēmu reģistra nosaukumu stils:
 settings.tracker_issue_style.numeric=Cipari
 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.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls_desc=Enable pull requests to accept contributions between repositories and branches
+settings.pulls.ignore_whitespace=Ignorēt atstarpju izmaiņas
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Bīstamā zona
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Pievienot tīmekļa āķi
 settings.webhook_deletion=Dzēst tīmekļa āķi
 settings.webhook_deletion_desc=Dzēšot tīmekļa āķi tiks dzēsta visa ar to saistītā informācija un izpildes vēsture. Vai vēlaties turpināt?
 settings.webhook_deletion_success=Tīmekļa āķis tika veiksmīgi izdzēsts!
@@ -792,6 +805,8 @@ settings.webhook.response=Atbilde
 settings.webhook.headers=Galvenes
 settings.webhook.payload=Derīgā krava
 settings.webhook.body=Saturs
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git āķus apstrādā pats Git. Jūs varat labot atbalsīto āku failus sarakstā zemāk, lai veiktu pielāgotas darbības.
 settings.githook_edit_desc=Ja āķis nav aktīvs, tiks attēlots piemērs kā to izmantot. Atstājot āķa saturu tukšu, tas tiks atspējots.
 settings.githook_name=Āķa nosaukums
@@ -819,10 +834,10 @@ settings.event_push=Izmaiņu nosūtīšana
 settings.event_push_desc=Git izmaiņu nosūtīšana uz repozitoriju
 settings.event_issues=Problēmas
 settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment=Problēmas komentārs
-settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_pull_request=Izmaiņu pieprasījums
 settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_issue_comment=Problēmas komentārs
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_release=Laidiens
 settings.event_release_desc=Laidiens publicēts repozitorijā.
 settings.active=Aktīvs
@@ -852,6 +867,8 @@ settings.add_key_success=Izvietošanas atslēga '%s' tik veiksmīgi pievienota!
 settings.deploy_key_deletion=Dzēst izvietošanas atslēgu
 settings.deploy_key_deletion_desc=Dzēšot šo izvietošanas atslēgu tiks noņemta arī ar to saistītā piekļuve šim repozitorijam. Vai vēlaties turpināt?
 settings.deploy_key_deletion_success=Izvietošanas atslēga tika veiksmīgi izdzēsta!
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=Pārlūkot izejas kodu
 diff.parent=vecāks
@@ -916,9 +933,8 @@ team_name_helper=Šo nosaukumu varēs izmantot, lai pieminētu komandu sarunās.
 team_desc_helper=Komandas apraksts
 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=Komandas vārds '%s' ir rezervēts.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Iestatījumi
 settings.options=Opcijas
@@ -990,12 +1006,19 @@ first_page=Pirmā
 last_page=Pēdējā
 total=Kopā: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Statistika
 dashboard.operations=Darbības
 dashboard.system_status=Sistēmas uzraudzības statuss
 dashboard.statistic_info=Gogs datu bāze satur <b>%d</b> lietotājus, <b>%d</b> organizācijas, <b>%d</b> publiskās atslēgas, <b>%d</b> repozitorijus, <b>%d</b> vērošanas, <b>%d</b> atzīmētas zvaigznītes, <b>%d</b> darbības, <b>%d</b> piekļuves, <b>%d</b> problēmas, <b>%d</b> komentārus, <b>%d</b> sociālos kontus, <b>%d</b> sekošanas, <b>%d</b> spoguļošanas, <b>%d</b> izlaides, <b>%d</b> login sources, <b>%d</b> tīmekļa āķus, <b>%d</b> starpposmus, <b>%d</b> etiķetes, <b>%d</b> āķu uzdevumus, <b>%d</b> komandas, <b>%d</b> labotus uzdevumus, <b>%d</b> pielikumus.
 dashboard.operation_name=Darbības nosaukums
 dashboard.operation_switch=Pārslēgt
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Palaist
 dashboard.clean_unbind_oauth=Notīrīt nesaistītās OAuth biļetes
 dashboard.clean_unbind_oauth_success=Visas nesaistītās OAuth biļetes tika veiksmīgi izdzēstas.
@@ -1087,11 +1110,12 @@ repos.stars=Atzīmētās zvaigznītes
 repos.issues=Problēmas
 repos.size=Izmērs
 
-auths.auth_manage_panel=Autentifikācijas pārvaldības panelis
+auths.auth_sources=Authentication Sources
 auths.new=Pievienot jaunu avotu
 auths.name=Nosaukums
 auths.type=Veids
 auths.enabled=Iespējota
+auths.default=Default
 auths.updated=Atjaunināta
 auths.auth_type=Autentifikācijas tips
 auths.auth_name=Autentifikācijas nosaukums
@@ -1107,11 +1131,11 @@ auths.user_base=Lietotāja pamatnosacījumi
 auths.user_dn=Lietotāja DN
 auths.attribute_username=Lietotājvārda atribūts
 auths.attribute_username_placeholder=Atstājiet tukšu, lai izmantotu lietotājvārdu ar kuru autorizējaties.
-auths.attribute_name=First Name Attribute
+auths.attribute_name=Vārda atribūts
 auths.attribute_surname=Uzvārda atribūts
 auths.attribute_mail=E-pasta atribūts
-auths.verify_group_membership=Verify group membership
-auths.group_search_base_dn=Group Search Base DN
+auths.verify_group_membership=Pārbaudīt grupas piederību
+auths.group_search_base_dn=Grupas meklēšanas pamata DN
 auths.group_filter=Group Filter
 auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
 auths.user_attribute_listed_in_group=User Attribute Listed in Group
@@ -1128,9 +1152,9 @@ auths.enable_tls=Iespējot TLS šifrēšanu
 auths.skip_tls_verify=Izlaist TLS verifikāciju
 auths.pam_service_name=PAM servisa nosaukums
 auths.enable_auto_register=Iespējot automātisko reģistrāciju
-auths.tips=Padomi
 auths.edit=Labot autentifikācijas iestatījumus
 auths.activated=Autentifikācija ir aktivizēta
+auths.default_auth=This authentication is default login source
 auths.new_success=Jauna autentifikācija '%s' tika veiksmīgi pievienota.
 auths.update_success=Autentifikācijas iestatījumi tika veiksmīgi saglabāti.
 auths.update=Mainīt autentifikācijas iestatījumus
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Šī autentifikācija tiks dzēsta, vai vēlaties turpin
 auths.still_in_used=Daži lietotāji joprojām izmanto šo autentifikācijas veidu. Nepieciešams veikt šo lietotāju konvertāciju vai dzēšanu.
 auths.deletion_success=Autentifikācija tika veiksmīgi izdzēsta!
 auths.login_source_exist=Pieteikšanās avots '%s' jau eksistē.
+auths.github_api_endpoint=API Endpoint
 
-config.not_set=(not set)
+config.not_set=(nav noteikts)
 config.server_config=Servera konfigurācija
-config.app_name=Lietotnes nosaukums
-config.app_ver=Lietotnes versija
-config.app_url=Lietotnes URL
-config.domain=Domēns
-config.offline_mode=Bezsaistes režīms
-config.disable_router_log=Atspējot maršrutētāja žurnalizēšanu
+config.brand_name=Brand name
 config.run_user=Izpildes lietotājs
 config.run_mode=Izpildes režīms
-config.git_version=Git versija
-config.static_file_root_path=Statisko failu atrašanās vieta
-config.log_file_root_path=Žurnalizēšanas failu glabāšanas vieta
-config.reverse_auth_user=Reversā lietotāja autentifikācija
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH konfigurācija
-config.ssh_enabled=Iespējots
-config.ssh_start_builtin_server=Startēt iebūvēto serveri
-config.ssh_domain=Domēns
-config.ssh_port=Ports
-config.ssh_listen_port=Klausīšanās ports
-config.ssh_root_path=Saknes ceļš
-config.ssh_key_test_path=Atslēgu pārbaudes ceļš
-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.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 config.repo_config=Repozitorija konfigurācija
-config.repo_root_path=Repozitoriju glabāšanas vieta
-config.script_type=Skripta veids
-config.repo_force_private=Piespiedu privāti repozitoriji
-config.max_creation_limit=Max Creation Limit
-config.preferred_licenses=Preferred Licenses
-config.disable_http_git=Atspējot HTTP Git
-config.enable_local_path_migration=Atļaut migrāciju no lokāla ceļa
-config.commits_fetch_concurrency=Commits Fetch Concurrency
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Datu bāzes konfigurācija
-config.db_type=Veids
-config.db_host=Resursdators
-config.db_name=Nosaukums
-config.db_user=Lietotājs
-config.db_ssl_mode=SSL režīms
-config.db_ssl_mode_helper=(tikai PostgreSQL datu bāzei)
-config.db_path=Ceļš
-config.db_path_helper=(priekš "sqlite3" and "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Pakalpojuma konfigurācija
-config.register_email_confirm=Pieprasīt e-pasta apstiprināšanu
-config.disable_register=Atspējot jaunu lietotāju reģistrāciju
-config.show_registration_button=Rādīt reģistrēšanās pogu
-config.require_sign_in_view=Nepieciešama autorizācija
-config.mail_notify=Pasta paziņojumi
-config.disable_key_size_check=Atspējot atslēgas minimālā garuma pārbaudi
-config.enable_captcha=Iespējot drošības kodu
-config.active_code_lives=Aktīvā koda ilgums
-config.reset_password_code_lives=Paroles atiestatīšanas koda ilgums
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Tīkla āķu konfigurācija
-config.queue_length=Rindas garums
-config.deliver_timeout=Piegādes noildze
-config.skip_tls_verify=Izlaist TLS pārbaudi
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Sūtītāja konfigurācija
-config.mailer_enabled=Iespējots
-config.mailer_disable_helo=Atspējot HELO
-config.mailer_name=Nosaukums
-config.mailer_host=Resursdators
-config.mailer_user=Lietotājs
-config.send_test_mail=Nosūtīt pārbaudes e-pastu
-config.test_mail_failed=Neizdevās nosūtīt pārbaudes e-pasta vēstuli uz '%s': %v
-config.test_mail_sent=Pārbaudes e-pasta vēstule tika nosūtīta uz '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth konfigurācija
-config.oauth_enabled=Iespējota
-
-config.cache_config=Kešatmiņas konfigurācija
-config.cache_adapter=Kešatmiņas adapteris
-config.cache_interval=Kešatmiņas intervāls
-config.cache_conn=Kešatmiņas pieslēguma parametri
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Sesijas konfigurācja
-config.session_provider=Sesijas nodrošinātājs
-config.provider_config=Pakalpojumu sniedzēja konfigurācija
-config.cookie_name=Sīkdatnes nosaukums
-config.enable_set_cookie=Ļaut izmantot sīkdatnes
-config.gc_interval_time=GC laika intervāls
-config.session_life_time=Sesijas ilgums
-config.https_only=Tikai HTTPS
-config.cookie_life_time=Sīkdatņu glabāšanas ilgums
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Kešatmiņas konfigurācija
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP konfigurācija
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Attēlu konfigurācija
-config.picture_service=Lokāli attēli
-config.disable_gravatar=Atspējot Gravatar
-config.enable_federated_avatar=Iespējot apvienotās profila bildes
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Tīkla āķu konfigurācija
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Git konfigurācija
-config.git_disable_diff_highlight=Atspējot salīdzināšanas sintakses iekrāsošanu
-config.git_max_diff_lines=Maksimālais salīdzināmo rindu skaits vienam failam
-config.git_max_diff_line_characters=Maksimālais salīdzināmo simbolu skaits vienai rindai
-config.git_max_diff_files=Maksimālais salīdzināmo failu skaits, ko attēlot
-config.git_gc_args=GC argumenti
-config.git_migrate_timeout=Migrācijas noilgums
-config.git_mirror_timeout=Spoguļa atjaunošanas noilgums
-config.git_clone_timeout=Klonēšanas darbības noilgums
-config.git_pull_timeout=Izmaiņu saņemšanas darbības noilgums
-config.git_gc_timeout=GC darbības noilgums
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Žurnalizēšanas konfigurācija
+config.log_file_root_path=Žurnalizēšanas failu glabāšanas vieta
 config.log_mode=Režīms
 config.log_options=Opcijas
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Sistēmas paziņojumi tika veiksmīgi izdzēstas.
 
 [action]
 create_repo=izveidoja repozitoriju <a href="%s">%s</a>
-fork_repo=atdalīja repozitoriju uz <a href="%s">%s</a>
 rename_repo=pārsauca repozitoriju no <code>%[1]s</code> uz <a href="%[2]s">%[3]s</a>
 commit_repo=veica izmaiņu nosūtīšanu atzaram <a href="%[1]s/src/%[2]s">%[3]s</a> repozitorijā <a href="%[1]s">%[4]s</a>
 compare_commits=Salīdzināt šīs %d revīzijas
@@ -1300,6 +1384,10 @@ create_branch=izveidoja jaunu atzaru <a href="%[1]s/src/%[2]s">%[3]s</a> repozit
 delete_branch=izdzēsa atzaru <code>%[2]s</code> repozitorijā <a href="%[1]s">%[3]s</a>
 push_tag=pievienoja tagu <a href="%s/src/%s">%[2]s</a> repozitorijam <a href="%[1]s">%[3]s</a>
 delete_tag=izdzēsa tagu <code>%[2]s</code> repozitorijā <a href="%[1]s">%[3]s</a>
+fork_repo=atdalīja repozitoriju uz <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=atpakaļ
@@ -1321,6 +1409,7 @@ months=%d mēneši %s
 years=%d gadi %s
 raw_seconds=sekundes
 raw_minutes=minūtes
+raw_hours=hours
 
 [dropzone]
 default_message=Ievelciet failus šeit vai noklikšķiniet, lai augšupielādētu.

conf/locale/locale_nl-NL.ini

@@ -9,7 +9,6 @@ sign_out=Uitloggen
 sign_up=Aanmelden
 register=Registreren
 website=Website
-version=Versie
 page=Pagina
 template=Sjabloon
 language=Taal
@@ -40,10 +39,14 @@ your_settings=Uw instellingen
 
 activities=Activiteiten
 pull_requests=Pull requests
-issues=Kwesties
+issues=Issues
 
 cancel=Annuleren
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Installatie
 title=Installatiestappen voor de eerste keer opstarten
@@ -119,9 +122,10 @@ sqlite3_not_available=Uw versie biedt geen ondersteuning voor SQLite3, download
 invalid_db_setting=Uw database instellingen zijn niet correct: %v
 invalid_repo_path=Repositorie basis map is niet correct: %v
 run_user_not_match=De uitvoerende gebruiker is niet de huidig gebruiker: %s -> %s
-smtp_host_missing_port=SMTP Host is missing port in address.
+smtp_host_missing_port=SMTP-Host mist een poort in het adres.
 invalid_smtp_from=SMTP-van-veld is niet geldig: %v
 save_config_failed=Kan de configuratie niet opslaan: %v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=Uw admin-instellingen zijn niet geldig: %v
 install_success=Welkom! Wij zijn veheugd dat u voor Gogs heeft gekozen, veel plezier en tot ziens
 invalid_log_root_path=Ongeldig log-pad: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Heeft u al een account? Meld u nu aan!
 social_register_hepler_msg=Heeft u al een account? Koppel nu!
 disable_register_prompt=Sorry, registratie is uitgeschakeld. Neem contact op met de beheerder van deze site.
 disable_register_mail=Sorry, bevestiging van registratie per e-mail is uitgeschakeld.
+auth_source=Authenticatiebron
+local=Lokaal
 remember_me=Onthoud mij
 forgot_password=Wachtwoord vergeten
 forget_password=Wachtwoord vergeten?
@@ -171,11 +177,11 @@ non_local_account=Niet lokale accounts mogen hun wachtwoord niet veranderen via
 
 login_two_factor=Twee-traps authenticatie
 login_two_factor_passcode=Authenticatie wachtwoord
-login_two_factor_enter_recovery_code=Enter a two-factor recovery code
-login_two_factor_recovery=Two-factor Recovery
-login_two_factor_recovery_code=Recovery Code
-login_two_factor_enter_passcode=Enter a two-factor passcode
-login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+login_two_factor_enter_recovery_code=Voer de two-factor herstelcode in
+login_two_factor_recovery=Two-factor herstel
+login_two_factor_recovery_code=Herstel code
+login_two_factor_enter_passcode=Voer een two-factor wachtwoord in
+login_two_factor_invalid_recovery_code=Recovery code already used or invalid.
 
 [mail]
 activate_account=Activeer uw account
@@ -212,7 +218,7 @@ Content=Inhoud
 require_error=kan niet leeg zijn.
 alpha_dash_error=moet een valide alfanumeriek of dash(-_) karakter zijn.
 alpha_dash_dot_error=moet een valide alfanumeriek, dash(-_) of (.) punt karakter zijn.
-alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
+alpha_dash_dot_slash_error=` must be alphanumeric, dash (-_), dot or slash characters.`
 size_error=moet groter zijn dan %s
 min_size_error=moet minimaal %s karakters bevatten.
 max_size_error=mag maximaal %s karakters bevatten.
@@ -229,6 +235,7 @@ org_name_been_taken=Organisatie naam is al in gebruik.
 team_name_been_taken=Team naam is al in gebruik.
 email_been_used=e-mailadres is al in gebruik.
 username_password_incorrect=Gebruikersnaam of wachtwoord is niet correct.
+auth_source_mismatch=The authentication source selected is not associated with the user.
 enterred_invalid_repo_name=U heeft een onjuiste repositorie naam ingevoerd.
 enterred_invalid_owner_name=U heeft een onjuiste eigenaar ingevoerd.
 enterred_invalid_password=U heeft een onjuiste wachtwoord ingevoerd.
@@ -256,8 +263,7 @@ following=Volgt
 follow=Volg
 unfollow=Niet meer volgen
 
-form.name_reserved=De gebruikersnaam '%s' is gereserveerd.
-form.name_pattern_not_allowed=Het gebruikersnaam patroon '%s' is niet toegestaan.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profiel
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Or enter the secret:
 two_factor_then_enter_passcode=Then enter passcode:
 two_factor_verify=Verifiëren
 two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_reused_passcode=The passcode you entered has already been used, please try another one!
 two_factor_enable_error=Enable Two-factor authentication failed: %v
 two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
 two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
@@ -370,6 +377,7 @@ delete_token=Verwijderen
 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.
+token_name_exists=Token with same name already exists.
 
 orgs.none=U bent geen lid van een organisatie.
 orgs.leave_title=Een organisatie verlaten
@@ -417,10 +425,11 @@ mirror_last_synced=Laatste synchronisatie
 watchers=Volgers
 stargazers=Stargazers
 forks=Forks
+repo_description_helper=Description of repository. Maximum 512 characters length.
+repo_description_length=Available characters
 
 form.reach_limit_of_creation=De eigenaar heeft maximale creatie limiet van %d repositories bereikt.
-form.name_reserved=Repositorienaam '%s' is gereserveerd.
-form.name_pattern_not_allowed=Repositorie naampatroon '%s' is niet toegestaan.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Autorisatie vereist
 migrate_type=Migratie type
@@ -450,7 +459,7 @@ quick_guide=Snelstart gids
 clone_this_repo=Kloon deze repositorie
 create_new_repo_command=Maak een nieuwe repositorie aan vanaf de console
 push_exist_repo=Push een bestaande repositorie vanaf de console
-bare_message=This repository does not have any content yet.
+bare_message=Deze repository bevat nog geen inhoud.
 
 files=Bestanden
 branch=Aftakking
@@ -458,7 +467,7 @@ tree=Boom
 filter_branch_and_tag=Filter branch of tag
 branches=Aftakkingen
 tags=Labels
-issues=Kwesties
+issues=Issues
 pulls=Pull-aanvragen
 labels=Labels
 milestones=Mijlpalen
@@ -488,10 +497,10 @@ editor.edit_this_file=Bestand aanpassen
 editor.must_be_on_a_branch=Je moet in een branch zijn om aanpassingen te maken of voor te stellen
 editor.fork_before_edit=Je moet deze repository eerst vorken om dit bestand aan te kunnen passen
 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.must_have_write_access=U moet schrijftoegang hebben om aanpassingen te maken of voor te stellen in dit bestand
 editor.file_delete_success=Bestand '%s' is succesvol verwijderd!
 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.filename_help=Om een map toe te voegen, begin met typen en druk op /. Om een map te verwijderen, ga naar het begin van het veld en druk op backspace.
 editor.or=of
 editor.cancel_lower=annuleren
 editor.commit_changes=Wijzigingen toepassen
@@ -499,7 +508,7 @@ 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_message_desc=Voeg een optionele beschrijving toe...
 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=Naam nieuwe aftakking...
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=File content has been changed since you starte
 editor.file_already_exists=A file with name '%s' already exists in this repository.
 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.fail_to_delete_file=Failed to delete file '%s' with error: %v
 editor.add_subdir=Submap toevoegen...
 editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
 editor.upload_files_to_dir=Bestanden uploaden naar '%s'
@@ -558,7 +568,7 @@ issues.filter_milestone_no_select=Geen geselecteerde mijlpaal
 issues.filter_assignee=Aangewezene
 issues.filter_assginee_no_select=Geen geselecteerde verantwoordelijke
 issues.filter_type=Type
-issues.filter_type.all_issues=Alle kwesties
+issues.filter_type.all_issues=Alle issues
 issues.filter_type.assigned_to_you=Aan jou toegewezen
 issues.filter_type.created_by_you=Aangemaakt door jou
 issues.filter_type.mentioning_you=Vermelden jou
@@ -634,6 +644,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.create_merge_commit=Create a merge commit
 pulls.rebase_before_merging=Rebase before merging
+pulls.commit_description=Commit Description
 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=Aftakking verwijderen
@@ -727,18 +738,18 @@ settings.allow_public_wiki_desc=Allow public access to wiki when repository is p
 settings.use_external_wiki=Externe wiki gebruiken
 settings.external_wiki_url=Externe wiki-URL
 settings.external_wiki_url_desc=Bezoekers worden doorgestuurd naar de URL als ze op het tabblad klikken.
-settings.issues_desc=Kwestietracker inschakelen
-settings.use_internal_issue_tracker=Gebruik ingebouwde eenvoudige kwestietracker
+settings.issues_desc=Issuetracker inschakelen
+settings.use_internal_issue_tracker=Gebruik ingebouwde eenvoudige issuetracker
 settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Externe issuetracker gebruiken
-settings.external_tracker_url=URL externe kwestietracker
+settings.external_tracker_url=URL externe issuetracker
 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=Naamgevingstijl externe kwestietracker:
+settings.tracker_issue_style=Naamgevingstijl externe issuetracker:
 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.pulls_desc=Enable pull requests to accept contributions between repositories and branches
 settings.pulls.ignore_whitespace=Ignore changes in whitespace
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Gevaren zone
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=De repository met wiki data is succesvol gewist.
 settings.delete=Verwijder deze repositorie
 settings.delete_desc=Als u eenmaal een repositorie verwijderd is er geen weg terug. Gelieve zeker te zijn van uw acties.
 settings.delete_notices_1=- Deze bewerking kan <strong>NIET</strong> ongedaan gemaakt worden.
-settings.delete_notices_2=- Deze bewerking verwijdert permanent alle informatie van deze repository met inbegrip van Git gegevens, tickets, opmerkingen en de toegang van medewerkers.
+settings.delete_notices_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
 settings.delete_notices_fork_1=- All forks will become independent after deletion.
 settings.deletion_success=Repository is succesvol verwijderd!
 settings.update_settings_success=Repositorie instellingen zijn succesvol bijgewerkt.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Webhook toevoegen
 settings.webhook_deletion=Webhook verwijderen
 settings.webhook_deletion_desc=Verwijderen van deze webhook zal de informatie en alle geschiedenis verwijderen. Wilt u doorgaan?
 settings.webhook_deletion_success=Webhook is succesvol verwijderd!
@@ -792,6 +805,8 @@ settings.webhook.response=Antwoord
 settings.webhook.headers=Headers
 settings.webhook.payload=Lading
 settings.webhook.body=Inhoud
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git haken worden aangedreven door Git zelf, u kunt bestanden van ondersteunde haken in de lijst hieronder om aangepaste acties van toepassing bewerken.
 settings.githook_edit_desc=Als haak niet actief is, zal monster inhoud worden gepresenteerd. Verlof inhoud leeg zal deze haak uitschakelen.
 settings.githook_name=Haak naam
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push naar een repository
 settings.event_issues=Issues
 settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment=Issue Comment
-settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_pull_request=Pull request
 settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_release=Release
 settings.event_release_desc=Release published in a repository.
 settings.active=Actief
@@ -852,6 +867,8 @@ settings.add_key_success=Nieuwe deploy sleutel '%s' werd succesvol toegevoegd!
 settings.deploy_key_deletion=Verwijder deploy sleutel
 settings.deploy_key_deletion_desc=Het verwijderen van deze deploy sleutel zal alle gerelateerde toegang verwijderen voor deze repositorie. Wilt u doorgaan?
 settings.deploy_key_deletion_success=Deploy sleutel werd met succes verwijderd!
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=Bladeren bron
 diff.parent=bovenliggende
@@ -916,9 +933,8 @@ team_name_helper=U gebruikt deze naam om dit team te vermelden in conversaties.
 team_desc_helper=Waar gaat dit team doen?
 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.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Instellingen
 settings.options=Opties
@@ -990,12 +1006,19 @@ first_page=Eerste
 last_page=Laatste
 total=Totaal: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Statistieken
 dashboard.operations=Bewerkingen
 dashboard.system_status=Status Systeemmonitor
 dashboard.statistic_info=Gogs database heeft <b>%d</b> gebruikers, <b>%d</b> organisaties, <b>%d</b> openbare sleutels, <b>%d</b> repositories, <b>%d</b> volgers, <b>%d</b> sterren, <b>%d</b> acties, <b>%d</b> participanten, <b>%d</b> issues, <b>%d</b> reacties, <b>%d</b> sociale accounten, <b>%d</b> volgers, <b>%d</b> mirrors, <b>%d</b> publicaties, <b>%d</b> login bronnen, <b>%d</b> webhooks, <b>%d</b> mijlpalen, <b>%d</b> labels, <b>%d</b> hook taken, <b>%d</b> teams, <b>%d</b> bijgewerkte taken, <b>%d</b> bijlagen.
 dashboard.operation_name=Bewerking naam
 dashboard.operation_switch=Omschakelen
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Uitvoeren
 dashboard.clean_unbind_oauth=Clean unbound OAuths
 dashboard.clean_unbind_oauth_success=Alle OAuthes binding hebben verwijderd.
@@ -1070,7 +1093,7 @@ users.allow_import_local=Dit account mag lokale repositories importeren
 users.update_profile=Account profiel bijwerken
 users.delete_account=Dit account verwijderen
 users.still_own_repo=Dit account is nog steeds eigendom van een repositorie. U moet deze repositorie eerst verwijderen of overdragen.
-users.still_has_org=Deze account nog steeds lidmaatschap van organisatie, u hebt naar links of hen eerst verwijderen.
+users.still_has_org=Dit account is nog lid van ten minste één organisatie. Zeg dit lidmaatschap voor dit account op of verwijder de organisatie eerst.
 users.deletion_success=Het account is verwijderd!
 
 orgs.org_manage_panel=Organisaties beheren
@@ -1084,14 +1107,15 @@ repos.name=Naam
 repos.private=Prive
 repos.watches=Volgers
 repos.stars=Sterren
-repos.issues=Kwesties
+repos.issues=Issues
 repos.size=Size
 
-auths.auth_manage_panel=Authenticatie-beheer paneel
+auths.auth_sources=Authenticatiebronnen
 auths.new=Nieuwe bron toevoegen
 auths.name=Naam
 auths.type=Type
 auths.enabled=Ingeschakeld
+auths.default=Default
 auths.updated=Bijgewerkt
 auths.auth_type=Authenticatietype
 auths.auth_name=Authenticatienaam
@@ -1128,9 +1152,9 @@ auths.enable_tls=Activeer TLS-encryptie
 auths.skip_tls_verify=TLS-verificatie overslaan
 auths.pam_service_name=PAM servicenaam
 auths.enable_auto_register=Activeer automatische registratie
-auths.tips=Tips
 auths.edit=Verificatie-instelling bewerken
 auths.activated=Deze autorisatiemethode is geactiveerd
+auths.default_auth=Deze authenticatie bron is de standaard bron
 auths.new_success=Nieuwe authenticatie '%s' werd toegevoegd.
 auths.update_success=Authenticatie instellingen zijn succesvol gewijzigd.
 auths.update=Authenticatie-instellingen bijwerken
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Deze authenticatie zal verwijderd worden, wil je verderga
 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=Authenticatie is met succes verwijderd!
 auths.login_source_exist=Login source '%s' already exists.
+auths.github_api_endpoint=API Endpoint
 
 config.not_set=(not set)
 config.server_config=Serverconfiguratie
-config.app_name=Applicatienaam
-config.app_ver=Applicatieversie
-config.app_url=Applicatie-URL
-config.domain=Domein
-config.offline_mode=Offline-modus
-config.disable_router_log=Router-log uitschakelen
+config.brand_name=Brand name
 config.run_user=Uitvoerende gebruiker
 config.run_mode=Uitvoer modus
-config.git_version=Gitversie
-config.static_file_root_path=Statische bestanden basis pad
-config.log_file_root_path=Log bestand basis pad
-config.reverse_auth_user=Omgekeerde verificatie gebruiker
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH-configuratie
-config.ssh_enabled=Ingeschakeld
-config.ssh_start_builtin_server=Ingebouwde server starten
-config.ssh_domain=Domein
-config.ssh_port=Poort
-config.ssh_listen_port=Luister op poort
-config.ssh_root_path=Root-pad
-config.ssh_key_test_path=Pad voor key-tests
-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.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
-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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo_config=Repository configuration
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Databaseconfiguratie
-config.db_type=Type
-config.db_host=Host
-config.db_name=Naam
-config.db_user=Gebruiker
-config.db_ssl_mode=SSL modus
-config.db_ssl_mode_helper=(alleen voor "postgres")
-config.db_path=Pad
-config.db_path_helper=(voor "sqlite3" en "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Serviceconfiguratie
-config.register_email_confirm=E-mailbevestiging registreren
-config.disable_register=Registratie uitgeschakeld
-config.show_registration_button=Registeren knop weergeven
-config.require_sign_in_view=Inloggen vereist om te kunnen inzien
-config.mail_notify=E-mailnotificaties
-config.disable_key_size_check=Controle op key-lengte uitschakelen
-config.enable_captcha=CAPTCHA inschakelen
-config.active_code_lives=Actieve Code leven
-config.reset_password_code_lives=Reset wachtwoord Code leven
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Webhook configuratie
-config.queue_length=Lengte van wachtrij
-config.deliver_timeout=Bezorging verlooptijd
-config.skip_tls_verify=TLS certificaat controle overslaan
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Mailerconfiguatie
-config.mailer_enabled=Ingeschakeld
-config.mailer_disable_helo=Schakel HELO uit
-config.mailer_name=Naam
-config.mailer_host=Host
-config.mailer_user=Gebruiker
-config.send_test_mail=Testbericht verzenden
-config.test_mail_failed=Verzending van een testmail naar '%s' is mislukt: %v
-config.test_mail_sent=Test-email is verstuurd naar '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth-configuratie
-config.oauth_enabled=Ingeschakeld
-
-config.cache_config=Cache-configuratie
-config.cache_adapter=Cache-adapter
-config.cache_interval=Cache-interval
-config.cache_conn=Cache-connectie
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Sessieconfiguratie
-config.session_provider=Sessieprovider
-config.provider_config=Provider config
-config.cookie_name=Cookie naam
-config.enable_set_cookie=Set Cookie inschakelen
-config.gc_interval_time=GC interval time
-config.session_life_time=Sessie duur
-config.https_only=Alleen HTTPS
-config.cookie_life_time=Cookie duur leeftijd
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Cache-configuratie
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP configuration
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Foto configuratie
-config.picture_service=Foto service
-config.disable_gravatar=Gravatar uitschakelen
-config.enable_federated_avatar=Federated Avatars toestaan
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Webhook configuratie
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 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)
-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.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Logconfiguratie
+config.log_file_root_path=Log bestand basis pad
 config.log_mode=Mode
 config.log_options=Options
 
@@ -1283,14 +1368,13 @@ notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=repositorie aangemaakt in <a href="%s">%s</a>
-fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=hernoemde repository van <code>%[1]s</code> naar <a href="%[2]s">%[3]s</a>
 commit_repo=push update naar <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a>
 compare_commits=Toon vergelijking voor deze %d commits
 transfer_repo=repositorie verplaatst naar <code>%s</code> naar <a href="%s">%s</a>
 create_issue=`opende issue in <a href="%s/issues/%s">%s#%[2]s</a>`
-close_issue=`sloot kwestie <a href="%s/issues/%s">%s#%[2]s</a>`
-reopen_issue=`heropende kwestie <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`gesloten issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`heropende issue <a href="%s/issues/%s">%s#%[2]s</a>`
 comment_issue=`reactie op issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`maakte pull request <a href="%s/issues/%s">%s#%[2]s</a>`
 close_pull_request=`sloot pull request <a href="%s/issues/%s">%s#%[2]s</a>`
@@ -1300,6 +1384,10 @@ create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href=
 delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=geduwd label <a href="%s/src/%s"> %[2]s</a> naar <a href="%[1]s"> %[3]s</a>
 delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=geleden
@@ -1321,6 +1409,7 @@ months=%d maanden %s
 years=%d jaren %s
 raw_seconds=seconden
 raw_minutes=minuten
+raw_hours=hours
 
 [dropzone]
 default_message=Drop bestanden hier of klik om te uploaden.

conf/locale/locale_pl-PL.ini

@@ -9,7 +9,6 @@ sign_out=Wyloguj
 sign_up=Zarejestruj się
 register=Zarejestruj się
 website=Strona
-version=Wersja
 page=Strona
 template=Szablon
 language=Język
@@ -40,10 +39,14 @@ your_settings=Twoje ustawienia
 
 activities=Aktywności
 pull_requests=Oczekujące zmiany
-issues=Zagadnienia
+issues=Problemy
 
 cancel=Anuluj
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Instalacja
 title=Kroki instalacyjne dla pierwszego uruchomienia
@@ -122,6 +125,7 @@ run_user_not_match=Użytkownik aplikacji nie jest aktualnym użytkownikiem: %s -
 smtp_host_missing_port=W SMTP Host brakuje portu w adresie.
 invalid_smtp_from=Pole SMTP OD nie jest prawidłowe: %v
 save_config_failed=Nie udało się zapisać konfiguracji: %v
+init_failed=Nie udało się zainicjować aplikacji: %v
 invalid_admin_setting=Nieprawidłowe ustawienia konta admina: %v
 install_success=Cześć! Cieszymy się, że wybierałeś Gogs, baw się dobrze.
 invalid_log_root_path=Ścieżka dla logów jest niepoprawna: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Masz już konto? Zaloguj się teraz!
 social_register_hepler_msg=Masz już konto? Powiąż je teraz!
 disable_register_prompt=Przepraszamy rejestracja została wyłączona. Prosimy o kontakt z administratorem serwisu.
 disable_register_mail=Przepraszamy, potwierdzenia rejestracji zostały wyłączone przez administratora.
+auth_source=Źródło uwierzytelniania
+local=Lokalne
 remember_me=Zapamiętaj mnie
 forgot_password=Zapomniałem hasła
 forget_password=Zapomniałeś hasła?
@@ -229,6 +235,7 @@ org_name_been_taken=Nazwa organizacji jest już zajęta.
 team_name_been_taken=Nazwa zespołu jest już zajęta.
 email_been_used=Adres e-mail jest już zarejestrowany.
 username_password_incorrect=Nazwa użytkownika lub hasło nie jest prawidłowe.
+auth_source_mismatch=Wybrane źródło uwierzytelniania nie jest związane z użytkownikiem.
 enterred_invalid_repo_name=Upewnij się, że wprowadzona nazwa repozytorium jest poprawna.
 enterred_invalid_owner_name=Upewnij się, że nazwa właściciela repozytorium jest poprawna.
 enterred_invalid_password=Proszę upewnij się, że wprowadzono hasło jest poprawne.
@@ -256,8 +263,7 @@ following=Obserwowani
 follow=Obserwuj
 unfollow=Przestań obserwować
 
-form.name_reserved=Nazwa użytkownika „%s” jest zarezerwowana.
-form.name_pattern_not_allowed=Wzorzec nazwy użytkownika „%s” jest niedozwolony.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profil
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Lub wprowadź sekret:
 two_factor_then_enter_passcode=Następnie wprowadź kod dostępu:
 two_factor_verify=Weryfikuj
 two_factor_invalid_passcode=Wprowadzony kod nie jest prawidłowy, spróbuj ponownie!
+two_factor_reused_passcode=Ten kod jest już używany, spróbuj ponownie!
 two_factor_enable_error=Włączenie dwuetapowego uwierzytelniania nie powiodło się: %v
 two_factor_enable_success=Uwierzytelnianie dwuetapowe Twojego konta zostało włączone pomyślnie!
 two_factor_recovery_codes_title=Kody odzyskiwania uwierzytelniania dwuetapowego
@@ -370,6 +377,7 @@ delete_token=Usuń
 access_token_deletion=Usuwanie osobistego tokena dostępu
 access_token_deletion_desc=Usunięcie tego tokena osobistego dostęp spowoduje usunięcie wszystkich powiązanych dostępów do aplikacji. Czy chcesz kontynuować?
 delete_token_success=Osobisty token dostępu został usunięty pomyślnie! Nie zapomnij również zaktualizować swoich aplikacji.
+token_name_exists=Token o takiej nawie już istniej.
 
 orgs.none=Nie jesteś członkiem żadnej organizacji.
 orgs.leave_title=Opuść organizację
@@ -417,10 +425,11 @@ mirror_last_synced=Ostatnia synchronizacja
 watchers=Obserwujący
 stargazers=Polubienia
 forks=Forki
+repo_description_helper=Opis repozytorium. Maksymalnie 512 znaków.
+repo_description_length=Dostępne znaki
 
 form.reach_limit_of_creation=Właściciel osiągnął limit maksymalnej ilości repozytoriów %d.
-form.name_reserved=Nazwa repozytorium „%s” jest zarezerwowana.
-form.name_pattern_not_allowed=Wzorzec nazwy repozytorium „%s” jest niedozwolony.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Wymaga autoryzacji
 migrate_type=Typ migracji
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Zawartość pliku została zmieniona od rozpoc
 editor.file_already_exists=Nazwa pliku '%s' już istnieje w tym repozytorium.
 editor.no_changes_to_show=Brak zmian do pokazania.
 editor.fail_to_update_file=Tworzenie/aktualizacja pliku '%s' nie powiodła się z błędem: %v
+editor.fail_to_delete_file=Nie można usunąć pliku '%s' z powodu błędu: %v
 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'
@@ -632,8 +642,9 @@ pulls.is_checking=Sprawdzanie konfliktów jeszcze trwa, proszę odświeżyć str
 pulls.can_auto_merge_desc=Pull request może być automatycznie scalony.
 pulls.cannot_auto_merge_desc=Pull request nie może być automatycznie scalony z powodu konfliktów.
 pulls.cannot_auto_merge_helper=Proszę scalić ręcznie, aby rozwiązać konflikty.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Utwórz scalający commit
+pulls.rebase_before_merging=Rebase przed scaleniem
+pulls.commit_description=Opis commitu
 pulls.merge_pull_request=Scal Pull Request
 pulls.open_unmerged_pull_exists=`Nie można otworzyć ponownie ponieważ już istnieje gotowy do scalenia pull request (#%d) z tego samego repozytorium z tymi samymi informacjami.`
 pulls.delete_branch=Usuń gałąź
@@ -738,9 +749,9 @@ settings.tracker_issue_style=Styl nazw zewnętrznego systemu zgłaszania problem
 settings.tracker_issue_style.numeric=Numeryczny
 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.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Włącz żądania pobierania, aby akceptować wkład pomiędzy repozytoriami i gałęziami
+settings.pulls.ignore_whitespace=Ignoruj zmiany w białych znakach
+settings.pulls.allow_rebase_merge=Zezwalaj na użycie rebase do scalenia commitów
 settings.danger_zone=Strefa niebezpieczeństwa
 settings.cannot_fork_to_same_owner=Nie można sforkować repozytorium do pierwotnego właściciela.
 settings.new_owner_has_same_repo=Nowy właściciel już posiada repozytorium o tej samej nazwie.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Dodaj webhooka
 settings.webhook_deletion=Usuń webhooka
 settings.webhook_deletion_desc=Usunięcie tego webooka spowoduje usunięcie powiązanych informacji i wpisów w historii. Czy chcesz kontynuować?
 settings.webhook_deletion_success=Webhook został pomyślnie usunięty!
@@ -792,6 +805,8 @@ settings.webhook.response=Odpowiedź
 settings.webhook.headers=Nagłówki
 settings.webhook.payload=Zawartość
 settings.webhook.body=Treść
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Hooki Git są obsługiwane bezpośrednio przez Git. Pliki obsługiwanych hooków z poniższej listy mogą być edytowane, aby wykonywać niestandardowe operacje.
 settings.githook_edit_desc=Jeśli hook jest nieaktywny, zaprezentowana zostanie przykładowa treść. Pozostawienie pustej wartości wyłączy ten hook.
 settings.githook_name=Nazwa hooka
@@ -819,10 +834,10 @@ settings.event_push=Wypchnięcie
 settings.event_push_desc=Wypchnięcie (push) do repozytorium Git
 settings.event_issues=Zagadnienia
 settings.event_issues_desc=Zagadnienie otwarte, zamknięte, ponownie otwarte, wyedytowane, przypisane, nieprzypisane, etykieta uaktualniona, etykieta wyczyszczona, kamień milowy, kamień milowy usunięty.
-settings.event_issue_comment=Komentarz zagadnienia
-settings.event_issue_comment_desc=Komentarz zagadnienia utworzony, wyedytowany lub usunięty.
 settings.event_pull_request=Pull Request
 settings.event_pull_request_desc=Pull request otwarty, zamknięty, ponownie otwarty, edytowany, przypisany, nieprzypisany, etykieta zaktualizowana, etykieta wyczyszczona, kamień milowy, kamień milowy wyczyszczony; lub zsynchronizowany.
+settings.event_issue_comment=Komentarz zagadnienia
+settings.event_issue_comment_desc=Komentarz zagadnienia utworzony, wyedytowany lub usunięty.
 settings.event_release=Wydanie
 settings.event_release_desc=Wydanie opublikowane w repozytorium.
 settings.active=Aktywny
@@ -852,6 +867,8 @@ settings.add_key_success=Nowy klucz wdrożenia '%s' został pomyślnie dodany!
 settings.deploy_key_deletion=Utwórz klucz wdrożenia
 settings.deploy_key_deletion_desc=Usunięcie tego klucza wdrożenia spowoduje usunięcie powiązanego dostępu do tego repozytorium. Czy chcesz kontynuować?
 settings.deploy_key_deletion_success=Klucz wdrożenia został pomyślnie usunięty!
+settings.description_desc=Opis repozytorium. Maksymalnie 512 znaków.
+settings.description_length=Dostępne znaki
 
 diff.browse_source=Przeglądaj źródła
 diff.parent=rodzic
@@ -916,9 +933,8 @@ team_name_helper=Będziesz używał tej nazwy do wywoływania tego zespołu w dy
 team_desc_helper=Czym zajmuje się ten zespół?
 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=Nazwa zespołu '%s' jest zarezerwowana.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Ustawienia
 settings.options=Opcje
@@ -990,12 +1006,19 @@ first_page=Pierwsza
 last_page=Ostatnia
 total=Ogółem: %d
 
+dashboard.build_info=Informacje o kompilacji
+dashboard.app_ver=Wersja aplikacji
+dashboard.git_version=Wersja Git
+dashboard.go_version=Wersja Go
+dashboard.build_time=Data kompilacji
+dashboard.build_commit=Build commit
 dashboard.statistic=Statystyki
 dashboard.operations=Operacje
 dashboard.system_status=Stan monitora systemu
 dashboard.statistic_info=Baza danych Gogs zawiera <b>%d</b> użytkowników, <b>%d</b> organizacji, <b>%d</b> kluczy publicznych, <b>%d</b> repozytoriów, <b>%d</b> obserwujących, <b>%d</b> polubionych, <b>%d</b> akcji, <b>%d</b> tokenów, <b>%d</b> problemów, <b>%d</b> komenatrzy, <b>%d</b> kont społecznościowych, <b>%d</b> obserwacji, <b>%d</b> mirrorów, <b>%d</b> wydań, <b>%d</b> login sources, <b>%d</b> webhooków, <b>%d</b> kamieni milowych, <b>%d</b> labels, <b>%d</b> zadań hooków, <b>%d</b> zespołów, <b>%d</b> zadań aktualizacji, <b>%d</b> załączników.
 dashboard.operation_name=Nazwa operacji
 dashboard.operation_switch=Przełącz
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Uruchom
 dashboard.clean_unbind_oauth=Usuń niepowiązane wpisy OAuth
 dashboard.clean_unbind_oauth_success=Wszystkie niepowiązane wpisy OAuth zostały pomyślnie usunięte.
@@ -1087,11 +1110,12 @@ repos.stars=Polubienia
 repos.issues=Problemy
 repos.size=Rozmiar
 
-auths.auth_manage_panel=Panel zarządzania uwierzytelnianiem
+auths.auth_sources=Źródła uwierzytelniania
 auths.new=Dodaj nowe źródło
 auths.name=Nazwa
 auths.type=Typ
 auths.enabled=Włączono
+auths.default=Domyślne
 auths.updated=Zaktualizowano
 auths.auth_type=Typ uwierzytelniania
 auths.auth_name=Nazwa uwierzytelniania
@@ -1100,7 +1124,7 @@ auths.domain=Domena
 auths.host=Host
 auths.port=Port
 auths.bind_dn=Bind DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Możesz użyć '%s' jako symbol zastępczy dla nazwy użytkownika, np. DOM\%s
 auths.bind_password=Hasło Bind
 auths.bind_password_helper=Ostrzeżenie: To hasło jest przechowywane w postaci zwykłego tekstu. Nie należy używać wysoko uprzywilejowanego konta.
 auths.user_base=Baza wyszukiwania
@@ -1128,9 +1152,9 @@ auths.enable_tls=Włącz szyfrowanie TLS
 auths.skip_tls_verify=Pomiń weryfikację protokołu TLS
 auths.pam_service_name=Nazwa usługi PAM
 auths.enable_auto_register=Włącz automatyczną rejestrację
-auths.tips=Wskazówki
 auths.edit=Edytuj ustawienia uwierzytelniania
 auths.activated=To uwierzytelnienie zostało aktywowane
+auths.default_auth=To uwierzytelnianie jest domyślnym źródłem logowania
 auths.new_success=Pomyślnie dodano nowe uwierzytelnianie '%s'.
 auths.update_success=Ustawienia uwierzytelnienia zostały zaktualizowane pomyślnie.
 auths.update=Aktualizuj ustawienia uwierzytelniania
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=To uwierzytelnienie zostanie usunięte, czy chcesz kontyn
 auths.still_in_used=Ten rodzaj autentykacji jest wciąż wykorzystywany przez niektórych użytkowników. Usuń lub przekonwertuj użytkowników, aby wykorzystywali inny typ logowania.
 auths.deletion_success=Uwierzytelnienie zostało usunięte pomyślnie!
 auths.login_source_exist=Login '%s' już istnieje.
+auths.github_api_endpoint=Punkt końcowy API
 
-config.not_set=(not set)
+config.not_set=(nie ustawiono)
 config.server_config=Konfiguracja serwera
-config.app_name=Nazwa aplikacji
-config.app_ver=Wersja aplikacji
-config.app_url=Adres URL aplikacji
-config.domain=Domena
-config.offline_mode=Tryb offline
-config.disable_router_log=Wyłącz dziennik routera
+config.brand_name=Nazwa marki
 config.run_user=Użytkownik uruchomieniowy
 config.run_mode=Tryb uruchamienia
-config.git_version=Wersja Git
-config.static_file_root_path=Ścieżka plików statycznych
-config.log_file_root_path=Ścieżka plików dziennika
-config.reverse_auth_user=Użytkownik dostarczony przez odwrotne proxy
+config.server.external_url=Zewnętrzny URL
+config.server.domain=Domena
+config.server.protocol=Protokół
+config.server.http_addr=Adres HTTP
+config.server.http_port=Port HTTP
+config.server.cert_file=Pliki certyfikatu
+config.server.key_file=Plik klucza
+config.server.tls_min_version=Minimalna wersja TLS
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Tryb offline
+config.server.disable_router_log=Wyłącz dziennik routera
+config.server.enable_gzip=Włącz Gzip
+config.server.app_data_path=Ścieżka danych aplikacji
+config.server.load_assets_from_disk=Wczytaj zasoby z dysku
+config.server.landing_url=Landing URL
 
 config.ssh_config=Konfiguracja SSH
-config.ssh_enabled=Aktywne
-config.ssh_start_builtin_server=Uruchom serwer wbudowany
-config.ssh_domain=Domena
-config.ssh_port=Port
-config.ssh_listen_port=Port nasłuchu
-config.ssh_root_path=Ścieżka katalogu głównego
-config.ssh_key_test_path=Ścieżka klucza testowego
-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.ssh.enabled=Aktywne
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Uruchom wbudowany serwer
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Port nasłuchu
+config.ssh.server_ciphers=Server ciphers
 
 config.repo_config=Konfiguracja repozytorium
-config.repo_root_path=Ścieżka repozytoriów
-config.script_type=Typ skryptu
-config.repo_force_private=Forsuj tryb prywatny
-config.max_creation_limit=Maksymalny limit utworzeń
-config.preferred_licenses=Preferowane licencje
-config.disable_http_git=Wyłącz HTTP Git
-config.enable_local_path_migration=Włącz lokalną ścieżkę migracji
-config.commits_fetch_concurrency=Pobieraj zmiany w trybie równoległym
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Ścieżka katalogu głównego
+config.repo.script_type=Typ skryptu
+config.repo.ansi_chatset=Zestaw znaków ANSI
+config.repo.force_private=Wymuś tryb prywatny
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Wybrana licencja
+config.repo.disable_http_git=Wyłącz Git przez HTTP
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Konfiguracja bazy danych
-config.db_type=Typ
-config.db_host=Host
-config.db_name=Nazwa
-config.db_user=Użytkownik
-config.db_ssl_mode=Tryb SSL
-config.db_ssl_mode_helper=(tylko dla „postgres”)
-config.db_path=Ścieżka
-config.db_path_helper=(dla „sqlite3” i „tidb”)
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Konfiguracja usługi
-config.register_email_confirm=Wymagaj potwierdzenia e-mail
-config.disable_register=Wyłącz rejestrację
-config.show_registration_button=Pokazuj przycisk rejestracji
-config.require_sign_in_view=Wymagaj bycia zalogowanym
-config.mail_notify=Powiadomienia e-mail
-config.disable_key_size_check=Wyłącz sprawdzanie minimalnego rozmiaru klucza
-config.enable_captcha=Włącz Captcha
-config.active_code_lives=Ważność kodów aktywacyjnych
-config.reset_password_code_lives=Czas życia kodu resetowania hasła
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Konfiguracja webhooka
-config.queue_length=Długość kolejki
-config.deliver_timeout=Limit czasu zdarzenia
-config.skip_tls_verify=Pomiń weryfikację protokołu TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Konfiguracja poczty
-config.mailer_enabled=Aktywne
-config.mailer_disable_helo=Wyłącz HELO
-config.mailer_name=Nazwa
-config.mailer_host=Host
-config.mailer_user=Użytkownik
-config.send_test_mail=Wyślij email testowy
-config.test_mail_failed=Nieudane wysłanie wiadomości email do '%s': %v
-config.test_mail_sent=Testowa wiadomość email została wysłana do '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Konfiguracja OAuth
-config.oauth_enabled=Aktywne
-
-config.cache_config=Konfiguracja cache
-config.cache_adapter=Adapter cache
-config.cache_interval=Interwał pamięci podręcznej
-config.cache_conn=Połączenie z pamięcią podręczną
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Konfiguracja sesji
-config.session_provider=Dostawca sesji
-config.provider_config=Konfiguracja dostawcy
-config.cookie_name=Nazwa ciasteczka
-config.enable_set_cookie=Włącz ciasteczka
-config.gc_interval_time=Interwał odśmiecania
-config.session_life_time=Czas życia sesji
-config.https_only=Tylko HTTPS
-config.cookie_life_time=Czas życia ciasteczka
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Konfiguracja cache
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=Konfiguracja HTTP
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Ustawienia obrazów
-config.picture_service=Serwis obrazów
-config.disable_gravatar=Wyłącz Gravatara
-config.enable_federated_avatar=Włącz zewnętrzne avatary
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Konfiguracja webhooka
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Konfiguracja Git
-config.git_disable_diff_highlight=Wyłączyć wyróżnianie składni diff
-config.git_max_diff_lines=Maksymalna ilość linii diff (dla pojedynczego pliku)
-config.git_max_diff_line_characters=Maksymalna ilość znaków diff (dla pojedynczego pliku)
-config.git_max_diff_files=Maksymalna ilość plików diff (które zostaną wyświetlone)
-config.git_gc_args=Argumenty GC
-config.git_migrate_timeout=Limit czasu migracji
-config.git_mirror_timeout=Limit czasu aktualizacji kopii lustrzanej
-config.git_clone_timeout=Limit czasu operacji klonowania
-config.git_pull_timeout=Limit czasu dla operacji pull
-config.git_gc_timeout=Limit czasu odśmiecania pamięci
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Konfiguracja dziennika
+config.log_file_root_path=Ścieżka plików dziennika
 config.log_mode=Tryb
 config.log_options=Ustawienia
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Powiadomienia systemowe zostały pomyślnie usunięte.
 
 [action]
 create_repo=tworzy repozytorium <a href="%s">%s</a>
-fork_repo=rozwidlone repozytorium do <a href="%s"> %s</a>
 rename_repo=zmienia nazwę repozytorium <code>%[1]s</code> na <a href="%[2]s">%[3]s</a>
 commit_repo=wypycha do <a href="%[1]s/src/%[2]s">%[3]s</a> w <a href="%[1]s">%[4]s</a>
 compare_commits=Zobacz porównanie tych %d commitów
@@ -1300,6 +1384,10 @@ create_branch=stworzył nową gałąź <a href="%[1]s/src/%[2]s">%[3]s</a> at <a
 delete_branch=usunął gałąź <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=taguje <a href="%s/src/%s">%[2]s</a> w <a href="%[1]s">%[3]s</a>
 delete_tag=usunięty tag <code>%[2]s</code> % <a href="%[1]s">[3]s</a>
+fork_repo=rozwidlone repozytorium do <a href="%s"> %s</a>
+mirror_sync_push=zsynchronizowano commit z <a href="%[1]s/src/%[2]s">%[3]s</a> na <a href="%[1]s">%[4]s</a> z kopii lustrzanej
+mirror_sync_create=zsynchronizowano nowy odnośnik <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> z mirrora
+mirror_sync_delete=zsynchronizowano i usunięto odnośnik <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> z mirrora
 
 [tool]
 ago=temu
@@ -1321,6 +1409,7 @@ months=%d miesięcy %s
 years=%d lat %s
 raw_seconds=sekund
 raw_minutes=minut
+raw_hours=hours
 
 [dropzone]
 default_message=Upuść pliki tutaj lub kliknij, aby przesłać.

conf/locale/locale_pt-BR.ini

@@ -9,7 +9,6 @@ sign_out=Sair
 sign_up=Cadastrar
 register=Registrar
 website=Site
-version=Versão
 page=Página
 template=Modelo
 language=Idioma
@@ -44,6 +43,10 @@ issues=Problemas
 
 cancel=Cancelar
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Instalação
 title=Etapas de instalação para primeira execução
@@ -122,6 +125,7 @@ run_user_not_match=O usuário da execução não é o usuário atual: %s -> %s
 smtp_host_missing_port=O endereço do host SMTP não possui porta.
 invalid_smtp_from=O SMTP do campo não é válido: %v
 save_config_failed=Falha ao salvar a configuração: %v
+init_failed=Failed to initialize application: %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.
 invalid_log_root_path=Pasta raíz do log é inválida: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Já tem uma conta? Entre agora!
 social_register_hepler_msg=Já tem uma conta? Junte-se agora!
 disable_register_prompt=Desculpe, novos registros estão desabilitados. Por favor entre em contato com o administrador do site.
 disable_register_mail=Desculpe, a confirmação de registro por e-mail foi desabilitada.
+auth_source=Authentication Source
+local=Local
 remember_me=Lembrar de mim
 forgot_password=Esqueci a senha
 forget_password=Esqueceu a senha?
@@ -229,6 +235,7 @@ org_name_been_taken=Nome da organização já foi tomado.
 team_name_been_taken=Nome da equipe já existe.
 email_been_used=Endereço de e-mail já foi usado.
 username_password_incorrect=Usuário ou senha incorretos.
+auth_source_mismatch=The authentication source selected is not associated with the user.
 enterred_invalid_repo_name=Por favor certifique-se que informou o nome do repositório corretamente.
 enterred_invalid_owner_name=Por favor, verifique se o nome do proprietário está correto.
 enterred_invalid_password=Por favor, verifique se a senha que você digitou está correta.
@@ -256,8 +263,7 @@ following=Seguindo
 follow=Seguir
 unfollow=Deixar de seguir
 
-form.name_reserved=O nome de usuário '%s' não pode ser usado.
-form.name_pattern_not_allowed=Não é permitido usar o padrão '%s' para o nome de usuário.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Perfil
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Ou informe o segredo:
 two_factor_then_enter_passcode=Em seguida digite a senha:
 two_factor_verify=Verificar
 two_factor_invalid_passcode=A senha inserida é inválida. Tente novamente!
+two_factor_reused_passcode=The passcode you entered has already been used, please try another one!
 two_factor_enable_error=Falha ao ativar a autenticação de dois fatores: %v
 two_factor_enable_success=A autenticação de dois fatores foi ativada para a sua conta com sucesso!
 two_factor_recovery_codes_title=Códigos de recup. p/ autenticação de dois fatores
@@ -370,6 +377,7 @@ delete_token=Excluir
 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.
+token_name_exists=Token with same name already exists.
 
 orgs.none=Você não é participante de nenhuma organização.
 orgs.leave_title=Deixar uma organização
@@ -417,10 +425,11 @@ mirror_last_synced=Última sincronização
 watchers=Observadores
 stargazers=Usuários que estrelaram
 forks=Forks
+repo_description_helper=Description of repository. Maximum 512 characters length.
+repo_description_length=Available characters
 
 form.reach_limit_of_creation=O proprietário atingiu o limite máximo de criação de repositórios de %d.
-form.name_reserved=O nome de repositório '%s' não pode ser usado.
-form.name_pattern_not_allowed=Não é permitido usar o padrão '%s' para o nome de repositório.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Precisa de autorização
 migrate_type=Tipo de migração
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=O conteúdo do arquivo mudou desde que você c
 editor.file_already_exists=Um arquivo com nome '%s' já existe neste repositório.
 editor.no_changes_to_show=Nenhuma alteração a mostrar.
 editor.fail_to_update_file=Houve erro ao criar ou atualizar arquivo '%s': %v
+editor.fail_to_delete_file=Failed to delete file '%s' with error: %v
 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'
@@ -632,8 +642,9 @@ pulls.is_checking=A verificação do conflito ainda está em progresso, por favo
 pulls.can_auto_merge_desc=O merge deste Pull Pequest pode ser aplicado automaticamente.
 pulls.cannot_auto_merge_desc=O merge deste Pull Request não pode ser aplicado automaticamente pois há conflitos.
 pulls.cannot_auto_merge_helper=Por favor, aplique o merge manualmente para resolver os conflitos.
-pulls.create_merge_commit=Create a merge commit
+pulls.create_merge_commit=Criar commit de um merge
 pulls.rebase_before_merging=Rebase before merging
+pulls.commit_description=Commit Description
 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=Excluir Branch
@@ -738,9 +749,9 @@ settings.tracker_issue_style=Estilo de nome de issue tracker externo:
 settings.tracker_issue_style.numeric=Numérico
 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.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Enable pull requests to accept contributions between repositories and branches
+settings.pulls.ignore_whitespace=Ignorar alterações em espaço em branco
+settings.pulls.allow_rebase_merge=Permitir rebase para commits via merge
 settings.danger_zone=Zona de perigo
 settings.cannot_fork_to_same_owner=Não se pode realizar fork de um repositório para seu dono original.
 settings.new_owner_has_same_repo=O novo dono já tem um repositório com o mesmo nome. Por favor, escolha outro nome.
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Dados de wiki do repositório foram deletados com
 settings.delete=Deletar este repositório
 settings.delete_desc=Uma vez que você remova um repositório, não tem volta. Por favor, tenha certeza.
 settings.delete_notices_1=-Esta operação <strong>NÃO PODERÁ</strong> ser desfeita.
-settings.delete_notices_2=- Esta operação irá apagar permanentemente o tudo deste repositório, incluindo os dados do Git, Issues, comentários e acessos dos colaboradores.
+settings.delete_notices_2=- Esta operação irá apagar permanentemente tudo neste repositório, incluindo commits, issues, comentários, o wiki e colaboradores.
 settings.delete_notices_fork_1=-Todos os forks se tornarão independentes após a exclusão.
 settings.deletion_success=Repositório excluído com sucesso!
 settings.update_settings_success=As opções do repositório foram atualizadas com sucesso.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Adicionar Webhook
 settings.webhook_deletion=Deletar Webhook
 settings.webhook_deletion_desc=Deletar este Webhook vai remover sua informação e todo o histórico de entrega. Deseja continuar?
 settings.webhook_deletion_success=Webhook deletado com sucesso!
@@ -792,6 +805,8 @@ settings.webhook.response=Resposta
 settings.webhook.headers=Cabeçalhos
 settings.webhook.payload=Payload
 settings.webhook.body=Corpo
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Hooks do Git são ofertados pelo próprio Git, você pode editar arquivos de hooks suportados na lista abaixo para aplicar operações personalizadas.
 settings.githook_edit_desc=Se o hook não estiver ativo, o conteúdo de exemplo será apresentado. Deixar o conteúdo em branco irá desativar esse hook.
 settings.githook_name=Nome do Hook
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push para o repositório
 settings.event_issues=Problemas
 settings.event_issues_desc=Problema aberto, fechado, reaberto, editado, atribuído, desatribuído, etiqueta atualizada, etiqueta limpa, milestone definido ou milestone indefinido.
-settings.event_issue_comment=Comentário do Problema
-settings.event_issue_comment_desc=Comentário do problema criado, editado ou excluído.
 settings.event_pull_request=Pull Request
 settings.event_pull_request_desc=Pull request aberto, fechado, reaberto, editado, atribuído, desatribuído, etiqueta atualizada, etiqueta limpa, milestone definido, milestone indefinido ou sincronizado.
+settings.event_issue_comment=Comentário do Problema
+settings.event_issue_comment_desc=Comentário do problema criado, editado ou excluído.
 settings.event_release=Lançamento
 settings.event_release_desc=Lançamento publicado em um repositório.
 settings.active=Ativo
@@ -852,6 +867,8 @@ settings.add_key_success=A nova chave de Deploy '%s' foi adicionada com sucesso!
 settings.deploy_key_deletion=Exclusão de chave de Deploy
 settings.deploy_key_deletion_desc=Excluir esta chave de Deploy removerá permissões de acesso a este repositório. Quer mesmo continuar?
 settings.deploy_key_deletion_success=Chave de Deploy excluída com sucesso!
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=Ver código fonte
 diff.parent=pai
@@ -916,9 +933,8 @@ team_name_helper=Você usará este nome para mencionar esta equipe em conversas.
 team_desc_helper=Do que trata essa equipe?
 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=O nome nome de equipe '%s' está reservado.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Configurações
 settings.options=Opções
@@ -990,12 +1006,19 @@ first_page=Primeira
 last_page=Última
 total=Total: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Estatística
 dashboard.operations=Operações
 dashboard.system_status=Status do monitor de sistema
 dashboard.statistic_info=O banco de dados do Gogs contém <b>%d</b> usuários, <b>%d</b> organizações, <b>%d</b> chaves públicas, <b>%d</b> repositórios, <b>%d</b> observadores, <b>%d</b> estrelas, <b>%d</b> ações, <b>%d</b> acessos, <b>%d</b> questões, <b>%d</b> comentários, <b>%d</b> contas sociais, <b>%d</b> seguidores, <b>%d</b> espelhos, <b>%d</b> versões, <b>%d</b>  origens de login, <b>%d</b> Hooks da Web, <b>%d</b> milestones, <b>%d</b> labels, <b>%d</b> tarefas hook, <b>%d</b> equipes, <b>%d</b> tarefas de atualização, <b>%d</b> anexos.
 dashboard.operation_name=Nome da operação
 dashboard.operation_switch=Trocar
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Executar
 dashboard.clean_unbind_oauth=Limpar OAuthes não acoplados
 dashboard.clean_unbind_oauth_success=Todos OAuthes desvinculados foram excluídos com sucesso.
@@ -1087,11 +1110,12 @@ repos.stars=Favoritos
 repos.issues=Issues
 repos.size=Tamanho
 
-auths.auth_manage_panel=Painel de gerenciamento da autenticação
+auths.auth_sources=Authentication Sources
 auths.new=Adicionar nova fonte
 auths.name=Nome
 auths.type=Tipo
 auths.enabled=Habilitado
+auths.default=Default
 auths.updated=Atualizado
 auths.auth_type=Tipo de autenticação
 auths.auth_name=Nome da autenticação
@@ -1100,7 +1124,7 @@ auths.domain=Domínio
 auths.host=Host
 auths.port=Porta
 auths.bind_dn=Vincular DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Você pode usar '%s' como placeholderpara o nome de usuário, por exemplo, DOM\%s
 auths.bind_password=Vincular senha
 auths.bind_password_helper=Atenção: Esta senha é armazenada em texto plano. Não use uma conta com muitos privilégios.
 auths.user_base=Base de pesquisa do usuário
@@ -1128,9 +1152,9 @@ auths.enable_tls=Habilitar Criptografia TLS
 auths.skip_tls_verify=Ignorar verificação de TLS
 auths.pam_service_name=Nome de Serviço PAM
 auths.enable_auto_register=Habilitar Registro Automático
-auths.tips=Dicas
 auths.edit=Editar a configuração de autenticação
 auths.activated=Esta autenticação foi ativada
+auths.default_auth=This authentication is default login source
 auths.new_success=Nova autenticação '%s' foi adicionada com sucesso.
 auths.update_success=A configuração da autenticação foi atualizada com sucesso.
 auths.update=Atualizar a configuração da autenticação
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Esta autenticação esta prestes a ser excluída, deseja
 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=A fonte de login '%s" já existe.
+auths.github_api_endpoint=API Endpoint
 
-config.not_set=(not set)
+config.not_set=(não definido)
 config.server_config=Configuração do servidor
-config.app_name=Nome do aplicativo
-config.app_ver=Versão do aplicativo
-config.app_url=URL do aplicativo
-config.domain=Domínio
-config.offline_mode=Modo Offline
-config.disable_router_log=Desabilitar o Log do router
+config.brand_name=Brand name
 config.run_user=Usuário de execução
 config.run_mode=Modo de execução
-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.reverse_auth_user=Usuário de autenticação reversa
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=Configuração de SSH
-config.ssh_enabled=Habilitado
-config.ssh_start_builtin_server=Iniciar servidor embutido
-config.ssh_domain=Domínio
-config.ssh_port=Porta
-config.ssh_listen_port=Porta de escuta
-config.ssh_root_path=Caminho da raiz
-config.ssh_key_test_path=Caminho da chave de teste
-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.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 config.repo_config=Configuração do Repositório
-config.repo_root_path=Caminho raiz do repositório
-config.script_type=Tipo de script
-config.repo_force_private=Forçar Privado
-config.max_creation_limit=Limite de Criação
-config.preferred_licenses=Licenças Preferidas
-config.disable_http_git=Desabilitar Git por HTTP
-config.enable_local_path_migration=Enable Local Path Migration
-config.commits_fetch_concurrency=Commits Fetch Concurrency
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Configuração do banco de dados
-config.db_type=Tipo
-config.db_host=Host
-config.db_name=Nome
-config.db_user=Usuário
-config.db_ssl_mode=Modo SSL
-config.db_ssl_mode_helper=(apenas para "postgres")
-config.db_path=Caminho
-config.db_path_helper=(para "sqlite3" e "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Configuração do serviço
-config.register_email_confirm=Requerer confirmação de e-mail
-config.disable_register=Desabilitar registro
-config.show_registration_button=Mostrar botão de registo
-config.require_sign_in_view=Requerer entrar no Gogs para visualizar
-config.mail_notify=Notificação de e-mail
-config.disable_key_size_check=Desativar verificação de tamanho mínimo da chave
-config.enable_captcha=Habilitar o captcha
-config.active_code_lives=Ativar Code Lives
-config.reset_password_code_lives=Redefinir senha de Code Lives
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Configuração de Hook da Web
-config.queue_length=Tamanho da fila
-config.deliver_timeout=Intervalo de entrega
-config.skip_tls_verify=Pular verificação de TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Configuração de envio de e-mail
-config.mailer_enabled=Habilitado
-config.mailer_disable_helo=Desabilitar HELO
-config.mailer_name=Nome
-config.mailer_host=Host
-config.mailer_user=Usuário
-config.send_test_mail=Enviar email de teste
-config.test_mail_failed=Falha ao enviar o email de teste para '%s': %v
-config.test_mail_sent=O email de teste foi enviado para '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Configuração do OAuth
-config.oauth_enabled=Habilitado
-
-config.cache_config=Configuração de cache
-config.cache_adapter=Adaptador de cache
-config.cache_interval=Intervalo de cache
-config.cache_conn=Conexão de cache
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Configuração da sessão
-config.session_provider=Provedor da sessão
-config.provider_config=Configuração do provedor
-config.cookie_name=Nome do cookie
-config.enable_set_cookie=Habilitar uso de cookie
-config.gc_interval_time=Tempo de Intervalo do GC
-config.session_life_time=Tempo de vida da sessão
-config.https_only=Apenas HTTPS
-config.cookie_life_time=Tempo de vida do cookie
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Configuração de cache
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=Configuração de HTTP
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Configuração da imagem
-config.picture_service=Serviço de imagens
-config.disable_gravatar=Desativar Gravatar
-config.enable_federated_avatar=Habilitar avatares federativos
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Configuração de Hook da Web
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Configuração do Git
-config.git_disable_diff_highlight=Habilitar realce de mudanças no diff
-config.git_max_diff_lines=Máximo de linhas mostradas no diff (para um único arquivo)
-config.git_max_diff_line_characters=Máximo de caracteres mostrados no diff (para uma única linha)
-config.git_max_diff_files=Máximo de arquivos a serem mostrados no diff
-config.git_gc_args=Argumentos do GC
-config.git_migrate_timeout=Timeout de migração
-config.git_mirror_timeout=Timeout para sincronização de mirror
-config.git_clone_timeout=Timeout para operação de clone
-config.git_pull_timeout=Timeout para operação de pull
-config.git_gc_timeout=Timeout para execução do GC
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Configuração de log
+config.log_file_root_path=Caminho raiz para arquivo de log
 config.log_mode=Modo
 config.log_options=Opções
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Avisos do sistema foram excluídos com sucesso.
 
 [action]
 create_repo=repositório criado <a href="%s"> %s</a>
-fork_repo=repositório criado <a href="%s"> %s</a>
 rename_repo=renomeou o o repositório <code>%[1]s</code> para <a href="%[2]s">%[3]s</a>
 commit_repo=pushed para <a href="%[1]s/src/%[2]s">%[3]s</a> em <a href="%[1]s">%[4]s</a>
 compare_commits=Ver comparação entre esses %d commits
@@ -1299,7 +1383,11 @@ merge_pull_request=`mesclou o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 create_branch=criado novo branch <a href="%[1]s/src/%[2]s">%[3]s</a> em <a href="%[1]s">%[4]s</a>
 delete_branch=excluído branch <code>%[2]s</code> em <a href="%[1]s">%[3]s</a>
 push_tag=Foi feito push na tag <a href="%s/src/%s">%[2]s</a> para <a href="%[1]s">%[3]s</a>
-delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+delete_tag=excluída tag <code>%[2]s</code> em <a href="%[1]s">%[3]s</a>
+fork_repo=repositório criado <a href="%s"> %s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=atrás
@@ -1321,6 +1409,7 @@ months=%d meses %s
 years=%d anos %s
 raw_seconds=segundos
 raw_minutes=minutos
+raw_hours=hours
 
 [dropzone]
 default_message=Arraste e solte arquivos aqui, ou clique para selecioná-los.

conf/locale/locale_ru-RU.ini

@@ -9,7 +9,6 @@ sign_out=Выход
 sign_up=Регистрация
 register=Регистрация
 website=Веб-сайт
-version=Версия
 page=Страница
 template=Шаблон
 language=Язык
@@ -44,6 +43,10 @@ issues=Задачи
 
 cancel=Отмена
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Установка
 title=Установочные шаги для первого запуска
@@ -98,7 +101,7 @@ server_service_title=Сервер и другие настройки служб
 offline_mode=Включение офлайн режима
 offline_mode_popup=Отключить CDN даже в производственном режиме, все файлы ресурсов будут раздаваться локально.
 disable_gravatar=Отключить службу Gravatar
-disable_gravatar_popup=Отключить Gravatar и пользовательские источники, все аватары по-умолчанию загружаются пользователями.
+disable_gravatar_popup=Отключить Gravatar и пользовательские источники. Используются аватары, загружаемые пользователями, или аватары по умолчанию.
 federated_avatar_lookup=Включить поиск внешних Аватаров
 federated_avatar_lookup_popup=Включите Поиск федеративного аватара для использования федеративной службы с открытым исходным кодом на основе libravatar.
 disable_registration=Отключить самостоятельную регистрацию
@@ -107,7 +110,7 @@ enable_captcha=Включить капчу
 enable_captcha_popup=Запрашивать капчу при регистрации пользователя.
 require_sign_in_view=Разрешить требовать авторизацию для просмотра страниц
 require_sign_in_view_popup=Только авторизированные пользователи могут просматривать страницы, посетители смогут увидеть только  ссылку на авторизацию вверху страницы.
-admin_setting_desc=Вы не должны создать учетную запись администратора прямо сейчас, пользователь с ID = 1 получит доступ с правами администратора автоматически.
+admin_setting_desc=Вам не обязательно создавать учетную запись администратора прямо сейчас, пользователь с ID = 1 получит доступ с правами администратора автоматически.
 admin_title=Настройки учётной записи администратора
 admin_name=Имя пользователя
 admin_password=Пароль
@@ -122,6 +125,7 @@ run_user_not_match=Текущий пользователь не является
 smtp_host_missing_port=Не указан порт в адресе хоста SMTP.
 invalid_smtp_from=Поле SMTP From неправильное: %v
 save_config_failed=Не удалось сохранить конфигурацию: %v
+init_failed=Не удалось инициализировать приложение: %v
 invalid_admin_setting=Указан недопустимый параметр учетной записи администратора: %v
 install_success=Добро пожаловать! Мы рады, что вы выбрали Gogs. Веселитесь и берегите себя.
 invalid_log_root_path=Недопустимый путь для логов: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Уже есть аккаунт? Авторизуйтесь!
 social_register_hepler_msg=Уже есть учетная запись? Свяжите ее с соцсетью!
 disable_register_prompt=Извините,  возможность регистрации отключена. Пожалуйста, свяжитесь с администратором сайта.
 disable_register_mail=К сожалению подтверждение регистрации по почте отключено.
+auth_source=Тип аутентификации
+local=Локальный
 remember_me=Запомнить меня
 forgot_password=Забыли пароль
 forget_password=Забыли пароль?
@@ -159,14 +165,14 @@ confirmation_mail_sent_prompt=Новое письмо для подтвержд
 active_your_account=Активируйте свой аккаунт
 prohibit_login=Вход запрещен
 prohibit_login_desc=Вход для вашей учетной записи был запрещен, пожалуйста, свяжитесь с администратором сайта.
-resent_limit_prompt=Извините, вы уже запросили активацию по электронной почте недавно. Пожалуйста, подождите 3 минуты, а затем повторите попытку.
-has_unconfirmed_mail=Здравствуйте, %s! У вас есть неподтвержденный адрес электронной почты (<b>%s</b>). Если вам не приходило письмо с подтверждением или нужно выслать новое письмо, нажмите на кнопку ниже.
+resent_limit_prompt=Вы уже запрашивали активацию по электронной почте. Пожалуйста, подождите 3 минуты, а затем повторите попытку.
+has_unconfirmed_mail=Здравствуйте, %s! У вас есть неподтвержденный адрес электронной почты (<b>%s</b>). Если вы не получили письмо с подтверждением или нужно выслать новое письмо, нажмите на кнопку ниже.
 resend_mail=Нажмите здесь, чтобы переотправить активационное письмо
 send_reset_mail=Нажмите сюда, чтобы отправить письмо для сброса пароля
 reset_password=Сброс пароля
 invalid_code=Извините, ваш код подтверждения истек или не является допустимым.
 reset_password_helper=Нажмите здесь, чтобы сбросить свой пароль
-password_too_short=Длина пароля не менее 6 символов.
+password_too_short=Длина пароля не может быть менее 6 символов.
 non_local_account=Нелокальные аккаунты не могут изменить пароль через Gogs.
 
 login_two_factor=Двухфакторная аутентификация
@@ -210,8 +216,8 @@ TreeName=Путь к файлу
 Content=Содержимое
 
 require_error=` не может быть пустым.`
-alpha_dash_error=«должен быть допустимым символьным, числовым или dash(-_) значением.»
-alpha_dash_dot_error=«должен быть допустимым символьным, числовым или dash(-_) символами, включая точку.»
+alpha_dash_error=` должен быть допустимым символьным, числовым или dash(-_) значением.`
+alpha_dash_dot_error=` должен быть допустимым символьным, числовым или dash(-_) символами, включая точку.`
 alpha_dash_dot_slash_error=«должен быть допустимым символьным, числовым или dash(-_) символами, включая точку или слэш.»
 size_error=` должен быть размер %s.`
 min_size_error=«должен содержать по крайней мере %s символов.»
@@ -221,7 +227,7 @@ url_error=` не является допустимым URL-адресом.`
 include_error=` должен содержать '%s'.`
 unknown_error=Неизвестная ошибка:
 captcha_incorrect=Капча не пройдена.
-password_not_match=Пароли не совпадают.
+password_not_match=Пароль и подтверждение отличаются.
 
 username_been_taken=Имя пользователя занято.
 repo_name_been_taken=Имя репозитория занято.
@@ -229,6 +235,7 @@ org_name_been_taken=Название организации занято.
 team_name_been_taken=Название команды занято.
 email_been_used=Адрес электронной почты уже используется.
 username_password_incorrect=Имя пользователя или пароль не правильный.
+auth_source_mismatch=Выбранный источник проверки подлинности не связан с пользователем.
 enterred_invalid_repo_name=Пожалуйста, убедитесь, что введено правильное имя репозитория.
 enterred_invalid_owner_name=Убедитесь, что введенное имя владельца верное.
 enterred_invalid_password=Убедитесь, что введенный пароль верен.
@@ -256,8 +263,7 @@ following=Подписан
 follow=Подписаться
 unfollow=Отписаться
 
-form.name_reserved=Имя пользователя '%s' зарезервировано.
-form.name_pattern_not_allowed=Имя пользователя «%s» не допускается.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Профиль
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Или введите кодовое слово:
 two_factor_then_enter_passcode=Затем введите пароль:
 two_factor_verify=Проверить
 two_factor_invalid_passcode=Введенные пароли не совпадают; пожалуйста, повторите попытку!
+two_factor_reused_passcode=Введенный вами пароль уже используется, пожалуйста, попробуйте другой!
 two_factor_enable_error=Ошибка активация двухфакторной аутентификации: %v
 two_factor_enable_success=Двухфакторная аутентификация активирована для вашей учетной записи!
 two_factor_recovery_codes_title=Коды восстановления для двухфакторная аутентификации
@@ -370,6 +377,7 @@ delete_token=Удалить
 access_token_deletion=Удаление личного токена доступа
 access_token_deletion_desc=Удаление этого персонального токена доступа приведет к удалению всех связанных прав доступа к приложению. Вы хотите продолжить?
 delete_token_success=Персональный токен доступа успешно удален! Не забудьте изменить настройки вашего приложения.
+token_name_exists=Токен с таким именем уже существует.
 
 orgs.none=Вы не состоите ни в одной организации.
 orgs.leave_title=Покинуть организацию
@@ -417,10 +425,11 @@ mirror_last_synced=Последняя синхронизация
 watchers=Наблюдатели
 stargazers=Звездочеты
 forks=Ответвления
+repo_description_helper=Описание репозитория. Максимальная длина 512 символов.
+repo_description_length=Доступные символы
 
 form.reach_limit_of_creation=У владельца достигнут максимальный предел в %d создаваемых репозиториев.
-form.name_reserved=Имя репозитория  '%s'  зарезервировано.
-form.name_pattern_not_allowed=Шаблон имени репозитория '%s' не допускается.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Требуется авторизация
 migrate_type=Тип миграции
@@ -458,7 +467,7 @@ tree=Дерево
 filter_branch_and_tag=Фильтр по ветке или тегу
 branches=Ветки
 tags=Метки
-issues=Обсуждения
+issues=Задачи
 pulls=Запросы на слияние
 labels=Метки
 milestones=Этапы
@@ -476,7 +485,7 @@ branches.overview=Обзор
 branches.active_branches=Активные ветки
 branches.stale_branches=Устаревшие ветки
 branches.all=Все ветки
-branches.updated_by=Обновлено %[1]s %[2]s
+branches.updated_by=Обновлено %[1]s пользователем %[2]s
 branches.change_default_branch=Change Default Branch
 
 editor.new_file=Новый файл
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Содержимое файла изменил
 editor.file_already_exists=Файл с именем «%s» уже существует в этом репозитории.
 editor.no_changes_to_show=Нет изменений.
 editor.fail_to_update_file=Не удалось обновить/создать файл «%s» из-за ошибки: %v
+editor.fail_to_delete_file=Не удалось удалить файл «%s» из-за ошибки: %v
 editor.add_subdir=Добавьте подкаталог...
 editor.unable_to_upload_files=Не удалось загрузить файлы в «%s» из-за ошибки: %v
 editor.upload_files_to_dir=Загрузить файлы '%s'
@@ -531,7 +541,7 @@ commits.newer=Новее
 issues.new=Новая задача
 issues.new.labels=Метки
 issues.new.no_label=Нет меток
-issues.new.clear_labels=Отчистить метки
+issues.new.clear_labels=Очистить метки
 issues.new.milestone=Этап
 issues.new.no_milestone=Нет этапа
 issues.new.clear_milestone=Очистить этап
@@ -616,7 +626,7 @@ pulls.compare_compare=сравнить
 pulls.filter_branch=Фильтр по ветке
 pulls.no_results=Результатов не найдено.
 pulls.nothing_to_compare=Нечего сравнивать, родительская и текущая ветка одинаковые.
-pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history.
+pulls.nothing_merge_base=Нечего сравнивать, так так история обеих веток полностью отличается.
 pulls.has_pull_request=`Уже существует запрос на слияние между двумя целями: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create=Создать запрос на слияние
 pulls.title_desc=хочет смерджить %[1]d коммит(ов) из <code>%[2]s</code> в <code>%[3]s</code>
@@ -632,8 +642,9 @@ pulls.is_checking=Продолжается проверка конфликтов
 pulls.can_auto_merge_desc=Этот запрос на слияние может быть объединён автоматически.
 pulls.cannot_auto_merge_desc=Этот запрос на слияние не может быть объединён автоматически.
 pulls.cannot_auto_merge_helper=Пожалуйста, совершите слияние вручную для урегулирования конфликтов.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Создать коммит на слияние
+pulls.rebase_before_merging=Выполнить rebase перед слиянием
+pulls.commit_description=Описание коммита
 pulls.merge_pull_request=Слить пулл-реквест
 pulls.open_unmerged_pull_exists=`Вы не можете снова открыть, поскольку уже существует запрос на слияние (#%d) из того же репозитория с той же информацией о слиянии и ожидающий слияния. `
 pulls.delete_branch=Удалить ветку
@@ -738,9 +749,9 @@ settings.tracker_issue_style=Стиль Именования Внешней Си
 settings.tracker_issue_style.numeric=Цифровой
 settings.tracker_issue_style.alphanumeric=Буквенноцифровой
 settings.tracker_url_format_desc=Вы можете использовать шаблон <code>{user} {repo} {index}</code> для имени пользователя, репозитория и номера задачи.
-settings.pulls_desc=Включить публичные запросы на слияние
-settings.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Разрешить пул-запросы для принятия изменений между репозиториями и ветками
+settings.pulls.ignore_whitespace=Игнорировать изменения в пробельных символах
+settings.pulls.allow_rebase_merge=Разрешить rebase-слияние
 settings.danger_zone=Опасная зона
 settings.cannot_fork_to_same_owner=Вы не можете ответвить репозиторий его же владельцу.
 settings.new_owner_has_same_repo=У нового владельца уже есть хранилище с таким названием.
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Данные Вики успешно стерты
 settings.delete=Удалить этот репозиторий
 settings.delete_desc=Будьте внимательны! Как только вы удалите репозиторий — пути назад не будет.
 settings.delete_notices_1=- Эта операция <strong>НЕ МОЖЕТ</strong> быть отменена.
-settings.delete_notices_2=- Эта операция навсегда удалит всё из этого репозитория, включая данные Git, связанные с ним задачи, комментарии и права доступа для сотрудников.
+settings.delete_notices_2=- Эта операция удалит все в этом репозитории, включая данные Git, задачи, комментарии и доступы для соавторов.
 settings.delete_notices_fork_1=- Все отвлетвления станут независимыми после удаления.
 settings.deletion_success=Репозиторий был успешно удалён!
 settings.update_settings_success=Настройки репозитория обновлены успешно.
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=Этот пользователь больш
 settings.remove_collaborator_success=Соавтор был удален.
 settings.search_user_placeholder=Поиск пользователя...
 settings.org_not_allowed_to_be_collaborator=Организации не могут быть добавлены как соавторы.
-settings.add_webhook=Добавить Webhook
 settings.hooks_desc=Webhooks позволяют внешним службам получать уведомления при возникновении определенных событий на Gogs. При возникновении указанных событий мы отправим запрос POST на каждый заданный вами URL. Узнать больше можно в нашем <a target="_blank" href="%s">Руководстве по Webhooks</a>.
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Добавить Webhook
 settings.webhook_deletion=Удалить веб-хук
 settings.webhook_deletion_desc=Удаление этого веб-хука приведет к удалению всей, связанной с ним, информации, включая историю. Хотите продолжить?
 settings.webhook_deletion_success=Веб-хук успешно удален!
@@ -792,6 +805,8 @@ settings.webhook.response=Ответ
 settings.webhook.headers=Заголовки
 settings.webhook.payload=Содержимое запроса
 settings.webhook.body=Тело ответа
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git-хуки предоставляются Git самим по себе, вы можете изменять файлы поддерживаемых хуков из списка ниже чтобы выполнять внешние операции.
 settings.githook_edit_desc=Если хук не активен, будет подставлен пример содержимого. Пустое значение в этом поле приведет к отключению хука.
 settings.githook_name=Название Hook'a
@@ -817,12 +832,12 @@ settings.event_fork=Ответвить
 settings.event_fork_desc=Репозиторий склонирован
 settings.event_push=Push
 settings.event_push_desc=Push в репозиторий
-settings.event_issues=Вопросы
+settings.event_issues=Задачи
 settings.event_issues_desc=Задача изменена
-settings.event_issue_comment=Комментарии в задаче
-settings.event_issue_comment_desc=Комментарий создан, изменен или удален.
 settings.event_pull_request=Запросы на слияние
 settings.event_pull_request_desc=Запрос слияния открыт, закрыт, переоткрыт, изменён, назначен, снят, метка обновлена, метка убрана, добавлен промежуточный этап, убран промежуточный этап или синхронизирован.
+settings.event_issue_comment=Комментарии в задаче
+settings.event_issue_comment_desc=Комментарий создан, изменен или удален.
 settings.event_release=Релиз
 settings.event_release_desc=Релиз опубликован в репозитории.
 settings.active=Активен
@@ -835,12 +850,12 @@ 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.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository.
+settings.add_dingtalk_hook_desc=Добавить интеграцию с <a href="%s">Dingtalk</a> в ваш репозиторий.
 settings.slack_token=Token
 settings.slack_domain=Домен
 settings.slack_channel=Канал
 settings.deploy_keys=Ключи развертывания
-settings.deploy_keys_helper=<b>Common Gotcha!</b> Если вы ищите куда добавить персональные публичные ключи, добавьте их в <a href="%s%s">настройках вашего аккаунта</a>.
+settings.deploy_keys_helper=<b>Подсказка:</b> если вы хотите добавить личные публичные ключи, сделайте это в <a href="%s%s">настройках вашего аккаунта</a>.
 settings.add_deploy_key=Добавить ключ развертывания
 settings.deploy_key_desc=Ключи развёртывания доступны только для чтения. Это не то же самое что и SSH-ключи аккаунта.
 settings.no_deploy_keys=Вы не добавляли ключи развертывания.
@@ -852,6 +867,8 @@ settings.add_key_success=Новый ключ развертывания '%s' у
 settings.deploy_key_deletion=Удалить ключ развертывания
 settings.deploy_key_deletion_desc=Удаление ключа развертывания приведет к удалению всех связанных прав доступа к репозиторию. Вы хотите продолжить?
 settings.deploy_key_deletion_success=Ключ развертывания успешно удален!
+settings.description_desc=Описание репозитория. Максимальная длина 512 символов.
+settings.description_length=Доступные символы
 
 diff.browse_source=Просмотр исходного кода
 diff.parent=Родитель
@@ -908,7 +925,7 @@ invite_someone=Пригласить кого-нибудь
 teams=Команды
 lower_members=Участники
 lower_repositories=Репозитории
-create_new_team=Создать Новую Команду
+create_new_team=Создать новую команду
 org_desc=Описание
 team_name=Название команды
 team_desc=Описание
@@ -916,9 +933,8 @@ team_name_helper=Вы будете использовать это имя для
 team_desc_helper=Что это за команда?
 team_permission_desc=Какой уровень разрешений должен быть у этой команды?
 
-form.name_reserved=Наименование организации  '%s' зарезервированно.
-form.name_pattern_not_allowed=Шаблон организации  '%s' не допускается.
-form.team_name_reserved=Имя команды '%s' зарезервировано.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Настройки
 settings.options=Опции
@@ -990,12 +1006,19 @@ first_page=Первый
 last_page=Последний
 total=Всего: %d
 
+dashboard.build_info=Информация о сборке
+dashboard.app_ver=Версия приложения
+dashboard.git_version=Версия Git
+dashboard.go_version=Версия Go
+dashboard.build_time=Время сборки
+dashboard.build_commit=Коммит сборки
 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> веб-хуков, <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.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Запуск
 dashboard.clean_unbind_oauth=Удалить не привязанные OAUth
 dashboard.clean_unbind_oauth_success=Не привязанные OAuth аккаунты успешно удалены.
@@ -1015,7 +1038,7 @@ dashboard.reinit_missing_repos=Реинициализировать все ре
 dashboard.reinit_missing_repos_success=Все репозитории с утерянными Git файлами успешно реинициализированы.
 
 dashboard.server_uptime=Время непрерывной работы сервера
-dashboard.current_goroutine=Текущий Goroutines
+dashboard.current_goroutine=Текущих Goroutines
 dashboard.current_memory_usage=Текущее использование памяти
 dashboard.total_memory_allocated=Всего памяти выделено
 dashboard.memory_obtained=Памяти использовано
@@ -1087,11 +1110,12 @@ repos.stars=В избранном
 repos.issues=Задачи
 repos.size=Размер
 
-auths.auth_manage_panel=Панель управления аутнентификациями
+auths.auth_sources=Типы аутентификации
 auths.new=Добавить новый источник
 auths.name=Имя
 auths.type=Тип
 auths.enabled=Включено
+auths.default=По умолчанию
 auths.updated=Обновлено
 auths.auth_type=Тип аутентификации
 auths.auth_name=Имя аутентификации
@@ -1100,17 +1124,17 @@ auths.domain=Домен
 auths.host=Хост
 auths.port=Порт
 auths.bind_dn=Привязать DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Вы можете использовать '%s' для подстановки имени пользователя, например: DOM\%s
 auths.bind_password=Привязать пароль
 auths.bind_password_helper=Внимание: Этот пароль сохранен в небезопасном виде. Не используйте высоко-привилегированную учетную запись.
 auths.user_base=База для поиска пользователя
 auths.user_dn=DN пользователя
 auths.attribute_username=Атрибут username
 auths.attribute_username_placeholder=Оставьте пустым, чтобы использовать имя пользователя для регистрации.
-auths.attribute_name=First Name Attribute
+auths.attribute_name=Имя атрибута
 auths.attribute_surname=Фамилия аттрибута
 auths.attribute_mail=Электронная почта аттрибута
-auths.verify_group_membership=Verify group membership
+auths.verify_group_membership=Верифицировать членство в группе
 auths.group_search_base_dn=Base DN для поиска группы
 auths.group_filter=Групповой фильтр
 auths.group_attribute_contain_user_list=Атрибут группы, содержащий список пользователей
@@ -1128,9 +1152,9 @@ auths.enable_tls=Включение шифрования TLS
 auths.skip_tls_verify=Пропустить проверку TLS
 auths.pam_service_name=Имя службы PAM
 auths.enable_auto_register=Включить автоматическую регистрацию
-auths.tips=Советы
 auths.edit=Изменить параметры канала аутентификации
 auths.activated=Эта аутентификация активирована
+auths.default_auth=Эта аутентификация является источником входа по умолчанию
 auths.new_success=Новый канал аутентификации '%s' успешно создан.
 auths.update_success=Настройки канала аутентификации успешно сохранены.
 auths.update=Обновить параметры аутентификации
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Этот канал аутентификации буде
 auths.still_in_used=Эта проверка подлинности до сих пор используется некоторыми пользователями, удалите или преобразуйте этих пользователей в другой тип входа в систему.
 auths.deletion_success=Канал аутентификации успешно удален!
 auths.login_source_exist=Источник входа '%s' уже существует.
+auths.github_api_endpoint=Конечная точка API
 
-config.not_set=(not set)
+config.not_set=(не задано)
 config.server_config=Конфигурация сервера
-config.app_name=Имя приложения
-config.app_ver=Версия приложения
-config.app_url=URL приложения
-config.domain=Домен
-config.offline_mode=Автономный режим
-config.disable_router_log=Отключение журнала маршрутизатора
+config.brand_name=Название бренда
 config.run_user=Запуск пользователем
 config.run_mode=Режим выполнения
-config.git_version=Версия Git
-config.static_file_root_path=Статичный путь до файла
-config.log_file_root_path=Путь до папки с логами
-config.reverse_auth_user=Заголовок с именем пользователя для авторизации на reverse proxy
+config.server.external_url=Внешний URL
+config.server.domain=Домен
+config.server.protocol=Протокол
+config.server.http_addr=HTTP адрес
+config.server.http_port=Порт HTTP
+config.server.cert_file=Файл сертификата
+config.server.key_file=Файл ключа
+config.server.tls_min_version=Минимальная версия TLS
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Автономный режим
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Включить Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=Конфигурация SSH
-config.ssh_enabled=Включено
-config.ssh_start_builtin_server=Запустить встроенный сервер
-config.ssh_domain=Домен
-config.ssh_port=Порт
-config.ssh_listen_port=Прослушиваемый порт
-config.ssh_root_path=Корневой путь
-config.ssh_key_test_path=Путь к тестовому ключу
-config.ssh_keygen_path=Путь к генератору ключей ('ssh-keygen')
-config.ssh_minimum_key_size_check=Минимальный размер ключа проверки
-config.ssh_minimum_key_sizes=Минимальные размеры ключа
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Проверка минимальной длины ключа
+config.ssh.minimum_key_sizes=Минимальные размеры ключа
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Выключить HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Конфигурация базы данных
-config.db_type=Тип
-config.db_host=Хост
-config.db_name=Имя
-config.db_user=Пользователь
-config.db_ssl_mode=Режим SSL
-config.db_ssl_mode_helper=(только для «postgres»)
-config.db_path=Путь
-config.db_path_helper=(для "SQLite3" и "TiDB")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Сервисная конфигурация
-config.register_email_confirm=Требуется подтверждение по электронной почте
-config.disable_register=Отключить регистрацию
-config.show_registration_button=Показать кнопку регистрации
-config.require_sign_in_view=Для просмотра необходима авторизация
-config.mail_notify=Почтовые уведомления
-config.disable_key_size_check=Отключить проверку на минимальный размер ключа
-config.enable_captcha=Включить капчу
-config.active_code_lives=Время жизни кода для активации
-config.reset_password_code_lives=Время жизни кода сброса пароля
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Настройка автоматического обновления репозиции
-config.queue_length=Длина очереди
-config.deliver_timeout=Задержка доставки
-config.skip_tls_verify=Пропустить TLS проверка
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Настройки почты
-config.mailer_enabled=Включено
-config.mailer_disable_helo=Отключить HELO
-config.mailer_name=Имя
-config.mailer_host=Сервер
-config.mailer_user=Пользователь
-config.send_test_mail=Отправить тестовое письмо
-config.test_mail_failed=Не удалось отправить тестовое письмо «%s»: %v
-config.test_mail_sent=Тестовое письмо было отправлено «%s».
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Конфигурация OAuth
-config.oauth_enabled=Включено
-
-config.cache_config=Настройки кеша
-config.cache_adapter=Адаптер кэша
-config.cache_interval=Интервал кэширования
-config.cache_conn=Подключение кэша
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Конфигурация сессии
-config.session_provider=Провайдер сессии
-config.provider_config=Конфигурация провайдера
-config.cookie_name=Имя файла cookie
-config.enable_set_cookie=Включить установку cookies
-config.gc_interval_time=Интервал работы сборщика мусора
-config.session_life_time=Время жизни сессии
-config.https_only=Только HTTPS
-config.cookie_life_time=Время жизни файла cookie
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Настройки кеша
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=Конфигурация HTTP
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Настройка изображения
-config.picture_service=Сервис изображений
-config.disable_gravatar=Отключить Gravatar
-config.enable_federated_avatar=Включить внешние Аватары
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Конфигурация Webhook
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Конфигурация GIT
-config.git_disable_diff_highlight=Отключить подсветку синтаксиса Diff
-config.git_max_diff_lines=Максимальное количество строк Diff (на файл)
-config.git_max_diff_line_characters=Максимальное количество символов Diff (в строке)
-config.git_max_diff_files=Максимальное количество Diff-файлов (при показе)
-config.git_gc_args=Аргументы GC
-config.git_migrate_timeout=Тайм-аут миграции
-config.git_mirror_timeout=Время Ожидания Обновления Зеркала
-config.git_clone_timeout=Время Ожидания Операции Клонирования
-config.git_pull_timeout=Время Ожидания Операции Извлечения
-config.git_gc_timeout=Время Ожидания Операции Сборки Мусора
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Конфигурация журнала
+config.log_file_root_path=Путь до папки с логами
 config.log_mode=Режим
 config.log_options=Опции
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Системное уведомление успешно
 
 [action]
 create_repo=создал(а) репозиторий <a href="%s"> %s</a>
-fork_repo=склонировать репозиторий в <a href="%s">%s</a>
 rename_repo=переименовал(а) репозиторий из <code>%[1]s</code> на <a href="%[2]s">%[3]s</a>
 commit_repo=запушил(а) <a href="%[1]s/src/%[2]s">%[3]s</a> в <a href="%[1]s">%[4]s</a>
 compare_commits=Просмотр сравнение для этих %d коммитов
@@ -1296,31 +1380,36 @@ create_pull_request=`создал запрос на слияние <a href="%s/p
 close_pull_request=`закрыл запрос на слияние <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`открыл снова запрос на слияние <a href="%s/pulls/%s">%s#%[2]s</a>`
 merge_pull_request=`слил пул реквест <a href="%s/pulls/%s">%s#%[2]s</a>`
-create_branch=создать новую ветку <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
-delete_branch=удален бранч <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+create_branch=создал новую ветку <a href="%[1]s/src/%[2]s">%[3]s</a> в <a href="%[1]s">%[4]s</a>
+delete_branch=удалил ветку <code>%[2]s</code> в <a href="%[1]s">%[3]s</a>
 push_tag=запушил(а) метку <a href="%s/src/%s">%[2]s</a> в <a href="%[1]s">%[3]s</a>
 delete_tag=удален тег <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+fork_repo=склонировать репозиторий в <a href="%s">%s</a>
+mirror_sync_push=синхронизированные коммиты с <a href="%[1]s/src/%[2]s">%[3]s</a> на <a href="%[1]s">%[4]s</a> из зеркала
+mirror_sync_create=синхронизированные новые ссылки <a href="%s/src/%s">%[2]s</a> к <a href="%[1]s">%[3]s</a> из зеркала
+mirror_sync_delete=синхронизированные и удаленные ссылки <code>%[2]s</code> на <a href="%[1]s">%[3]s</a> из зеркала
 
 [tool]
 ago=назад
 from_now=с этого момента
 now=сейчас
 1s=1 секунду %s
-1m=1 минута %s
+1m=1 минуту %s
 1h=1 час %s
 1d=1 день %s
 1w=1 неделя %s
 1mon=1 месяц %s
 1y=1 год %s
-seconds=секунд %[2]s: %[1]d
-minutes=минут %[2]s: %[1]d
+seconds=%d секунд %s
+minutes=%d минут %s
 hours=%d часов %s
-days=дней %[2]s: %[1]d
-weeks=недель %[2]s: %[1]d
-months=месяцев %[2]s: %[1]d
-years=лет %[2]s: %[1]d
+days=%d дней %s 
+weeks=%d недель %s
+months=%d месяцев %s
+years=%d лет %s
 raw_seconds=секунд
 raw_minutes=минут
+raw_hours=hours
 
 [dropzone]
 default_message=Перетащите файл сюда, или кликните для загрузки.

conf/locale/locale_sk-SK.ini

@@ -9,7 +9,6 @@ sign_out=Odhlásiť sa
 sign_up=Zaregistrovať sa
 register=Registrovať
 website=Web stránka
-version=Verzia
 page=Stránka
 template=Šablóna
 language=Jazyk
@@ -44,6 +43,10 @@ issues=Issues
 
 cancel=Zrušiť
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Inštalácia
 title=Postup prvotnej inštalácie
@@ -122,6 +125,7 @@ run_user_not_match=Používateľ pre spustenie sa nezhoduje s aktuálnym použí
 smtp_host_missing_port=V adrese SMTP servera chýba číslo portu.
 invalid_smtp_from=Hodnota položky SMTP Od: je nesprávne zadaná: %v
 save_config_failed=Chyba pri uložení konfigurácie: %v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=Nastavenie administrátorského účtu je neplatné: %v
 install_success=Vitajte! Sme radi, že ste si vybrali Gogs, bavte sa a dávajte si pozor.
 invalid_log_root_path=Koreňový adresár pre log súbory je neplatný: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Máte už účet? Prihláste sa teraz!
 social_register_hepler_msg=Máte už účet? Bindovať teraz!
 disable_register_prompt=Ospravedlňujeme sa, ale registrácia bola vypnutá. Obráťte sa na administrátora stránky.
 disable_register_mail=Ospravedlňujeme sa, potvrdenie registračného e-mailu bolo vypnuté.
+auth_source=Zdroj overovania
+local=Lokálny
 remember_me=Zapamätať prihlásenie
 forgot_password=Zabudnuté heslo
 forget_password=Zabudli ste heslo?
@@ -229,6 +235,7 @@ org_name_been_taken=Názov organizácie už bol použitý.
 team_name_been_taken=Názov tímu už bol použitý.
 email_been_used=E-mailová adresa už bola použitá.
 username_password_incorrect=Používateľské meno alebo heslo nie je správne.
+auth_source_mismatch=Vybraný zdroj overenia nieje prepojený s užívateľom.
 enterred_invalid_repo_name=Uistite sa prosím, že názov repozitára, ktorý ste zadali je správny.
 enterred_invalid_owner_name=Uistite sa prosím, že meno vlastníka, ktoré ste zadali je správne.
 enterred_invalid_password=Uistite sa prosím, že heslo ktoré ste zadali je správne.
@@ -256,8 +263,7 @@ following=Sledovaní
 follow=Sledovať
 unfollow=Prestať sledovať
 
-form.name_reserved=Používateľské meno '%s' je vyhradené.
-form.name_pattern_not_allowed=Vzor používateľského mena '%s' nieje povolený.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profil
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Alebo zadajte tajný kód:
 two_factor_then_enter_passcode=Potom zadajte prístupový kód:
 two_factor_verify=Overiť
 two_factor_invalid_passcode=Zadaný prístupový kód nie je platný, prosím, skúste to znova!
+two_factor_reused_passcode=Kód, ktorý ste zadali už bol použitý. Prosím, zkúste iný!
 two_factor_enable_error=Povolenie dvojfaktorového overenia zlyhalo: %v
 two_factor_enable_success=Dvojfaktorové overenie bolo pre Váš účet povolené!
 two_factor_recovery_codes_title=Obnovovacie kódy dvojfaktorového overenia
@@ -370,6 +377,7 @@ delete_token=Odstrániť
 access_token_deletion=Odstránenie osobného prístupového tokenu
 access_token_deletion_desc=Zmazaním tohto osobného prístupového tokenu sa zmaže všetok prístup súvisiacej aplikácie. Chcete pokračovať?
 delete_token_success=Osobný prístupový token bol úspešne odstránený! Nezabudnite tiež zmeniť nastavenie vašej aplikácie.
+token_name_exists=Rola s rovnakým monom už existuje
 
 orgs.none=Nieste členom žiadnej organizácie.
 orgs.leave_title=Opustiť organizáciu
@@ -417,10 +425,11 @@ mirror_last_synced=Naposledy synchronizované
 watchers=Pozorovatelia
 stargazers=Sledujúci
 forks=Forky
+repo_description_helper=Popis repozitára. Maximálna dĺžka 512 znakov.
+repo_description_length=Dostupné znaky
 
 form.reach_limit_of_creation=Vlastník dosiahol maximálneho počtu %d vytvorených repozitárov.
-form.name_reserved=Repozitár s názvom '%s' je vyhradený.
-form.name_pattern_not_allowed=Repozitár so vzorom názvu '%s' nieje povolený.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Je potrebná autorizácia
 migrate_type=Typ migrácie
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Obsah súboru sa zmenil od začiatku úprav. <
 editor.file_already_exists=Súbor '%s' už v tomto repozitári existuje.
 editor.no_changes_to_show=Žiadne zmeny k zobrazení.
 editor.fail_to_update_file=Vytvorenie alebo zmena súboru '%s' skončila chybou: '%v'
+editor.fail_to_delete_file=Vymazanie súboru '%s' skončilo chybou: '%v'
 editor.add_subdir=Pridať podadresár...
 editor.unable_to_upload_files=Nepodarilo sa nahrať súbor do '%s'. Chyba: %v
 editor.upload_files_to_dir=Nahrať súbory do '%s'
@@ -632,8 +642,9 @@ pulls.is_checking=Kontrola rozporov stále pokračuje, prosím obnovte stránku
 pulls.can_auto_merge_desc=Tento pull request je možné automaticky zlúčiť.
 pulls.cannot_auto_merge_desc=Tento pull request nemôže byť automaticky zlúčený pretože obsahuje konflikty.
 pulls.cannot_auto_merge_helper=Prosím zlúčte manuálne pre vyriešenie konfliktov.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Vytvoriť zlúčenú revíziu
+pulls.rebase_before_merging=Rebase pred zlúčením
+pulls.commit_description=Popis Commitu
 pulls.merge_pull_request=Zlúčiť pull request
 pulls.open_unmerged_pull_exists=`Nemôžete znovu otvoriť požiadavku na stiahnutie, pretože požiadavka na stiahnutie z rovnakého repozitára s rovnakými informáciami pre zlúčenie už existuje (#%d) a čaká na zlúčenie.`
 pulls.delete_branch=Odstrániť vetvu
@@ -738,9 +749,9 @@ settings.tracker_issue_style=Štýl pomenovania úloh v externom systéme úloh:
 settings.tracker_issue_style.numeric=Numerická
 settings.tracker_issue_style.alphanumeric=Alfanumerické
 settings.tracker_url_format_desc=Môžete použiť zástupné výrazy <code>{user} {repo} {index}</code> pre užívateľské meno, názov repozitára a číslo úlohy.
-settings.pulls_desc=Povoliť požiadavky na stiahnutie, aby mohli byť príspevky verejnosti akceptované
-settings.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Enable pull requests to accept contributions between repositories and branches
+settings.pulls.ignore_whitespace=Ignorovať zmeny v prázdnom priestore
+settings.pulls.allow_rebase_merge=Povoliť použitie rebase pre zlúčenie revízií
 settings.danger_zone=Riziková zóna
 settings.cannot_fork_to_same_owner=Nemôžete rozštiepiť repozitár jeho vlastníkovi.
 settings.new_owner_has_same_repo=Nový vlastník už repozitár s rovnakým názvom má. Vyberte, prosím, iné meno.
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Data Wiki tohoto repozitára boli zmazané.
 settings.delete=Odstrániť tento repozitár
 settings.delete_desc=Hneď ako odstránite repozitár, nie je možné vrátiť sa späť, Buďte si prosím istý.
 settings.delete_notices_1=- Tuto operáciu <strong>nie je možné</strong> vrátiť.
-settings.delete_notices_2=Táto operácia permanentne odstráni všetko v tomto repozitári, zahrnujúc dáta Git, úloh, komentárov a prístup spolupracovníkov.
+settings.delete_notices_2=Táto akcia nenávratne vymaže všetko v tomto repozitári, vrátane dát Gitu, úkolov, komentárov a prístupov spolupracovníkov.
 settings.delete_notices_fork_1=- Po odstránení sa všetky forky stanú nezávislé.
 settings.deletion_success=Repozitár bol odstránený!
 settings.update_settings_success=Možnosti repozitára boli zmenené.
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=Tento užívateľ po tom, čo bude odstráne
 settings.remove_collaborator_success=Spolupracovník bol odstránený.
 settings.search_user_placeholder=Hľadať užívateľa...
 settings.org_not_allowed_to_be_collaborator=Nieje dovolené pridať organizáciu ako spolupracovníka.
+settings.hooks_desc=Webové háčiky sú podobné základným spúšťačom HTTP, POST udalostí. Kedykoľvek sa niečo stane v Gogs, bude postarané o oznámenie špecifickému cieľovému serveru. Viac o danom sa dozviete v <a target="_blank" href="%s"> príručke webových háčikov </a>.
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
 settings.add_webhook=Pridať 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=Odstrániť webhook
 settings.webhook_deletion_desc=Odstránením tohto webového háčika sa odstránia všetky informácie o ňom a tiež história volaní. Chcete pokračovať?
 settings.webhook_deletion_success=Webový háčik bol odstránený!
@@ -792,6 +805,8 @@ settings.webhook.response=Odpoveď
 settings.webhook.headers=Hlavičky
 settings.webhook.payload=Payload
 settings.webhook.body=Telo
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Háčiky Gitu sú spravované Gitom samotným, môžete v zozname nižšie upraviť súbory podporovaných háčikov k prevádzaniu užívateľských operácií.
 settings.githook_edit_desc=Pokiaľ je hook neaktívny, zobrazí sa ukážkový obsah. Ponechanie prázdneho obsahu zakáže tento hook.
 settings.githook_name=Názov hooku
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push do repozitára
 settings.event_issues=Úlohy
 settings.event_issues_desc=Úloha, ktorá je otvorená, uzavretá, znovuotvorená, zmenená, priradená, nepriradená, má zmenený štítok, odstránený štítok, má priradený milník, nemajúca priradený milník.
-settings.event_issue_comment=Komentár k úlohe
-settings.event_issue_comment_desc=Komentár k úlohe vytvorený, upravený alebo odstránený.
 settings.event_pull_request=Pull request
 settings.event_pull_request_desc=Požiadavka na stiahnutie otvorená, uzavrená, znovuotvorená, zmenená, priradená, nepriradená, zmenený štítok, odstránený štítok, má nastavený štítok, zrušenie nastaveného štítku alebo synchronizovaná.
+settings.event_issue_comment=Komentár k úlohe
+settings.event_issue_comment_desc=Komentár k úlohe vytvorený, upravený alebo odstránený.
 settings.event_release=Vydanie
 settings.event_release_desc=Vydanie vystavené v repozitári.
 settings.active=Aktívny
@@ -852,6 +867,8 @@ settings.add_key_success=Nový deploy kľúč '%s' bol úspešne pridaný!
 settings.deploy_key_deletion=Odstrániť deploy kľúč
 settings.deploy_key_deletion_desc=Odstránením tohto deploy kľúča sa odstránia všetky súvisiace prístupy k tomuto repozitáru. Chcete pokračovať?
 settings.deploy_key_deletion_success=Deploy kľúč bol úspešne odstránený!
+settings.description_desc=Popis repozitára. Maximálna dĺžka 512 znakov.
+settings.description_length=Dostupné znaky
 
 diff.browse_source=Prechádzať zdrojové kódy
 diff.parent=rodič
@@ -916,9 +933,8 @@ team_name_helper=Tento názov budete používať pri pomenovaní týmu v konverz
 team_desc_helper=Prosím popíšte tento tým
 team_permission_desc=Akú úroveň prístupu má mať tento tým?
 
-form.name_reserved=Názov organizácie '%s' je už rezervovaný.
-form.name_pattern_not_allowed=Vzor názvu organizácie '%s' nieje povolený.
-form.team_name_reserved=Názov týmu '%s' je vyhradený.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Nastavenia
 settings.options=Možnosti
@@ -990,12 +1006,19 @@ first_page=Prvý
 last_page=Posledný
 total=Celkom: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Štatistika
 dashboard.operations=Operácie
 dashboard.system_status=Monitor stavu systému
 dashboard.statistic_info=Gogs databáza obsahuje <b>%d</b> používateľov, <b>%d</b> organizácií, <b>%d</b> verejných kľúčov, <b>%d</b> repozitárov, <b>%d</b> sledovaní, <b>%d</b> hviezd, <b>%d</b> akcií, <b>%d</b> prístupov, <b>%d</b> issues, <b>%d</b> komentárov, <b>%d</b> sociálnych účtov, <b>%d</b> nasledovaní, <b>%d</b> mirrorov, <b>%d</b> vydaní, <b>%d</b> zdrojov prihlásení, <b>%d</b> webhookov, <b>%d</b> míľnikov, <b>%d</b> štítkov, <b>%d</b> hook úloh, <b>%d</b> tímov, <b>%d</b> aktualizačných úloh, <b>%d</b> príloh.
 dashboard.operation_name=Názov operácie
 dashboard.operation_switch=Prepnúť
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Spustiť
 dashboard.clean_unbind_oauth=Odstráň nenaviazané OAuth tokeny
 dashboard.clean_unbind_oauth_success=Všetky nenaviazané OAuth tokeny boli úspešne odstránené.
@@ -1087,11 +1110,12 @@ repos.stars=Hviezdy
 repos.issues=Issues
 repos.size=Veľkosť
 
-auths.auth_manage_panel=Panel správy spôsobu overovania
+auths.auth_sources=Zdroje overenia
 auths.new=Pridať nový zdroj
 auths.name=Názov
 auths.type=Typ
 auths.enabled=Povolené
+auths.default=Predvolený
 auths.updated=Aktualizované
 auths.auth_type=Typ overenia
 auths.auth_name=Názov overenia
@@ -1100,7 +1124,7 @@ auths.domain=Doména
 auths.host=Host
 auths.port=Port
 auths.bind_dn=Bind DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Môžete použiť '%s' ako miesto pre užívateľské meno, napr. DOM\%s
 auths.bind_password=Heslo pripojenia
 auths.bind_password_helper=Upozornenie: Toto heslo je ukladané nešifrovane. Nepoužívajte pre správcovské účty.
 auths.user_base=Východzie miesto hľadania úživateľov
@@ -1128,9 +1152,9 @@ auths.enable_tls=Povoliť šifrovanie TLS
 auths.skip_tls_verify=Preskočiť overenie TLS
 auths.pam_service_name=Názov služby PAM
 auths.enable_auto_register=Povoliť auto registráciu
-auths.tips=Tipy
 auths.edit=Upraviť nastavenie overovania
 auths.activated=Tento spôsob overovania je aktívny
+auths.default_auth=This authentication is default login source
 auths.new_success=Nový spôsob overovania '%s' bol pridaný.
 auths.update_success=Nastavenie overovania bolo zmenené.
 auths.update=Zmeniť nastavenie overovania
@@ -1140,166 +1164,230 @@ auths.delete_auth_desc=Tento spôsob overovania bude odstránený, chcete pokra
 auths.still_in_used=Tento spôsob overovania je stále používaný niektorými užívateľmi. Prosím, najskôr zmeňte u týchto užívateľov typ overenia na iný.
 auths.deletion_success=Spôsob overovania bol odstránený!
 auths.login_source_exist=Zdroj prihlásenia '%s' už existuje.
+auths.github_api_endpoint=API Endpoint
 
-config.not_set=(not set)
+config.not_set=(nezadané)
 config.server_config=Konfigurácia servera
-config.app_name=Názov aplikácie
-config.app_ver=Verzia aplikácie
-config.app_url=URL adresa aplikácie
-config.domain=Doména
-config.offline_mode=Offline režim
-config.disable_router_log=Disable Router Log
+config.brand_name=Brand name
 config.run_user=Používateľ pre spustenie aplikácie
-config.run_mode=Run Mode
-config.git_version=Git Version
-config.static_file_root_path=Static File Root Path
-config.log_file_root_path=Log File Root Path
-config.reverse_auth_user=Reverse Authentication User
+config.run_mode=Režim spúšťania
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
-config.ssh_config=SSH Configuration
-config.ssh_enabled=Povolené
-config.ssh_start_builtin_server=Start Builtin Server
-config.ssh_domain=Doména
-config.ssh_port=Port
-config.ssh_listen_port=Listen Port
-config.ssh_root_path=Root Path
-config.ssh_key_test_path=Key Test Path
-config.ssh_keygen_path=Keygen ('ssh-keygen') Path
-config.ssh_minimum_key_size_check=Minimum Key Size Check
-config.ssh_minimum_key_sizes=Minimum Key Sizes
+config.ssh_config=Nastavenie SSH
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
-config.repo_config=Repository Configuration
-config.repo_root_path=Koreňový adresár repozitára
-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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo_config=Nastavenie repozitára
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Konfigurácia databázy
-config.db_type=Typ
-config.db_host=Host
-config.db_name=Názov
-config.db_user=Používateľ
-config.db_ssl_mode=SSL režim
-config.db_ssl_mode_helper=(iba pre "postgres")
-config.db_path=Cesta
-config.db_path_helper=(iba pre "sqlite3" a "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Konfigurácia služby
-config.register_email_confirm=Require Email Confirmation
-config.disable_register=Zakázať registráciu
-config.show_registration_button=Show Register Button
-config.require_sign_in_view=Require Sign In View
-config.mail_notify=Mail Notification
-config.disable_key_size_check=Disable Minimum Key Size Check
-config.enable_captcha=Povoliť Captcha
-config.active_code_lives=Active Code Lives
-config.reset_password_code_lives=Reset Password Code Lives
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Webhook Configuration
-config.queue_length=Dĺžka fronty
-config.deliver_timeout=Deliver Timeout
-config.skip_tls_verify=Skip TLS Verify
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Nastavenie mailera
-config.mailer_enabled=Povolený
-config.mailer_disable_helo=Zakázať HELO
-config.mailer_name=Názov
-config.mailer_host=Host
-config.mailer_user=Používateľ
-config.send_test_mail=Send Test Email
-config.test_mail_failed=Fail to send test email to '%s': %v
-config.test_mail_sent=Test email has been sent to '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth konfigurácia
-config.oauth_enabled=Povolený
-
-config.cache_config=Konfigurácia cache
-config.cache_adapter=Cache adaptér
-config.cache_interval=Cache interval
-config.cache_conn=Cache pripojenie
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Nastavenie session
-config.session_provider=Session provider
-config.provider_config=Nastavenie providera
-config.cookie_name=Názov cookie
-config.enable_set_cookie=Enable Set Cookie
-config.gc_interval_time=GC Časový interval
-config.session_life_time=Session Life Time
-config.https_only=Iba HTTPS
-config.cookie_life_time=Cookie Life Time
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
 
-config.picture_config=Picture Configuration
-config.picture_service=Picture Service
-config.disable_gravatar=Zakázať Gravatar
-config.enable_federated_avatar=Enable Federated Avatars
+config.cache_config=Konfigurácia cache
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
 
-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.http_config=HTTP konfigurácia
+config.http.access_control_allow_origin=Access control allow origin
 
-config.log_config=Log Configuration
-config.log_mode=Mode
-config.log_options=Options
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
+
+config.picture_config=Nastavenie ikony užívateľa
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Nastavenie webových háčikov
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
+
+config.git_config=Konfigurácia Gitu
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
+
+config.log_config=Nastavenie systémových záznamov
+config.log_file_root_path=Koreňový adresár súboru systémových záznamov
+config.log_mode=Režim
+config.log_options=Možnosti
 
 monitor.cron=Cron úlohy
 monitor.name=Názov
-monitor.schedule=Schedule
+monitor.schedule=Rozvrh
 monitor.next=Nabudúce
 monitor.previous=Predchádzajúci čas
-monitor.execute_times=Execute Times
-monitor.process=Running Processes
+monitor.execute_times=Doby vykonávania
+monitor.process=Spustené procesy
 monitor.desc=Popis
-monitor.start=Start Time
-monitor.execute_time=Execution Time
+monitor.start=Čas štartu
+monitor.execute_time=Doba vykonávania
 
-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.inverse_selection=Inverse Selection
-notices.delete_selected=Delete Selected
-notices.delete_all=Delete All Notices
+notices.system_notice_list=Systémové oznámenia
+notices.view_detail_header=Zobraziť detail oznámenia
+notices.actions=Akcie
+notices.select_all=Vybrať všetko
+notices.deselect_all=Zrušiť výber všetkých
+notices.inverse_selection=Prevrátiť výber
+notices.delete_selected=Odstrániť vybrané
+notices.delete_all=Odstrániť všetky oznámenia
 notices.type=Typ
 notices.type_1=Repozitár
 notices.desc=Popis
 notices.op=Op.
-notices.delete_success=System notices have been deleted successfully.
+notices.delete_success=Systémové upozornenia boli odstránené.
 
 [action]
-create_repo=created repository <a href="%s">%s</a>
-fork_repo=forked a repository to <a href="%s">%s</a>
-rename_repo=renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a>
-commit_repo=pushed to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+create_repo=vytvoril repozitár <a href="%s">%s</a>
+rename_repo=premenoval repozitár z <code>%[1]s</code> na <a href="%[2]s">%[3]s</a>
+commit_repo=odoslal do vetvy <a href="%[1]s/src/%[2]s">%[3]s</a> v repositáři <a href="%[1]s">%[4]s</a>
 compare_commits=Zobraziť porovnanie týchto %d commitov
-transfer_repo=transfered repository <code>%s</code> to <a href="%s">%s</a>
-create_issue=`opened issue <a href="%s/issues/%s">%s#%[2]s</a>`
-close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
-reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
-comment_issue=`commented on issue <a href="%s/issues/%s">%s#%[2]s</a>`
-create_pull_request=`created pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-close_pull_request=`closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-reopen_pull_request=`reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-merge_pull_request=`merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
-delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
-push_tag=pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a>
-delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+transfer_repo=predal repozitár <code>%s</code> užívateľovi/organizácii <a href="%s">%s</a>
+create_issue=`vytvoril úlohu <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`uzatvoril úlohu <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`znovuotvoril úlohu <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`okomentoval úlohu <a href="%s/issues/%s">%s#%[2]s</a>`
+create_pull_request=`vytvoril požiadavku na stiahnutie <a href="%s/pulls/%s">%s#%[2]s</a>`
+close_pull_request=`zatvoril požiadavku na stiahnutie <a href="%s/pulls/%s">%s#%[2]s</a>`
+reopen_pull_request=`znovuotvoril požiadavku na stiahnutie <a href="%s/pulls/%s">%s#%[2]s</a>`
+merge_pull_request=`zlúčil požiadavku na stiahnutie <a href="%s/pulls/%s">%s#%[2]s</a>`
+create_branch=vytvoril novú vetvu <a href="%[1]s/src/%[2]s">%[3]s</a> v <a href="%[1]s">%[4]s</a>
+delete_branch=odstránil vetvu <code>%[2]s</code> v <a href="%[1]s">%[3]s</a>
+push_tag=odoslal značku <a href="%s/src/%s">%[2]s</a> do repozitára <a href="%[1]s">%[3]s</a>
+delete_tag=odstránená značka <code>%[2]s</code> v <a href="%[1]s">%[3]s</a>
+fork_repo=rozštiepil repozitár do <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=pred
@@ -1321,10 +1409,11 @@ months=%d mesiacov %s
 years=%d rokov %s
 raw_seconds=sekúnd
 raw_minutes=minút
+raw_hours=hours
 
 [dropzone]
-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).
+default_message=Pretiahnite súbory sem alebo stlačte Nahrať.
+invalid_input_type=Nie je možné nahrať súbory tohoto typu.
+file_too_big=Veľkosť súboru ({{filesize}} MB) je vyššia než maximálna veľkosť ({{maxFilesize}} MB).
 remove_file=Odstrániť súbor
 

conf/locale/locale_sr-SP.ini

@@ -9,7 +9,6 @@ sign_out=Одјава
 sign_up=Регистрација
 register=Регистрација
 website=Веб-страница
-version=Верзија
 page=Страница
 template=Шаблон
 language=Језик
@@ -44,6 +43,10 @@ issues=Дискусије
 
 cancel=Откажи
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Инсталација
 title=Инсталационе кораке за првог покретања
@@ -51,7 +54,7 @@ docker_helper=Ако покрећете Gogs унутар Docker, молимо
 requite_db_desc=Gogs захтева MySQL, PostgreSQL, SQLite3, MSSQL или TiDB.
 db_title=Подешавања базе
 db_type=Тип базе података
-host=Власник
+host=Домаћин
 user=Корисник
 password=Лозинка
 db_name=Назив базе података
@@ -122,6 +125,7 @@ run_user_not_match=Тренутни корисник није корисник
 smtp_host_missing_port=У адресу SMTP сервера недостаје порт.
 invalid_smtp_from=Поље SMTP From није важећи: %v
 save_config_failed=Није могуће сачувати конфигурацију: %v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=Подешавањна администратора су неправилна: %v
 install_success=Добродошли! Ми смо срећни што сте изабрали Gogs.
 invalid_log_root_path=Пут до корена журнала је неправилан: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Већ имате налог? Пријавите се!
 social_register_hepler_msg=Већ имате налог? Повежите се преко социалне мреже!
 disable_register_prompt=Извините регистрација је онемогућено. Молимо вас, контактирајте администратора.
 disable_register_mail=Извините, потврда путем поште је онемогућено.
+auth_source=Извор аутентикације
+local=Локално
 remember_me=Запамти ме
 forgot_password=Заборављена лозинка
 forget_password=Заборавили сте лозинку?
@@ -229,6 +235,7 @@ org_name_been_taken=Име организације је већ заузето.
 team_name_been_taken=Име екипе је већ заузето.
 email_been_used=Адреса е-поште се већ користи.
 username_password_incorrect=Корисничко име или лозинка није исправна.
+auth_source_mismatch=Изабрани извор потврде идентитета није повезан са корисником.
 enterred_invalid_repo_name=Молимо вас, проверите да је име спремишта тачно унешено.
 enterred_invalid_owner_name=Молимо вас проверите да сте добро унели име власника.
 enterred_invalid_password=Молимо вас проверите да сте добро унели лозинку.
@@ -256,8 +263,7 @@ following=Пратим
 follow=Прати
 unfollow=Престани да пратиш
 
-form.name_reserved=Корисничко име '%s' је резервирано.
-form.name_pattern_not_allowed=Корисничко име ликом '%s' није дозвољено.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Профил
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Или унесите тајну шифру:
 two_factor_then_enter_passcode=Па унесите шифру:
 two_factor_verify=Проверити
 two_factor_invalid_passcode=Шифрa коју сте унели није важећа, молим бас пробајте поново!
+two_factor_reused_passcode=Љифром који сте унијели се већ користи, молим те пробај опет!
 two_factor_enable_error=Активација двоструке аутентификације није успела: %v
 two_factor_enable_success=Двострука аутентификација је успешно активирана за ваш налог!
 two_factor_recovery_codes_title=Шифра за опоравак за двоструку аутентификацију
@@ -370,6 +377,7 @@ delete_token=Уклони
 access_token_deletion=Уклоњење токена личног приступа
 access_token_deletion_desc=Уклоњење овог токена ће онемогућити сав приступ. Да ли желите да наставите?
 delete_token_success=Лични токен је успешно избришен! Не заборавите да ажурирате апликацију.
+token_name_exists=Token with same name already exists.
 
 orgs.none=Нисте члан било које организације.
 orgs.leave_title=Напусти организацију
@@ -417,10 +425,11 @@ mirror_last_synced=Задње синхронизовано
 watchers=Посматрачи
 stargazers=Пратиоци
 forks=Огранци
+repo_description_helper=Опис спремишта. Максимум 512 карактера.
+repo_description_length=Доступни карактери
 
 form.reach_limit_of_creation=Власник има максимум број %d спремишта.
-form.name_reserved=Име спремишта '%s' је резервирано.
-form.name_pattern_not_allowed=Име спремишта по шаблоном '%s' није дозвољено.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Потребна ауторизација
 migrate_type=Тип миграције
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Садржај датотеке је пром
 editor.file_already_exists=Датотека са именом '%s' већ постоји у овом спремишту.
 editor.no_changes_to_show=Нема никаквих промена.
 editor.fail_to_update_file=Промена над '%s' није успело са грешком: %v
+editor.fail_to_delete_file=Фајл '%s' није успешно обрисан, разлог грешке: %v
 editor.add_subdir=Додај поддиректоријуми...
 editor.unable_to_upload_files=Учитање датотеке '%s' није успело са грешкном: %v
 editor.upload_files_to_dir=Пошаљи датотеке на '%s'
@@ -632,8 +642,9 @@ pulls.is_checking=Провера још увек у току, молимо ва
 pulls.can_auto_merge_desc=Овај захтев за спајање може бити обављен аутоматски.
 pulls.cannot_auto_merge_desc=Овај захтев за спајање не може бити обављен аутоматски због сукоба.
 pulls.cannot_auto_merge_helper=Молимо вас, обавите спајање ручно да би сте разрешили сукобе.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Направите спајање
+pulls.rebase_before_merging=Поврат пре обједињавања
+pulls.commit_description=Опис ревизије
 pulls.merge_pull_request=Обави спајање
 pulls.open_unmerged_pull_exists=`Неможете поново отворити јер већ постоји захтев за спајање (#%d) из истог спремишта са истим информацијама о спајању и чека спајање.`
 pulls.delete_branch=Избришите грану
@@ -738,9 +749,9 @@ settings.tracker_issue_style=Стил именовања на спољном с
 settings.tracker_issue_style.numeric=Нумерично
 settings.tracker_issue_style.alphanumeric=Алфанумерично
 settings.tracker_url_format_desc=Можете да користите шаблон <code>{user} {repo} {index}</code> за корисничко име, спремишта и задатака.
-settings.pulls_desc=Омогући систем захтева за спајање да би сте преузели јавних доприноса
-settings.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Enable pull requests to accept contributions between repositories and branches
+settings.pulls.ignore_whitespace=Занемарите промене у размаку
+settings.pulls.allow_rebase_merge=Дозволи употребу поврата да обједините обавезе
 settings.danger_zone=Опасна зона
 settings.cannot_fork_to_same_owner=Не можете поделити спремиште власнику.
 settings.new_owner_has_same_repo=Нови власник већ има спремиште по истим називом. Молимо вас изаберите друго име.
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Вики подаци за ово спремиш
 settings.delete=Уклони ово спремиште
 settings.delete_desc=Нећете мочи повратити спремиште после брисања. Молимо вас, будите сигурни.
 settings.delete_notices_1=- Ова операција <strong>НЕЋЕ МОЧИ</strong> бити укинута.
-settings.delete_notices_2=- Ова операција ће трајно избрисати све из овог спремишта, укључујући и податке Git, задатци, коментаре и приступ сарадницима.
+settings.delete_notices_2=- Ова операција ће трајно избрисати све из овог спремишта, укључујући податке Git, задатке, коментаре и приступ сарадницима.
 settings.delete_notices_fork_1=- Сви огранци ће постати независни после уклањање.
 settings.deletion_success=Спремиште је успешно избрисано!
 settings.update_settings_success=Подешавања спремишта су успешно ажурирани.
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=Овај корисник неће имат
 settings.remove_collaborator_success=Сарадник је уклоњен.
 settings.search_user_placeholder=Претрага корисника...
 settings.org_not_allowed_to_be_collaborator=Неможе се додати организација као сарадник.
-settings.add_webhook=Додај Webhook
 settings.hooks_desc=Webhooks омогућавају спољашњим услугама да приме обавештења када се нешто одређено догоди на Gogs. Сазнајте више у овом <a target="_blank" href="%s">водичу за Webhooks</a>.
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Додај Webhook
 settings.webhook_deletion=Уклони Webhook
 settings.webhook_deletion_desc=Брисање овог Webhook ће довести до уклањања сву наведену информацију, укључујући и историју. Да ли желите да наставите?
 settings.webhook_deletion_success=Webhook успешно избрисан!
@@ -792,6 +805,8 @@ settings.webhook.response=Одговор
 settings.webhook.headers=Наслови
 settings.webhook.payload=Садржај захтева
 settings.webhook.body=Тело
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git Hooks пружају Git сами по себи. Можете ажурирати датотеке са подржаним hooks са пратећег списка операције.
 settings.githook_edit_desc=Aко Webhook није активан, примерни садржај ће бити представљен. Ако оставите празно, Webhook ће бити онемогућен.
 settings.githook_name=Име Hook-а
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push у спремиште
 settings.event_issues=Задаци
 settings.event_issues_desc=Проблем је отворен, затворен, поново отворен, уређен, додељен, не додељен, етикета је ажурирана, етикета је очишћена, помјерена или демилестирана.
-settings.event_issue_comment=Коментар проблема
-settings.event_issue_comment_desc=Коментар проблема креиран, уређиван или избришен.
 settings.event_pull_request=Захтев за спајање
 settings.event_pull_request_desc=Захтев за спајање отворенo, затворено, додељено, недодељенo, ознака ажурирана, ознака избрисана, створена прекретница, избрисана прекретница, или синхронизовано.
+settings.event_issue_comment=Коментар проблема
+settings.event_issue_comment_desc=Коментар проблема креиран, уређиван или избришен.
 settings.event_release=Издање
 settings.event_release_desc=Издање објављено на спремишту.
 settings.active=Активно
@@ -852,6 +867,8 @@ settings.add_key_success=Нови кључ распоређивање '%s' је
 settings.deploy_key_deletion=Уклони кључ распоређивањa
 settings.deploy_key_deletion_desc=Брисање овог кључа за распоређивање ће довести до укидање приступ на овом спремишту. Да ли желите да наставите?
 settings.deploy_key_deletion_success=Кључ за распоређивање је успешно обрисан!
+settings.description_desc=Опис спремишта. Максимум 512 карактера.
+settings.description_length=Доступни карактери
 
 diff.browse_source=Преглед изворни кода
 diff.parent=родитељ
@@ -916,9 +933,8 @@ team_name_helper=Ви ћете користити то име помињете
 team_desc_helper=Шта је циљ овог тима?
 team_permission_desc=Који ниво приступа треба имати овај тим?
 
-form.name_reserved=Име организације '%s' је резервирано.
-form.name_pattern_not_allowed=Шаблон имена '%s' није дозвољено.
-form.team_name_reserved=Име тима '%s' је резервисано.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Подешавања
 settings.options=Опције
@@ -990,12 +1006,19 @@ first_page=Први
 last_page=Последњи
 total=Укупно: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 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> watches, <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> webhooks, <b>%d</b> фаза, <b>%d</b> лабела, <b>%d</b> hook задатака, <b>%d</b> тимова, <b>%d</b> задатака за надоградњу, <b>%d</b> прилога.
 dashboard.operation_name=Име операције
 dashboard.operation_switch=Пребаци
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Покрени
 dashboard.clean_unbind_oauth=Уклони неповазане OAuth
 dashboard.clean_unbind_oauth_success=Неповезане OAuth налози су успешно избрисани.
@@ -1087,11 +1110,12 @@ repos.stars=Фаворити
 repos.issues=Задаци
 repos.size=Величина
 
-auths.auth_manage_panel=Контролна панела аутентикације
+auths.auth_sources=Извори аутентичности
 auths.new=Додај нови извор
 auths.name=Име
 auths.type=Тип
 auths.enabled=Омогућено
+auths.default=Default
 auths.updated=Ажурирано
 auths.auth_type=Врста провере аутентичности
 auths.auth_name=Име провере аутентичности
@@ -1100,7 +1124,7 @@ auths.domain=Домен
 auths.host=Хост
 auths.port=Порт
 auths.bind_dn=Bind DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Можете користити „%s” као место за корисничко име, e.g. DOM\%s
 auths.bind_password=Bind лозинкa
 auths.bind_password_helper=Упозорење: Ова лозинка је сачувана у облику нешифрованом текцту. Не користите високо-привилеговану налог.
 auths.user_base=База претраживање корисника
@@ -1128,9 +1152,9 @@ auths.enable_tls=Омогући TLS шифровање
 auths.skip_tls_verify=Прескочи TLS проверу
 auths.pam_service_name=Назив PAM сервиса
 auths.enable_auto_register=Омогући аутоматску регистрацију
-auths.tips=Савети
 auths.edit=Промените подешавања канала аутентикације
 auths.activated=Овај канал аутентикације је активан
+auths.default_auth=This authentication is default login source
 auths.new_success=Нови канал аутентикације '%s' је успешно креиран.
 auths.update_success=Подешавања канала аутентикације су успешно ажурирана.
 auths.update=Ажурирај подешавања аутентикације
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Овај канал аутентикације ће би
 auths.still_in_used=Овај канал аутентикације још увек се користи од стране неких корисника, уклоните или пребаци ове кориснике у друг врсту аутентикације.
 auths.deletion_success=Канал аутентикације успешно избрисан!
 auths.login_source_exist=Улазни извор '%s' већ постоји.
+auths.github_api_endpoint=API Endpoint
 
-config.not_set=(not set)
+config.not_set=(није подешено)
 config.server_config=Конфигурација сервера
-config.app_name=Име апликације
-config.app_ver=Верзија апликације
-config.app_url=URL адреса апликације
-config.domain=Домен
-config.offline_mode=Режим ван мреже
-config.disable_router_log=Онемогући журнал рутера
+config.brand_name=Brand name
 config.run_user=Покретни корисник
 config.run_mode=Режим извршавања
-config.git_version=Git Version
-config.static_file_root_path=Пут до статичке датотеке
-config.log_file_root_path=Пут до журнала
-config.reverse_auth_user=Корисничко име при обрнуту аутентикацију
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH конфигурација
-config.ssh_enabled=Омогућено
-config.ssh_start_builtin_server=Покрени уграђени сервер
-config.ssh_domain=Домен
-config.ssh_port=Порт
-config.ssh_listen_port=Порт за слушање
-config.ssh_root_path=Основни пут
-config.ssh_key_test_path=Пут до кључу
-config.ssh_keygen_path=Пут до генератор кључева ('ssh-keygen')
-config.ssh_minimum_key_size_check=Минимална величина провера кључа
-config.ssh_minimum_key_sizes=Минимална величина кључева
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 config.repo_config=Конфигурација спремишта
-config.repo_root_path=Пут до корена спремишта
-config.script_type=Врста скрипта
-config.repo_force_private=Force Private
-config.max_creation_limit=Ограничење максималне креације
-config.preferred_licenses=Преференцијалне лиценце
-config.disable_http_git=Онемогући HTTP Git
-config.enable_local_path_migration=Омогући миграцију локалнe путањe
-config.commits_fetch_concurrency=Предузеће Fetch Concurrency
-
-config.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Конфигурација базе података
-config.db_type=Тип
-config.db_host=Хост
-config.db_name=Име
-config.db_user=Корисник
-config.db_ssl_mode=Режим SSL
-config.db_ssl_mode_helper=(само за postgres)
-config.db_path=Пут
-config.db_path_helper=(за "sqlite3" и "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Подешавања сервиса
-config.register_email_confirm=Потражи потврду путем е-поштом
-config.disable_register=Искључи нове регистрације
-config.show_registration_button=Прикажи дугме за регистрацију
-config.require_sign_in_view=Прикажи налог за пријаву
-config.mail_notify=Обавештења преко е-поште
-config.disable_key_size_check=Онемогући проверу на минималној величини кључа
-config.enable_captcha=Омогући Captcha
-config.active_code_lives=Дужина живота активних кодова
-config.reset_password_code_lives=Дужина живота ресетних кодова за лозинку
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Подешавања Webhook
-config.queue_length=Дужина реда
-config.deliver_timeout=Време до отказивање слања
-config.skip_tls_verify=Прескочи TLS проверу
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Подешавања поште
-config.mailer_enabled=Омогућено
-config.mailer_disable_helo=Онемогући HELO
-config.mailer_name=Име
-config.mailer_host=Хост
-config.mailer_user=Корисник
-config.send_test_mail=Пошаљи тест поруку
-config.test_mail_failed=Тест писмо '%s' није пошаљено: %v
-config.test_mail_sent=Тест писмо је послато '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Подешавања OAuth
-config.oauth_enabled=Укључено
-
-config.cache_config=Подешавања кеша
-config.cache_adapter=Кеш адаптер
-config.cache_interval=Кеш интервал
-config.cache_conn=Кеш на вези
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Подешавања сесије
-config.session_provider=Добављач сесија
-config.provider_config=Конфигурација на добављачу
-config.cookie_name=Име датотеке cookie
-config.enable_set_cookie=Укључи поставку cookie
-config.gc_interval_time=Интервал cакупљања смећа
-config.session_life_time=Дужина живота сесјие
-config.https_only=Само HTTPS
-config.cookie_life_time=Дужина живота датотеке cookie
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Подешавања кеша
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP Конфигурација
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Подешавање слика
-config.picture_service=Услуга за слике
-config.disable_gravatar=Онемогући Gravatar
-config.enable_federated_avatar=Омогући Federated Avatars
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Подешавања Webhook
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Git конфигурација
-config.git_disable_diff_highlight=Онемогући бојење синтаксе када гледате разлике
-config.git_max_diff_lines=Максималан број различитих редова (у датотеци)
-config.git_max_diff_line_characters=Максималан број различитих карактера (у реду)
-config.git_max_diff_files=Максималан број измењених датотека (приказаних)
-config.git_gc_args=Аргументи на cакупљање смећа
-config.git_migrate_timeout=Време до отказања миграције
-config.git_mirror_timeout=Време до отазање синхронизацији огледала
-config.git_clone_timeout=Време до отказивања клонирањем
-config.git_pull_timeout=Време до отказивања pull операцији
-config.git_gc_timeout=Време до отказивања cакупљање смећа
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Kонфигурација журнала
+config.log_file_root_path=Пут до журнала
 config.log_mode=Режим
 config.log_options=Опције
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Системска обавештавања су успе
 
 [action]
 create_repo=креира спремиште <a href="%s">%s</a>
-fork_repo=отворио спремиште <a href="%s">%s</a>
 rename_repo=преимензје спремиште од <code>%[1]s</code> на <a href="%[2]s">%[3]s</a>
 commit_repo=извршује push на <a href="%[1]s/src/%[2]s">%[3]s</a> у <a href="%[1]s">%[4]s</a>
 compare_commits=Поређење ових %d комита
@@ -1300,6 +1384,10 @@ create_branch=створи нову филијалy <a href="%[1]s/src/%[2]s">%[
 delete_branch=избрисана филијалa <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=извршује push са ознаком <a href="%s/src/%s">%[2]s</a> на <a href="%[1]s">%[3]s</a>
 delete_tag=избрисана ознака <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+fork_repo=отворио спремиште <a href="%s">%s</a>
+mirror_sync_push=синхронизује се <a href="%[1]s/src/%[2]s">%[3]s</a> у <a href="%[1]s">%[4]s</a> из огледала
+mirror_sync_create=синхронизована нова референца <a href="%s/src/%s">%[2]s</a> y <a href="%[1]s">%[3]s</a> из огледала
+mirror_sync_delete=синхронизоване и избрисане референце <code>%[2]s</code> y <a href="%[1]s">%[3]s</a> из огледала
 
 [tool]
 ago=пре
@@ -1321,6 +1409,7 @@ months=%[2]s %[1]d месеци
 years=%[2]s %[1]d година
 raw_seconds=секунди
 raw_minutes=минута
+raw_hours=hours
 
 [dropzone]
 default_message=Превуците датотеку овде или кликните за преузимање.

conf/locale/locale_sv-SE.ini

@@ -9,7 +9,6 @@ sign_out=Logga ut
 sign_up=Registrera dig
 register=Registrera dig
 website=Webbplats
-version=Version
 page=Sida
 template=Mall
 language=Språk
@@ -44,6 +43,10 @@ issues=Problem
 
 cancel=Avbryt
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Installation
 title=Steg för att installera för första gången
@@ -122,6 +125,7 @@ run_user_not_match=Köranvändaren är inte aktuell användare: %s -> %s
 smtp_host_missing_port=SMTP-värden saknar port i adressen.
 invalid_smtp_from=SMTP från fält är inte giltigt: %v
 save_config_failed=Konfigurationssparningen misslyckades: %v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=Inställningarna för administratörskontot är felaktiga: %v
 install_success=Välkommen! Vi är glada att du väljer Gogs, ha kul och ta hand om dig.
 invalid_log_root_path=Ogiltig rotsökväg för loggfiler: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Har du redan ett konto? Logga in nu!
 social_register_hepler_msg=Har du redan ett konto? Anslut det nu!
 disable_register_prompt=Tyvärr är användarregistreringen inaktiverad. Vänligen kontakta din administratör.
 disable_register_mail=Tyvärr så är registreringsbekräftelemailutskick inaktiverat.
+auth_source=Authentication Source
+local=Lokal
 remember_me=Kom ihåg mig
 forgot_password=Glömt lösenord
 forget_password=Glömt lösenordet?
@@ -229,6 +235,7 @@ org_name_been_taken=Organisationsnamnet har redan används.
 team_name_been_taken=Team namn är redan använt.
 email_been_used=E-postadressen har redan använts.
 username_password_incorrect=Användarnamnet eller lösenordet är inte korrekt.
+auth_source_mismatch=The authentication source selected is not associated with the user.
 enterred_invalid_repo_name=Se till att utvecklingskatalogen som du angav är rätt.
 enterred_invalid_owner_name=Kontrollera att ägarnamnet som du angav är rätt.
 enterred_invalid_password=Se till att den som lösenord du angett är rätt.
@@ -256,8 +263,7 @@ following=Följer
 follow=Följ
 unfollow=Sluta följa
 
-form.name_reserved=Användarnamnet "%s" är reserverad.
-form.name_pattern_not_allowed=Användarnamnet '%s' är inte tillåtet.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Profil
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Or enter the secret:
 two_factor_then_enter_passcode=Ange sedan lösenordet:
 two_factor_verify=Verifiera
 two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_reused_passcode=The passcode you entered has already been used, please try another one!
 two_factor_enable_error=Enable Two-factor authentication failed: %v
 two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
 two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
@@ -370,6 +377,7 @@ delete_token=Radera
 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å.
+token_name_exists=Token with same name already exists.
 
 orgs.none=Du är inte en medlem i någon organisation.
 orgs.leave_title=Lämna en organisation
@@ -417,10 +425,11 @@ mirror_last_synced=Senast synkad
 watchers=Observerare
 stargazers=Stjärnmärkare
 forks=Forks
+repo_description_helper=Description of repository. Maximum 512 characters length.
+repo_description_length=Available characters
 
 form.reach_limit_of_creation=Ägaren har nått maxgränsen av %d skapade repon.
-form.name_reserved=Namnet '%s' på utvecklingskatalogen är reserverat.
-form.name_pattern_not_allowed=Reponamnet '%s' är inte tillåtet.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Tillstånd Krävs
 migrate_type=Migreringstyp
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Filinnhållet har ändrats sedan du började r
 editor.file_already_exists=En fil med namnet '%s' finns redan i förrådet.
 editor.no_changes_to_show=Det finns inga ändringar att visa.
 editor.fail_to_update_file=Uppdateringen/skapandet av filen '%s' misslyckades med felet: %v
+editor.fail_to_delete_file=Failed to delete file '%s' with error: %v
 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'
@@ -634,6 +644,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.create_merge_commit=Create a merge commit
 pulls.rebase_before_merging=Rebase before merging
+pulls.commit_description=Commit Description
 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=Ta bort gren
@@ -707,7 +718,7 @@ settings.protect_require_pull_request_desc=Enable this option to disable direct
 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. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
-settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_search_users=Sök användare
 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!
@@ -738,7 +749,7 @@ settings.tracker_issue_style=Namngivningsstil hos det externa ärendehanteringsy
 settings.tracker_issue_style.numeric=Numerisk
 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.pulls_desc=Enable pull requests to accept contributions between repositories and branches
 settings.pulls.ignore_whitespace=Ignore changes in whitespace
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Högrisksområde
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Förrådets wikidata har tagits bort.
 settings.delete=Ta Bort Detta Repo
 settings.delete_desc=När du har tagit bort ett repo så finns det ingen återvändo. Var säker på vad du gör.
 settings.delete_notices_1=- Denna åtgärd kan <strong>INTE</strong> ångras.
-settings.delete_notices_2=- Denna åtgärd kommer permanent ta bort hela repot, includerat git-datan, ärenden, kommentarer, och åtkomst för deltagare.
+settings.delete_notices_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
 settings.delete_notices_fork_1=- Alla förgreningar kommer bli oberoende efter borttagning.
 settings.deletion_success=Repot har tagits bort!
 settings.update_settings_success=Repo-inställningar har uppdaterats.
@@ -777,8 +788,10 @@ 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.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.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Lägg Till Webbhook
 settings.webhook_deletion=Ta Bort Webbhook
 settings.webhook_deletion_desc=Borttagning av denna webbhook kommer att ta bort all dess information och all leveranshistorik. Är du säker på att du vill fortsätta?
 settings.webhook_deletion_success=Webbhook har tagits bort!
@@ -792,6 +805,8 @@ settings.webhook.response=Svar
 settings.webhook.headers=Huvuden
 settings.webhook.payload=Nyttolast
 settings.webhook.body=Innehåll
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git-krokar är en del av Git själv. För att utföra anpassade operationer kan du redigera filerna för de krokar som stöds i listan nedan.
 settings.githook_edit_desc=Om kroken är inaktiv visas exempelinnehåll. Inaktivera denna krok genom att lämna innehållet tomt.
 settings.githook_name=Kroknamn
@@ -819,10 +834,10 @@ settings.event_push=Pusha
 settings.event_push_desc=Uppladdning till ett förråd
 settings.event_issues=Issues
 settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment=Issue Comment
-settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_pull_request=Hämtningsbegäran
 settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_release=Release
 settings.event_release_desc=Release published in a repository.
 settings.active=Aktiv
@@ -852,6 +867,8 @@ settings.add_key_success=Den nya driftsättningsnyckeln '%s' har lagts till!
 settings.deploy_key_deletion=Ta bort distribueringsnyckel
 settings.deploy_key_deletion_desc=Borttagning av detta distributionsnyckel kommer att ta bort all relaterad åtkomst till det här repot. Vill du fortsätta?
 settings.deploy_key_deletion_success=Distributionsnyckeln har tagits bort!
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=Bläddra i källkod
 diff.parent=förälder
@@ -916,9 +933,8 @@ team_name_helper=Du kan använda detta namn för att nämna denna grupp i konver
 team_desc_helper=Vad handlar denna grupp om?
 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.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Inställningar
 settings.options=Alternativ
@@ -990,12 +1006,19 @@ first_page=Första
 last_page=Sista
 total=Totalt: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Statistik
 dashboard.operations=Operationer
 dashboard.system_status=Systemstatus
 dashboard.statistic_info=Gogs-databasen innehåller <b>%d</b> användare, <b>%d</b> organisationer, <b>%d</b> publika nyckar, <b>%d</b> förråd, <b>%d</b> vakter, <b>%d</b> stjärnor, <b>%d</b> handlingar, <b>%d</b> åtkomster, <b>%d</b> ärenden, <b>%d</b> kommentarer, <b>%d</b> sociala konton, <b>%d</b> följbegäran, <b>%d</b> speglingar, <b>%d</b> släpp, <b>%d</b> inloggningskällor, <b>%d</b> webbkrokar, <b>%d</b> milstolpar, <b>%d</b> etiketter, <b>%d</b> krokuppgifter, <b>%d</b> team, <b>%d</b> uppdateringsuppgifter, <b>%d</b> bilagor.
 dashboard.operation_name=Operationsnamn
 dashboard.operation_switch=Byt till
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Kör
 dashboard.clean_unbind_oauth=Rensa obundna OAuth-begäran
 dashboard.clean_unbind_oauth_success=Alla obundna OAuth-begäran har tagit
@@ -1087,11 +1110,12 @@ repos.stars=Stjärnor
 repos.issues=Ärenden
 repos.size=Size
 
-auths.auth_manage_panel=Panel för hantering av autentisering
+auths.auth_sources=Authentication Sources
 auths.new=Lägg till ny källa
 auths.name=Namn
 auths.type=Typ
 auths.enabled=Aktiv
+auths.default=Default
 auths.updated=Uppdaterad
 auths.auth_type=Autentiseringstyp
 auths.auth_name=Autentiseringsnamn
@@ -1128,9 +1152,9 @@ 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
-auths.tips=Tips
 auths.edit=Edit Authentication Setting
 auths.activated=This authentication is activated
+auths.default_auth=This authentication is default login source
 auths.new_success=New authentication '%s' has been added successfully.
 auths.update_success=Authentication setting has been updated successfully.
 auths.update=Update Authentication Setting
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=This authentication is going to be deleted, do you want t
 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.github_api_endpoint=API Endpoint
 
 config.not_set=(not set)
 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.static_file_root_path=Static File Root Path
-config.log_file_root_path=Log File Root Path
-config.reverse_auth_user=Reverse Authentication User
+config.brand_name=Brand name
+config.run_user=Run user
+config.run_mode=Run mode
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 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
-config.ssh_listen_port=Lyssningsport
-config.ssh_root_path=Rotsökväg
-config.ssh_key_test_path=Testsökväg för nyckel
-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.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
-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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo_config=Repository configuration
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Databaskonfiguration
-config.db_type=Typ
-config.db_host=Värd
-config.db_name=Namn
-config.db_user=Användare
-config.db_ssl_mode=SSL-läge
-config.db_ssl_mode_helper=(endast för "postgres")
-config.db_path=Sökväg
-config.db_path_helper=(för "sqlite3" och "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Tjänstkonfiguration
-config.register_email_confirm=Kräv bekräftelse via e-post
-config.disable_register=Avaktivera registrering
-config.show_registration_button=Visa registreringsknapp
-config.require_sign_in_view=Kräv inloggningsvy
-config.mail_notify=E-postavisering
-config.disable_key_size_check=Avaktivera kontroll av minsta tillåtna nyckelstorlek
-config.enable_captcha=Aktivera Captcha
-config.active_code_lives=Aktivera livstid för koder
-config.reset_password_code_lives=Livstid för koder för återställning av lösenord
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Webbkrokskonfiguration
-config.queue_length=Kölängd
-config.deliver_timeout=Tidsfrist för leverans
-config.skip_tls_verify=Skippa verifikation av TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Konfiguration för e-postutskick
-config.mailer_enabled=Aktiverad
-config.mailer_disable_helo=Avaktivera HELO
-config.mailer_name=Namn
-config.mailer_host=Server
-config.mailer_user=Användare
-config.send_test_mail=Skicka testmeddelande
-config.test_mail_failed=Misslyckades skicka testmeddelande till '%s': %v
-config.test_mail_sent=Testmeddelande har skickats till '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=OAuth-konfiguration
-config.oauth_enabled=Aktiverad
-
-config.cache_config=Mellanlagringskonfiguration
-config.cache_adapter=Mellanlagringsadapter
-config.cache_interval=Mellanlagringsintervall
-config.cache_conn=Mellanlagringsanslutning
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Sessionskonfiguration
-config.session_provider=Sessionsleverantör
-config.provider_config=Leverantörskonfiguration
-config.cookie_name=Cookie-namn
-config.enable_set_cookie=Aktivera sättning av kaka
-config.gc_interval_time=Tidsintervall för skräpsamling
-config.session_life_time=Livstid för session
-config.https_only=Endast HTTPS
-config.cookie_life_time=Livstid för kaka
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Mellanlagringskonfiguration
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP configuration
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Bildkonfiguration
-config.picture_service=Bildtjänst
-config.disable_gravatar=Inaktivera gravatar
-config.enable_federated_avatar=Enable Federated Avatars
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Webbkrokskonfiguration
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 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-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.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Logg-konfiguration
+config.log_file_root_path=Log file root path
 config.log_mode=Mode
 config.log_options=Options
 
@@ -1283,7 +1368,6 @@ notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=skapade utvecklingskatalog <a href="%s"> %s</a>
-fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a>
 commit_repo=pushed to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
 compare_commits=View comparison for these %d commits
@@ -1300,6 +1384,10 @@ create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href=
 delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a>
 delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=sedan
@@ -1321,6 +1409,7 @@ months=%d månader %s
 years=%d år %s
 raw_seconds=sekunder
 raw_minutes=minuter
+raw_hours=hours
 
 [dropzone]
 default_message=Drop files here or click to upload.

conf/locale/locale_uk-UA.ini

@@ -1,4 +1,4 @@
-app_desc=Зручний сервіс власного Git хостінгу, написаний на Go
+app_desc=Зручний сервіс власного Git хостінгу
 
 home=Головна сторінка
 dashboard=Щиток
@@ -9,7 +9,6 @@ sign_out=Вийти
 sign_up=Реєстрація
 register=Реєстрація
 website=Веб-сторінка
-version=Версія
 page=Сторінка
 template=Шаблон
 language=Мова
@@ -44,6 +43,10 @@ issues=Проблеми
 
 cancel=Скасувати
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=Установка
 title=Кроки установки перед першим запуском
@@ -73,7 +76,7 @@ run_user_helper=Користувач мусить мати доступ до к
 domain=Домен
 domain_helper=Це впливає на клонування через SSH.
 ssh_port=SSH порт
-ssh_port_helper=Номер порту, який використовує SSH сервер. Для заборони опції SSH залиште його пустим.
+ssh_port_helper=Номер порту, який використовує SSH сервер. Для заборони опції SSH залиште його порожнім.
 use_builtin_ssh_server=Користуватися вбудованим SSH сервером
 use_builtin_ssh_server_popup=Запустити вбудований SSH сервер для операцій git інакший за системний SSH демон.
 http_port=Порт HTTP
@@ -122,6 +125,7 @@ run_user_not_match=Користувач, що здійснює запуск, н
 smtp_host_missing_port=В адресі SMTP-хосту не вистачає порту.
 invalid_smtp_from=Невалідне SMTP поле Від: %v
 save_config_failed=Не в змозі зберегти конфігурацію: %v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=Неприпустимі налаштування облікового запису адміністратора: %v
 install_success=Вітаємо! Ми раді, що ви обрали Gogs, отримуйте задоволення і будьте обережні.
 invalid_log_root_path=Шлях до лог файлу хибний: %v
@@ -151,6 +155,8 @@ register_hepler_msg=Вже зареєстровані? Увійдіть зара
 social_register_hepler_msg=Вже зареєстровані? Прив'яжіть зараз!
 disable_register_prompt=Вибачте, реєстрація відключена. Будь ласка, зв'яжіться з адміністратором сайту.
 disable_register_mail=На жаль, підтвердження реєстрації на електрону пошту було відключено.
+auth_source=Джерело автентифікації
+local=Локальний
 remember_me=Запам'ятати мене
 forgot_password=Забув пароль
 forget_password=Забули пароль?
@@ -229,6 +235,7 @@ org_name_been_taken=Назва організаціі вже використо
 team_name_been_taken=Назва команди вже використовується.
 email_been_used=Адреса електронної пошти вже використовується.
 username_password_incorrect=Ім'я користувача або пароль помилкові.
+auth_source_mismatch=Обране джерело автентифікації не асоційовано з користувачем.
 enterred_invalid_repo_name=Переконайтеся, що ви ввели назву сховища правильно.
 enterred_invalid_owner_name=Переконайтеся, що ви ввели ім'я власника правильно.
 enterred_invalid_password=Переконайтеся, що ви ввели пароль правильно.
@@ -256,8 +263,7 @@ following=Слідкувати
 follow=Підписатися
 unfollow=Відписатися
 
-form.name_reserved=Ім'я користувача "%s" зарезервовано.
-form.name_pattern_not_allowed=Шаблон Імені користувача '%s' не допускається.
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=Профіль
@@ -316,7 +322,7 @@ add_email_success=Вашу нову адресу електронної пошт
 
 manage_ssh_keys=Керувати ключами SSH
 add_key=Додати ключ
-ssh_desc=Це список ключів SSH, пов'язані з вашим обліковим записом. Видаліть будь-які ключі, які не є вашими.
+ssh_desc=Це список ключів SSH, пов'язані з вашим обліковим записом. Ці ключі дозволять кому завгодно отримувати доступ до вашого репозиторію, тож будьте певні що ви впізнаєте їх.
 ssh_helper=<strong>Потрібна допомога?</strong> Дивіться гід на GitHub з <a href="%s"> генерації ключів SSH</a> або виправлення <a href="%s">типових неполадок SSH</a>.
 add_new_key=Додати SSH ключа
 ssh_key_been_used=Було використано публічний ключ.
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=Або введіть секрет:
 two_factor_then_enter_passcode=Потім введіть пароль:
 two_factor_verify=Перевірити
 two_factor_invalid_passcode=Введений пароль не валідний, будь ласка, спробуйте ще раз!
+two_factor_reused_passcode=Введений пасскод вже було використано. Будь ласка, спробуйте інший!
 two_factor_enable_error=Увімкнення двофакторної автентифікації не вдалося: %v
 two_factor_enable_success=Двофакторну автентифікацію успішно активовано для вашого акаунту!
 two_factor_recovery_codes_title=Пароль відновлення для двофакторної автентифікації
@@ -368,8 +375,9 @@ generate_token=Створити жетон
 generate_token_succees=Новий жетон було створено успішно! Переконайтеся, що Ви скопіювали Ваш новий жетон доступу. Ви не зможете побачити його знову!
 delete_token=Видалити
 access_token_deletion=Видалення токену персонального доступу
-access_token_deletion_desc=Видалення цього токену призведе до видалення усіх пов’язаних доступів додатку. Продовжити?
+access_token_deletion_desc=Видалення цього токену призведе до неможливості доступу усіх пов’язаних додатків. Продовжити?
 delete_token_success=Персональний токен було видалено. Не забудьте перевірити ваш додаток.
+token_name_exists=Токен з таким ім'ям вже існує.
 
 orgs.none=Ви не є членом будь-якої організації.
 orgs.leave_title=Залишити організацію
@@ -397,7 +405,7 @@ visiblity_fork_helper=(Зміна даного значення вплине н
 clone_helper=Потрібна допомога у клонуванні? Відвідайте <a target="_blank" href="%s"> допомогу</a>!
 fork_repo=Відгалужити репозиторій
 fork_from=Відгалужити з
-fork_visiblity_helper=Не можна змінити видимість відгалуженого репозиторія
+fork_visiblity_helper=Не можна змінити видимість відгалуженого репозиторія.
 repo_desc=Опис
 repo_lang=Мова
 repo_gitignore_helper=Виберіть .gitignore файли
@@ -410,17 +418,18 @@ create_repo=Створити репозиторій
 default_branch=Головна гілка
 mirror_prune=Підчищати
 mirror_prune_desc=Видалити всі відслідковувані посилання, які більше не існують на віддаленому
-mirror_interval=Інтервал джеркалювання (години)
+mirror_interval=Інтервал дзеркалювання (години)
 mirror_address=Адреса дзеркала
 mirror_address_desc=Будь ласка, вкажіть необхідні дані користувача у адресі.
 mirror_last_synced=Востаннє синхронізовано
 watchers=Спостерігачі
 stargazers=Шанувальники
 forks=Відгалуження
+repo_description_helper=Опис репозиторію. До 512-ти символів довжиною.
+repo_description_length=Доступні символи
 
 form.reach_limit_of_creation=Власник досягнув максимальної кількості у %d створених репозиторіїв.
-form.name_reserved=Назва репозиторія '%s' зарезервовано.
-form.name_pattern_not_allowed=Шаблон назви репозиторія '%s' не є дозволеним.
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=Потрібна авторизація
 migrate_type=Тип міграції
@@ -491,7 +500,7 @@ editor.delete_this_file=Видалити цей файл
 editor.must_have_write_access=Ви повинні мати доступ на запис щоб запропонувати зміни до цього файлу
 editor.file_delete_success=Файл '%s' успішно видалено!
 editor.name_your_file=Дайте назву файлу...
-editor.filename_help=Щоб додати каталог, просто наберіть його ім'я, та натисніть /. Щоб видалити каталог, перейдіь на початок поля й натисніть клавішу backspace.
+editor.filename_help=Щоб додати каталог, просто наберіть його ім'я, та натисніть /. Щоб видалити каталог, перейдіть на початок поля й натисніть клавішу backspace.
 editor.or=Або
 editor.cancel_lower=Скасувати
 editor.commit_changes=Зафіксувати зміни
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=Вміст файлу було змінено
 editor.file_already_exists=Файл на ім'я '%s' вже присутній у репозиторії.
 editor.no_changes_to_show=Нема змін для показу.
 editor.fail_to_update_file=Не вдалося оновити/створити файл '%s' через помилку: %v
+editor.fail_to_delete_file=Не вдалося видалити файл '%s' через помилку: %v
 editor.add_subdir=Додати підкаталогу...
 editor.unable_to_upload_files=Не вдалося завантажити файли до '%s' через помилку: %v
 editor.upload_files_to_dir=Завантажувати файли до '%s'
@@ -632,8 +642,9 @@ pulls.is_checking=Перевірка конфліктів продовжуєть
 pulls.can_auto_merge_desc=Цей запрос може бути влитий автоматично.
 pulls.cannot_auto_merge_desc=Цей запрос не може бути влитий автоматично, тому що він має конфлікти.
 pulls.cannot_auto_merge_helper=Будь ласка влийте вручну щоб врегулювати конфлікти.
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=Створити коміт на злиття
+pulls.rebase_before_merging=Перебазувати перед об'єднанням
+pulls.commit_description=Опис коміту
 pulls.merge_pull_request=Влити запрос на злиття
 pulls.open_unmerged_pull_exists=`Ви не можете перевідкрити, бо вже існує запрос на злиття (#%d) з того самого репозиторію, з тією самою інформацією про злиття, та він очікує на влиття.`
 pulls.delete_branch=Видалити гілку
@@ -660,7 +671,7 @@ milestones.cancel=Скасувати
 milestones.modify=Змінити етап
 milestones.edit_success=Зміни в етапі '%s' успішно збережені!
 milestones.deletion=Видалення етапу
-milestones.deletion_desc=Видалення цього єтапу призведе до видалення інформації, його та пов'язаних проблем. Ви справді хочете продовжити?
+milestones.deletion_desc=Видалення цього етапу призведе до видалення інформації, його та пов'язаних проблем. Ви справді хочете продовжити?
 milestones.deletion_success=Етап успішно видалено!
 
 wiki=Wiki
@@ -738,12 +749,12 @@ settings.tracker_issue_style=Стиль найменування задач в
 settings.tracker_issue_style.numeric=Цифровий
 settings.tracker_issue_style.alphanumeric=Буквено-цифровий
 settings.tracker_url_format_desc=Ви можете використовувати заповнювач <code>{user} {repo} {index}</code> для ім'я користувача, назви репозиторію на номеру проблеми.
-settings.pulls_desc=Увімкнути публічні запроси на злиття
-settings.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=Увімкнути запити на злиття щоб дозволити внески між репозиторіями й гілками
+settings.pulls.ignore_whitespace=Ігнорувати зміни у пробільних символах
+settings.pulls.allow_rebase_merge=Дозволити перебазування для merge-комітів
 settings.danger_zone=Небезпечна зона
 settings.cannot_fork_to_same_owner=Ви не можете клонувати репозиторій його ж власнику.
-settings.new_owner_has_same_repo=Новий власник вже має репозиторій з такою назвою.
+settings.new_owner_has_same_repo=Новий власник вже має репозиторій з такою назвою. Будь ласка, виберіть іншу.
 settings.convert=Перетворити на звичайний репозиторій
 settings.convert_desc=Ви можете сконвертувати це дзеркало у звичайний репозиторій. Це не може бути повернуто.
 settings.convert_notices_1=- Ця операція перетворить дзеркало на звичайний репозиторій та не зможе бути відмінена.
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Wiki-інформацію було вдало в
 settings.delete=Видалити цей репозиторій
 settings.delete_desc=Як тільки ви видалите репозиторій, то вже не буде шляху назад. Будь ласка, будьте певні.
 settings.delete_notices_1=- Ця операція <strong>НЕ МОЖЕ</strong> бути відмінена.
-settings.delete_notices_2=- Ця операція остаточно видалить увесь вміст репозиторію, включаючи git-дані, проблеми, коментарі та дозволи співавторів.
+settings.delete_notices_2=- Ця операція остаточно видалить весь вміст цього репозиторію, включаючи дані Git, проблеми, коментарі та дозволи співавторів.
 settings.delete_notices_fork_1=- Усі відгалудження стануть незалежними бісля видалення.
 settings.deletion_success=Репозиторій успішно видалено!
 settings.update_settings_success=Налаштування репозиторію було вдало оновлено.
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=Цей користувач більше н
 settings.remove_collaborator_success=Співавтора було видалено.
 settings.search_user_placeholder=Пошук користувача...
 settings.org_not_allowed_to_be_collaborator=Організації не можуть бути додані як співавтори.
-settings.add_webhook=Додати Webhook
 settings.hooks_desc=Web-хуки схожі на HTTP POST тригери подій. Яка б подія не виникла в Gogs, ми можемо обробити повідомлення про неї на сторонньому хості який ви задаєте. Взнайте більше у <a target="_blank" href="%s">Webhooks Guide</a>.
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=Додати Webhook
 settings.webhook_deletion=Видалити Webhook
 settings.webhook_deletion_desc=Видалення цього web-хуку призведе до видалення інформації про нього та усієї історії поставок. Впевнені, що бажаєте продовжити?
 settings.webhook_deletion_success=Webhook успішно видалено!
@@ -792,6 +805,8 @@ settings.webhook.response=Відповідь
 settings.webhook.headers=Заголовки
 settings.webhook.payload=Зміст
 settings.webhook.body=Тіло
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git хуки керуються самим Git, ви можете редагувати файли хуків, що підтримуються згідно списку нище, щоб виконувати будь-які операції.
 settings.githook_edit_desc=Якщо хук неактивний, буде представлено зразок вмісту. Порожнє значення у цьому полі призведе до вимкнення хуку.
 settings.githook_name=Ім'я хуку
@@ -819,10 +834,10 @@ settings.event_push=Push
 settings.event_push_desc=Git push до репозиторію
 settings.event_issues=Проблеми
 settings.event_issues_desc=Проблему відкрито, закрито, перевідкрито, відредаговано, призначено, відкріплено, змінено мітку, очищено мітку, створено етап, очищено етап.
-settings.event_issue_comment=Коментар проблеми
-settings.event_issue_comment_desc=Коментар проблеми створено, видалено чи відредаговано.
 settings.event_pull_request=Запити до злиття
 settings.event_pull_request_desc=Запрос на злиття відкрито, закрито, перевідкрито, прикріплено, відкріплено, оновлено мітку, очищено мітку, створено етап, очищено етап або синхронізовано.
+settings.event_issue_comment=Коментар проблеми
+settings.event_issue_comment_desc=Коментар проблеми створено, видалено чи відредаговано.
 settings.event_release=Реліз
 settings.event_release_desc=Реліз опубліковано у репозиторії.
 settings.active=Активний
@@ -836,13 +851,13 @@ settings.hook_type=Тип хуку
 settings.add_slack_hook_desc=Додати <a href="%s">Slack</a>-інтеграцію до вашого репозиторію.
 settings.add_discord_hook_desc=Додати <a href="%s">Discord</a>-інтеграцію до репозиторію.
 settings.add_dingtalk_hook_desc=Додати інтеграцію <a href="%s">Dingtalk</a> до вашого репозиторію.
-settings.slack_token=Жетон
+settings.slack_token=Токен
 settings.slack_domain=Домен
 settings.slack_channel=Канал
 settings.deploy_keys=Ключи для розгортування
-settings.deploy_keys_helper=<b>Common Gotcha!</b> Якщо ви шукаєте куди додати персональний публічний ключ, додайте його до <a href="%s%s">налаштуань вашого аккаунту</a>.
+settings.deploy_keys_helper=<b>Common Gotcha!</b> Якщо ви шукаєте куди додати персональний публічний ключ, додайте його до <a href="%s%s">налаштувань вашого аккаунту</a>.
 settings.add_deploy_key=Додати ключ для розгортування
-settings.deploy_key_desc=Ключи розгортування доступні лише для читання. Це не те саме, що персональний SSH ключ аккаунту.
+settings.deploy_key_desc=Ключі розгортування доступні лише для читання. Це не те саме, що персональний SSH ключ акаунту.
 settings.no_deploy_keys=Ви не додали жодного ключа для розгортування.
 settings.title=Заголовок
 settings.deploy_key_content=Контент
@@ -850,8 +865,10 @@ settings.key_been_used=Вміст ключа розгортування вже
 settings.key_name_used=Ключ розгортування має ім'я яке вже використано.
 settings.add_key_success=Новий ключ розгортування '%s' успішно додано!
 settings.deploy_key_deletion=Видалити ключ для розгортування
-settings.deploy_key_deletion_desc=Видалення цього ключа для розгортування призведе о видалення усіх повїязаних прав до цього репозитрію. Ви справді бажаєти продовжити?
+settings.deploy_key_deletion_desc=Видалення цього ключа для розгортування призведе о видалення усіх пов'язаних прав до цього репозиторію. Ви справді бажаєте продовжити?
 settings.deploy_key_deletion_success=Ключі для розгортування було успішно видалено!
+settings.description_desc=Опис репозиторію. До 512-ти символів довжиною.
+settings.description_length=Доступні символи
 
 diff.browse_source=Переглянути джерело
 diff.parent=батько
@@ -916,9 +933,8 @@ team_name_helper=Ви будете використовувати це ім'я
 team_desc_helper=Що це за команда?
 team_permission_desc=Який рівень дозволів має бути у цієї команди?
 
-form.name_reserved=Назву організації '%s' зарезервовано.
-form.name_pattern_not_allowed=Шаблон назви організації '%s' не дозволено.
-form.team_name_reserved=Ім'я команди '%s' зарезервовано.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=Налаштування
 settings.options=Опції
@@ -990,12 +1006,19 @@ first_page=Перша
 last_page=Остання
 total=Всього: %d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 dashboard.statistic=Статистика
 dashboard.operations=Операції
 dashboard.system_status=Статус системного монітору
 dashboard.statistic_info=База даних Gogs має <b>%d</b> користувачів, <b>%d</b> організацій, <b>%d</b> публічних ключів, <b>%d</b> репозиторіїв, <b>%d</b> спостерігачів, <b>%d</b> зірок, <b>%d</b> дій, <b>%d</b> відвідувань, <b>%d</b> обговорень, <b>%d</b> коментарів, <b>%d</b> соціальних облікових записів, <b>%d</b> підписників, <b>%d</b> дзеркал, <b>%d</b> релізів, <b>%d</b> джерел входу, <b>%d</b> webhook-ів, <b>%d</b> етапів, <b>%d</b> міток, <b>%d</b> hook задач, <b>%d</b> команд, <b>%d</b> оновлень завдань, <b>%d</b> вкладень.
 dashboard.operation_name=Назва операції
 dashboard.operation_switch=Перемикнути
+dashboard.select_operation_to_run=Please select operation to run
 dashboard.operation_run=Запустити
 dashboard.clean_unbind_oauth=Видалити неприв'язані OAuth
 dashboard.clean_unbind_oauth_success=Усі неприв'язані OAuth було знищено.
@@ -1087,11 +1110,12 @@ repos.stars=У обраному
 repos.issues=Питання
 repos.size=Розмір
 
-auths.auth_manage_panel=Керування автентифікацій
+auths.auth_sources=Джерела автентифікації
 auths.new=Додати нове джерело
 auths.name=Назва
 auths.type=Тип
 auths.enabled=Увімкнено
+auths.default=За замовчанням
 auths.updated=Оновлено
 auths.auth_type=Тип автентифікації
 auths.auth_name=Назва автентифікації
@@ -1100,7 +1124,7 @@ auths.domain=Домен
 auths.host=Хост
 auths.port=Порт
 auths.bind_dn=Прив'язати DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=Ви можете використовувати '%s' як шаблон для імені користувача, напр. DOM\%s
 auths.bind_password=Прив'язати пароль
 auths.bind_password_helper=Увага: Цей пароль зберігається як звичайний текст. Не використовуйте профіль з високими повноваженнями.
 auths.user_base=База пошуку користувачів
@@ -1123,14 +1147,14 @@ auths.smtp_auth=Тип автентифікації SMTP
 auths.smtphost=SMTP хост
 auths.smtpport=SMTP порт
 auths.allowed_domains=Дозволені домени
-auths.allowed_domains_helper=Залиште пустим щоб дозволити будь-які домени. Якщо доменів декілька - розділить їх комами ','.
+auths.allowed_domains_helper=Залиште порожнім щоб дозволити будь-які домени. Якщо доменів декілька - розділить їх комами ','.
 auths.enable_tls=Увімкнути TLS-шифрування
 auths.skip_tls_verify=Пропустити перевірку TLS
 auths.pam_service_name=Ім'я служби PAM
 auths.enable_auto_register=Увімкнути автоматичну реєстрацію
-auths.tips=Поради
 auths.edit=Редагувати налаштування автентифікації
 auths.activated=Цю автентифікацію активовано
+auths.default_auth=Це метод автентифікації за замовчанням
 auths.new_success=Нову автентифікацію '%s' було успішно додано.
 auths.update_success=Налаштування автентифікації було успішно оновлено.
 auths.update=Оновити налаштування автентифікації
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=Цю автентифікацію буде видален
 auths.still_in_used=Цю автентифікацію ще використовують деякі користувачі. Будь ласка видаліть цих користувачів, або сконвертуйте їх на інший тип входу до системи.
 auths.deletion_success=Автентивікацію було успішно видалено!
 auths.login_source_exist=Джерело входу '%s' вже існує.
+auths.github_api_endpoint=Адреса API
 
-config.not_set=(not set)
+config.not_set=(не встановлено)
 config.server_config=Конфігурація сервера
-config.app_name=Назва програми
-config.app_ver=Версія програми
-config.app_url=URL адреса програми
-config.domain=Домен
-config.offline_mode=Офлайн режим
-config.disable_router_log=Вимкнути логування роутеру
+config.brand_name=Brand name
 config.run_user=Запущено користувачем
 config.run_mode=Режим виконання
-config.git_version=Версія Git
-config.static_file_root_path=Повний шлях до статичного файлу
-config.log_file_root_path=Повний шлях до Log-файлу
-config.reverse_auth_user=Reverse Authentication User
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=Налаштування SSH
-config.ssh_enabled=Увімкнено
-config.ssh_start_builtin_server=Запустити вбудований сервер
-config.ssh_domain=Домен
-config.ssh_port=Порт
-config.ssh_listen_port=Порт що прослуховується
-config.ssh_root_path=Шлях до кореню
-config.ssh_key_test_path=Шлях до тестових ключів
-config.ssh_keygen_path=Шлях до генератора ключів ('ssh-keygen')
-config.ssh_minimum_key_size_check=Мінімальний розмір ключа перевірки
-config.ssh_minimum_key_sizes=Мінімальні розміри ключів
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=Налаштування бази даних
-config.db_type=Тип
-config.db_host=Хост
-config.db_name=Назва
-config.db_user=Користувач
-config.db_ssl_mode=Режим SSL
-config.db_ssl_mode_helper=(тільки для "postgres")
-config.db_path=Шлях
-config.db_path_helper=(для "sqlite3" і "tidb")
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=Конфігурація сервіса
-config.register_email_confirm=Вимагати підтвердження по електронній пошті
-config.disable_register=Вимкнути реєстрацію
-config.show_registration_button=Показувати кнопку "Реєстрація"
-config.require_sign_in_view=Необхідно авторизуватися для перегляду
-config.mail_notify=Сповіщення поштою
-config.disable_key_size_check=Вимкнути перевірку мінімального розміру ключа
-config.enable_captcha=Увімкнути капчу
-config.active_code_lives=Час актуальності кода підтвердження
-config.reset_password_code_lives=Термін придатності кода скидання пароля
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Налаштування web-хуків
-config.queue_length=Довжина черги
-config.deliver_timeout=Затримка доставлення
-config.skip_tls_verify=Пропустити перевірку TLS
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=Налаштування пошти
-config.mailer_enabled=Увімкнено
-config.mailer_disable_helo=Вимкнути HELO
-config.mailer_name=Ім’я
-config.mailer_host=Хост
-config.mailer_user=Користувач
-config.send_test_mail=Відправити тестового листа
-config.test_mail_failed=Помилка відправлення тестового листа до '%s': %v
-config.test_mail_sent=Тестового листа було відправлено до '%s'.
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=Конфігурація OAuth
-config.oauth_enabled=Увімкнено
-
-config.cache_config=Конфігурація кешу
-config.cache_adapter=Адаптер кешу
-config.cache_interval=Інтервал кешування
-config.cache_conn=Підключення до кешу
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Налаштування сесії
-config.session_provider=Провайдер сесії
-config.provider_config=Provider Config
-config.cookie_name=Ім'я cookie-файлу
-config.enable_set_cookie=Увімкнути встановлення cookie
-config.gc_interval_time=Інтервал запуску GC
-config.session_life_time=Час життя сесії
-config.https_only=Виключно HTTPS
-config.cookie_life_time=Час життя cookie-файлу
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Конфігурація кешу
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=Налаштування HTTP
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=Налаштування зображень
-config.picture_service=Сервіс зображень
-config.disable_gravatar=Вимкнути Gravatar
-config.enable_federated_avatar=Увімкнути зовнішні аватари
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Налаштування web-хуків
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Налаштування git
-config.git_disable_diff_highlight=Вимкнути підсвітку синтаксису diff
-config.git_max_diff_lines=Максимум рядків на diff (на один файл)
-config.git_max_diff_line_characters=Максимум символів на diff (на один файл)
-config.git_max_diff_files=Максимум diff-файлів (для показу)
-config.git_gc_args=Аргументи GC
-config.git_migrate_timeout=Тайм-аут міграції
-config.git_mirror_timeout=Тайм-аут оновлення дзеркала
-config.git_clone_timeout=Тайм-аут операції клонування
-config.git_pull_timeout=Тайм-аут операції витягання
-config.git_gc_timeout=Тайм-аут операції GC
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=Конфігурація журналу
+config.log_file_root_path=Повний шлях до Log-файлу
 config.log_mode=Режим
 config.log_options=Опції
 
@@ -1283,7 +1368,6 @@ notices.delete_success=Системні повідомлення було усп
 
 [action]
 create_repo=створено репозиторій <a href="%s">%s</a>
-fork_repo=відгалуджено репозиторій у <a href="%s">%s</a>
 rename_repo=репозиторій перейменовано з <code>%[1]s</code> на <a href="%[2]s">%[3]s</a>
 commit_repo=запушено до <a href="%[1]s/src/%[2]s">%[3]s</a> у <a href="%[1]s">%[4]s</a>
 compare_commits=Перегляд порівняння для цих %d комітів
@@ -1300,6 +1384,10 @@ create_branch=створено нову гілку <a href="%[1]s/src/%[2]s">%[3
 delete_branch=видалено гілку <code>%[2]s</code> у <a href="%[1]s">%[3]s</a>
 push_tag=заштовхнуто тег <a href="%s/src/%s">%[2]s</a> до <a href="%[1]s">%[3]s</a>
 delete_tag=видалено мітку <code>%[2]s</code> у <a href="%[1]s">%[3]s</a>
+fork_repo=відгалуджено репозиторій у <a href="%s">%s</a>
+mirror_sync_push=синхронізовано коміт <a href="%[1]s/src/%[2]s">%[3]s</a> в <a href="%[1]s">%[4]s</a> із дзеркала
+mirror_sync_create=синхронізовано нове посилання <a href="%s/src/%s">%[2]s</a> до <a href="%[1]s">%[3]s</a> із дзеркала
+mirror_sync_delete=синхронізовано й видалено посилання <code>%[2]s</code> в <a href="%[1]s">%[3]s</a> із дзеркала
 
 [tool]
 ago=тому
@@ -1321,6 +1409,7 @@ months=%d місяців %s
 years=%d роки %s
 raw_seconds=секунди
 raw_minutes=хвилини
+raw_hours=hours
 
 [dropzone]
 default_message=Перетягніть файли сюди або натисніть "завантажити".

conf/locale/locale_zh-CN.ini

@@ -9,7 +9,6 @@ sign_out=退出
 sign_up=注册
 register=注册
 website=官方网站
-version=当前版本
 page=页面
 template=模板
 language=语言选项
@@ -44,6 +43,10 @@ issues=工单管理
 
 cancel=取消
 
+[status]
+page_not_found=页面未找到
+internal_server_error=内部服务器错误
+
 [install]
 install=安装页面
 title=首次运行安装程序
@@ -107,7 +110,7 @@ enable_captcha=启用验证码服务
 enable_captcha_popup=要求在用户注册时输入预验证码
 require_sign_in_view=启用登录访问限制
 require_sign_in_view_popup=只有已登录的用户才能够访问页面，否则将只能看到登录或注册页面。
-admin_setting_desc=创建管理员帐号并不是必须的，因为 ID=1 的用户将自动获得管理员权限。
+admin_setting_desc=创建管理员帐号并不是必须的，因为用户表中的第一个用户将自动获得管理员权限。
 admin_title=管理员帐号设置
 admin_name=管理员用户名
 admin_password=管理员密码
@@ -122,6 +125,7 @@ run_user_not_match=运行系统用户非当前用户：%s -> %s
 smtp_host_missing_port=SMTP 地址缺少端口号。
 invalid_smtp_from=SMTP From 字段不合法：%v
 save_config_failed=应用配置保存失败：%v
+init_failed=初始化应用程序失败：%v
 invalid_admin_setting=管理员帐户设置不正确：%v
 install_success=您好！我们很高兴您选择使用 Gogs，祝您使用愉快，代码从此无 BUG！
 invalid_log_root_path=无效的日志路径：%v
@@ -151,6 +155,8 @@ register_hepler_msg=已经注册？立即登录！
 social_register_hepler_msg=已经注册？立即绑定！
 disable_register_prompt=对不起，注册功能已被关闭。请联系网站管理员。
 disable_register_mail=对不起，注册邮箱确认功能已被关闭。
+auth_source=认证源
+local=本地
 remember_me=记住登录
 forgot_password=忘记密码
 forget_password=忘记密码？
@@ -229,6 +235,7 @@ org_name_been_taken=组织名称已经被占用。
 team_name_been_taken=团队名称已经被占用。
 email_been_used=邮箱地址已经被使用。
 username_password_incorrect=用户名或密码不正确。
+auth_source_mismatch=该用户未与所选择的认证源进行关联
 enterred_invalid_repo_name=请检查您输入的仓库名称是正确。
 enterred_invalid_owner_name=请检查您输入的新所有者用户名是否正确。
 enterred_invalid_password=请检查您输入的密码是否正确。
@@ -256,8 +263,7 @@ following=关注中
 follow=关注
 unfollow=取消关注
 
-form.name_reserved=用户名 '%s' 是被保留的。
-form.name_pattern_not_allowed=用户名不允许 '%s' 的格式。
+form.name_not_allowed=禁止使用用户名或模式 %q
 
 [settings]
 profile=个人信息
@@ -348,6 +354,7 @@ two_factor_or_enter_secret=或者直接输入密钥：
 two_factor_then_enter_passcode=然后输入动态令牌：
 two_factor_verify=验证令牌
 two_factor_invalid_passcode=您输入的动态令牌无效，请重试！
+two_factor_reused_passcode=您输入的令牌已经被使用，请等待数秒后尝试新的令牌！
 two_factor_enable_error=启用两步验证失败：%v
 two_factor_enable_success=两步验证登录启用成功！
 two_factor_recovery_codes_title=两步验证恢复密钥
@@ -370,6 +377,7 @@ delete_token=删除令牌
 access_token_deletion=删除个人操作令牌操作
 access_token_deletion_desc=删除该个人操作令牌将删除所有相关的应用程序的访问权限。是否继续?
 delete_token_success=个人操作令牌删除成功！请更新与该令牌有关的所有应用。
+token_name_exists=已存在具有相同名称的令牌。
 
 orgs.none=您现在还不是任何组织的成员。
 orgs.leave_title=离开组织
@@ -417,10 +425,11 @@ mirror_last_synced=上次同步时间：
 watchers=关注者
 stargazers=称赞者
 forks=派生仓库
+repo_description_helper=请输入仓库描述，最多为 512 个字符
+repo_description_length=剩余字符数
 
 form.reach_limit_of_creation=该用户已经达到允许创建 %d 个仓库的最大上限。
-form.name_reserved=仓库名称 '%s' 是被保留的。
-form.name_pattern_not_allowed=仓库名称不允许 '%s' 的格式。
+form.name_not_allowed=禁止使用仓库名称或模式 %q
 
 need_auth=需要授权验证
 migrate_type=迁移类型
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=文件内容在您进行编辑时已经发生
 editor.file_already_exists=此仓库已经存在名为 '%s' 的文件。
 editor.no_changes_to_show=没有可以显示的变更。
 editor.fail_to_update_file=更新/创建文件 '%s' 时发生错误：%v
+editor.fail_to_delete_file=删除文件 '%s' 时发生错误: %v
 editor.add_subdir=添加子目录...
 editor.unable_to_upload_files=上传文件至 '%s' 时发生错误：%v
 editor.upload_files_to_dir=上传文件至 '%s'
@@ -590,7 +600,7 @@ issues.commit_ref_at=`在代码提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 中
 issues.poster=发布者
 issues.collaborator=协作者
 issues.owner=所有者
-issues.sign_in_require_desc=<a href="%s">登陆</a> 并参与到对话中。
+issues.sign_in_require_desc=<a href="%s">登录</a> 并参与到对话中。
 issues.edit=编辑
 issues.cancel=取消
 issues.save=保存
@@ -634,6 +644,7 @@ pulls.cannot_auto_merge_desc=该合并请求存在冲突，无法进行自动合
 pulls.cannot_auto_merge_helper=请手动拉取代码变更以解决冲突。
 pulls.create_merge_commit=创建一个新的合并提交
 pulls.rebase_before_merging=合并前先进行衍合
+pulls.commit_description=提交说明
 pulls.merge_pull_request=合并请求
 pulls.open_unmerged_pull_exists=`由于已经存在来自相同仓库和合并信息的未合并请求（#%d），您无法执行重新开启操作。`
 pulls.delete_branch=删除分支
@@ -738,7 +749,7 @@ settings.tracker_issue_style=外部工单管理系统命名风格：
 settings.tracker_issue_style.numeric=纯数字形式
 settings.tracker_issue_style.alphanumeric=英文字母数字组合形式
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分别作为用户名、仓库名和工单索引的占位符。
-settings.pulls_desc=启用合并请求以接受社区贡献
+settings.pulls_desc=启用合并请求以接受来自其它仓库或分支的贡献
 settings.pulls.ignore_whitespace=忽略空白符号的更改
 settings.pulls.allow_rebase_merge=允许在合并提交时使用衍合
 settings.danger_zone=危险操作区
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=仓库 Wiki 数据清除成功！
 settings.delete=删除本仓库
 settings.delete_desc=删除仓库操作不可逆转，请三思而后行。
 settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滚。
-settings.delete_notices_2=- 此操作将永久删除该仓库，包括 Git 数据、 工单、 评论和协作者的操作权限。
+settings.delete_notices_2=- 此操作将永久删除该仓库，包括 Git 数据、工单、评论和协作者的操作权限。
 settings.delete_notices_fork_1=- 删除完成后所有的派生仓库都将转换为独立的仓库。
 settings.deletion_success=仓库删除成功！
 settings.update_settings_success=仓库设置更新成功！
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=此用户被删除后将不再拥有相关
 settings.remove_collaborator_success=被操作的协作者已经被收回权限！
 settings.search_user_placeholder=搜索用户...
 settings.org_not_allowed_to_be_collaborator=组织不允许被添加为仓库协作者！
-settings.add_webhook=添加 Web 钩子
 settings.hooks_desc=Web 钩子允许您设定在 Gogs 上发生指定事件时对指定 URL 发送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文档</a> 获取更多信息。
+settings.webhooks.add_new=添加新的 Web 钩子：
+settings.webhooks.choose_a_type=选择类型...
+settings.add_webhook=添加 Web 钩子
 settings.webhook_deletion=删除 Web 钩子
 settings.webhook_deletion_desc=删除该 Web 钩子将会删除与其有关的信息和推送历史。是否继续？
 settings.webhook_deletion_success=Web 钩子删除成功！
@@ -792,6 +805,8 @@ settings.webhook.response=响应内容
 settings.webhook.headers=头信息
 settings.webhook.payload=推送内容
 settings.webhook.body=响应体
+settings.webhook.err_cannot_parse_payload_url=无法解析推送 URL：%v
+settings.webhook.err_cannot_use_local_addresses=非管理员不允许使用本地地址
 settings.githooks_desc=Git 钩子是由 Git 本身提供的功能，以下为 Gogs 所支持的钩子列表。
 settings.githook_edit_desc=如果钩子未启动，则会显示样例文件中的内容。如果想要删除某个钩子，则提交空白文本即可。
 settings.githook_name=钩子名称
@@ -819,10 +834,10 @@ settings.event_push=推送
 settings.event_push_desc=Git 仓库推送
 settings.event_issues=工单
 settings.event_issues_desc=工单被开启、关闭、重新开启、编辑、指派、取消指派、更新标签、清除标签、设置里程碑或取消设置里程碑
-settings.event_issue_comment=工单评论
-settings.event_issue_comment_desc=工单评论被创建、编辑和删除
 settings.event_pull_request=合并请求
 settings.event_pull_request_desc=合并请求被开启、关闭、重新开启、编辑、指派、取消指派、更新标签、清除标签、设置里程碑、取消设置里程碑或代码同步
+settings.event_issue_comment=工单评论
+settings.event_issue_comment_desc=工单评论被创建、编辑和删除
 settings.event_release=版本发布
 settings.event_release_desc=仓库发布新的版本
 settings.active=是否激活
@@ -852,6 +867,8 @@ settings.add_key_success=新的部署密钥 '%s' 添加成功！
 settings.deploy_key_deletion=删除部署密钥
 settings.deploy_key_deletion_desc=删除该部署密钥会移除本仓库所以相关的操作权限。是否继续？
 settings.deploy_key_deletion_success=删除部署密钥成功！
+settings.description_desc=请输入仓库描述，最多为 512 个字符
+settings.description_length=剩余字符数
 
 diff.browse_source=浏览代码
 diff.parent=父节点
@@ -916,9 +933,8 @@ team_name_helper=您可以使用该名称来通知该组全体成员。
 team_desc_helper=一句话描述这个团队是做什么的。
 team_permission_desc=请选择该团队所具有的权限等级：
 
-form.name_reserved=组织名称 '%s' 是被保留的。
-form.name_pattern_not_allowed=组织名称不允许 '%s' 的格式。
-form.team_name_reserved=团队名称 '%s' 是被保留的。
+form.name_not_allowed=禁止使用组织名称或模式 %q
+form.team_name_not_allowed=禁止使用团队名称或模式 %q
 
 settings=组织设置
 settings.options=基本设置
@@ -982,7 +998,7 @@ dashboard=控制面板
 users=用户管理
 organizations=组织管理
 repositories=仓库管理
-authentication=授权认证管理
+authentication=认证源管理
 config=应用配置管理
 notices=系统提示管理
 monitor=应用监控面板
@@ -990,12 +1006,20 @@ first_page=首页
 last_page=末页
 total=总计：%d
 
+dashboard.build_info=构建信息
+dashboard.app_ver=应用程序版本
+dashboard.git_version=Git 版本
+dashboard.go_version=Go 版本
+dashboard.build_time=编译时间
+dashboard.build_commit=构建提交
+
 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.operation_name=操作名称
 dashboard.operation_switch=开关
+dashboard.select_operation_to_run=请选择要运行的操作
 dashboard.operation_run=执行
 dashboard.clean_unbind_oauth=清理未绑定社交帐号
 dashboard.clean_unbind_oauth_success=所有未绑定社交数据清除成功！
@@ -1087,11 +1111,12 @@ repos.stars=点赞数
 repos.issues=工单数
 repos.size=用量
 
-auths.auth_manage_panel=认证管理面板
+auths.auth_sources=认证源
 auths.new=添加新的源
 auths.name=认证名称
 auths.type=认证类型
 auths.enabled=已启用
+auths.default=默认
 auths.updated=最后更新时间
 auths.auth_type=认证类型
 auths.auth_name=认证名称
@@ -1128,9 +1153,9 @@ auths.enable_tls=启用 TLS 加密
 auths.skip_tls_verify=忽略 TLS 验证
 auths.pam_service_name=PAM 服务名称
 auths.enable_auto_register=允许授权用户自动注册
-auths.tips=帮助提示
 auths.edit=编辑认证设置
 auths.activated=该授权认证已经启用
+auths.default_auth=该授权认证将作为默认登录源
 auths.new_success=新的授权源 "%s" 添加成功！
 auths.update_success=认证设置更新成功！
 auths.update=更新认证设置
@@ -1140,119 +1165,180 @@ auths.delete_auth_desc=该认证将被删除。是否继续？
 auths.still_in_used=此认证仍旧与一些用户有关联，请先删除或者将这些用户转换为其它登录类型。
 auths.deletion_success=授权源删除成功！
 auths.login_source_exist=登录源 '%s' 已存在。
+auths.github_api_endpoint=API 终端
 
 config.not_set=(未设置)
 config.server_config=服务器配置
-config.app_name=应用名称
-config.app_ver=应用版本
-config.app_url=应用 URL
-config.domain=应用域名
-config.offline_mode=离线模式
-config.disable_router_log=关闭路由日志
+config.brand_name=品牌名称
 config.run_user=运行用户
 config.run_mode=运行模式
-config.git_version=Git 版本
-config.static_file_root_path=静态文件根目录
-config.log_file_root_path=日志文件根目录
-config.reverse_auth_user=反向代理认证
+config.server.external_url=外部网址
+config.server.domain=域名
+config.server.protocol=协议
+config.server.http_addr=HTTP 地址
+config.server.http_port=HTTP 端口
+config.server.cert_file=证书文件
+config.server.key_file=密钥文件
+config.server.tls_min_version=最低 TLS 版本
+config.server.unix_socket_permission=Unix 套接字权限
+config.server.local_root_url=本地根网址
+config.server.offline_mode=离线模式
+config.server.disable_router_log=禁用路由器日志
+config.server.enable_gzip=启用 Gzip
+config.server.app_data_path=应用程序数据路径
+config.server.load_assets_from_disk=从磁盘加载素材
+config.server.landing_url=登陆网址
 
 config.ssh_config=SSH 配置
-config.ssh_enabled=启用服务
-config.ssh_start_builtin_server=启用内置服务
-config.ssh_domain=域名
-config.ssh_port=端口
-config.ssh_listen_port=监听端口
-config.ssh_root_path=根目录
-config.ssh_key_test_path=密钥测试路径
-config.ssh_keygen_path=密钥生成器（'ssh-keygen'）路径
-config.ssh_minimum_key_size_check=密钥最小长度检查
-config.ssh_minimum_key_sizes=密钥最小长度限制
+config.ssh.enabled=启用
+config.ssh.domain=显示域名
+config.ssh.port=显示端口
+config.ssh.root_path=根目录
+config.ssh.keygen_path=Keygen 路径
+config.ssh.key_test_path=密钥测试路径
+config.ssh.minimum_key_size_check=最小密钥长度检查
+config.ssh.minimum_key_sizes=最短秘钥长度
+config.ssh.rewrite_authorized_keys_at_start=在启动时重写 "authorized_keys" 文件
+config.ssh.start_builtin_server=启动内置服务器
+config.ssh.listen_host=监听主机
+config.ssh.listen_port=监听端口
+config.ssh.server_ciphers=服务端加密套件
 
 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.http_config=HTTP 配置
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=根目录
+config.repo.script_type=脚本类型
+config.repo.ansi_chatset=ANSI 字符集
+config.repo.force_private=强制设为私有
+config.repo.max_creation_limit=最大创建限制
+config.repo.preferred_licenses=推荐的许可证
+config.repo.disable_http_git=禁用 HTTP Git
+config.repo.enable_local_path_migration=启用本地路径迁移
+config.repo.enable_raw_file_render_mode=启用原始文件渲染模式
+config.repo.commits_fetch_concurrency=代码提交拉取并发量
+config.repo.editor.line_wrap_extensions=编辑器行自动换行扩展
+config.repo.editor.previewable_file_modes=编辑器可预览文件模式
+config.repo.upload.enabled=启用上传
+config.repo.upload.temp_path=上传文件临时路径
+config.repo.upload.allowed_types=允许的上传类型
+config.repo.upload.file_max_size=上传文件大小限制
+config.repo.upload.max_files=上传文件数量限制
 
 config.db_config=数据库配置
-config.db_type=数据库类型
-config.db_host=主机地址
-config.db_name=数据库名称
-config.db_user=连接用户
-config.db_ssl_mode=SSL 模式
-config.db_ssl_mode_helper=（仅限 "postgres" 使用）
-config.db_path=数据库路径
-config.db_path_helper=（用于 "sqlite3" 和 "tidb"）
+config.db.type=类型
+config.db.host=主机
+config.db.name=名称
+config.db.user=用户
+config.db.ssl_mode=SSL 模式
+config.db.ssl_mode_helper=（仅限 "postgres" 使用）
+config.db.path=数据库路径
+config.db.path_helper=（仅限 "sqlite3" 使用）
+config.db.max_open_conns=最大打开连接数
+config.db.max_idle_conns=最大空闲连接数
 
-config.service_config=服务配置
-config.register_email_confirm=注册邮件确认
-config.disable_register=关闭注册功能
-config.show_registration_button=显示注册按钮
-config.require_sign_in_view=强制登录浏览
-config.mail_notify=邮件通知提醒
-config.disable_key_size_check=禁用密钥最小长度检查
-config.enable_captcha=启用验证码服务
-config.active_code_lives=激活用户链接有效期
-config.reset_password_code_lives=重置密码链接有效期
+config.security_config=安全配置
+config.security.login_remember_days=记住登录的天数
+config.security.cookie_remember_name=记住登录 Cookie
+config.security.cookie_username=用户名 Cookie
+config.security.cookie_secure=启用安全的 Cookie
+config.security.reverse_proxy_auth_user=反向代理认证 Header
+config.security.enable_login_status_cookie=启用登录状态 Cookie
+config.security.login_status_cookie_name=登录状态 Cookie
 
-config.webhook_config=Web 钩子配置
-config.queue_length=队列长度
-config.deliver_timeout=推送超时
-config.skip_tls_verify=忽略 TLS 验证
+config.email_config=邮件配置
+config.email.enabled=启用
+config.email.subject_prefix=主题前缀
+config.email.host=主机
+config.email.from=来自
+config.email.user=用户
+config.email.disable_helo=禁用 HELO
+config.email.helo_hostname=HELO 主机名
+config.email.skip_verify=忽略证书验证
+config.email.use_certificate=使用自定义证书
+config.email.cert_file=证书文件
+config.email.key_file=密钥文件
+config.email.use_plain_text=使用纯文本
+config.email.add_plain_text_alt=添加纯文本选项
+config.email.send_test_mail=发送测试邮件
+config.email.test_mail_failed=发送测试邮件至 '%s' 时失败：%v
+config.email.test_mail_sent=测试邮件已经发送至 '%s'。
 
-config.mailer_config=邮件配置
-config.mailer_enabled=启用服务
-config.mailer_disable_helo=禁用 HELO 操作
-config.mailer_name=发送者名称
-config.mailer_host=邮件主机地址
-config.mailer_user=发送者帐号
-config.send_test_mail=发送测试邮件
-config.test_mail_failed=发送测试邮件至 '%s' 时失败：%v
-config.test_mail_sent=测试邮件已经发送至 '%s'。
+config.auth_config=认证配置
+config.auth.activate_code_lives=激活用户链接有效期
+config.auth.reset_password_code_lives=重置密码链接有效期
+config.auth.require_email_confirm=注册邮件确认
+config.auth.require_sign_in_view=需要登录后浏览
+config.auth.disable_registration=关闭注册功能
+config.auth.enable_registration_captcha=启用注册验证码
+config.auth.enable_reverse_proxy_authentication=启用反向代理认证
+config.auth.enable_reverse_proxy_auto_registration=启用反向代理自动注册
+config.auth.reverse_proxy_authentication_header=反向代理认证 Header
 
-config.oauth_config=社交帐号配置
-config.oauth_enabled=启用服务
-
-config.cache_config=Cache 配置
-config.cache_adapter=Cache 适配器
-config.cache_interval=Cache 周期
-config.cache_conn=Cache 连接字符串
+config.user_config=用户配置
+config.user.enable_email_notify=启用电子邮件通知
 
 config.session_config=Session 配置
-config.session_provider=Session 提供者
-config.provider_config=提供者配置
-config.cookie_name=Cookie 名称
-config.enable_set_cookie=启用设置 Cookie
-config.gc_interval_time=GC 周期
-config.session_life_time=Session 生命周期
-config.https_only=仅限 HTTPS
-config.cookie_life_time=Cookie 生命周期
+config.session.provider=提供者
+config.session.provider_config=提供者配置
+config.session.cookie_name=Cookie
+config.session.https_only=仅限 HTTPS
+config.session.gc_interval=GC 间隔
+config.session.max_life_time=最大生命周期
+config.session.csrf_cookie_name=CSRF Cookie
+
+config.cache_config=Cache 配置
+config.cache.adapter=适配器
+config.cache.interval=GC 间隔
+config.cache.host=主机
+
+config.http_config=HTTP 配置
+config.http.access_control_allow_origin=允许访问来源控制
+
+config.attachment_config=附件配置
+config.attachment.enabled=启用
+config.attachment.path=路径
+config.attachment.allowed_types=允许的类型
+config.attachment.max_size=大小限制
+config.attachment.max_files=文件数量限制
+
+config.release_config=发布配置
+config.release.attachment.enabled=启用附件
+config.release.attachment.allowed_types=允许的附件类型
+config.release.attachment.max_size=附件大小限制
+config.release.attachment.max_files=附件文件数量限制
 
 config.picture_config=图片配置
-config.picture_service=图片服务
-config.disable_gravatar=禁用 Gravatar 头像
-config.enable_federated_avatar=启用 Federated Avatars
+config.picture.avatar_upload_path=用户头像上传路径
+config.picture.repo_avatar_upload_path=仓库头像上传路径
+config.picture.gravatar_source=Gravatar 源
+config.picture.disable_gravatar=禁用 Gravatar 头像
+config.picture.enable_federated_avatar=启用 Federated 头像
+
+config.mirror_config=镜像配置
+config.mirror.default_interval=默认同步间隔
+
+config.webhook_config=Web 钩子配置
+config.webhook.types=类型
+config.webhook.deliver_timeout=推送超时
+config.webhook.skip_tls_verify=忽略 TLS 验证
 
 config.git_config=Git 配置
-config.git_disable_diff_highlight=禁用差异对比语法高亮
-config.git_max_diff_lines=差异对比显示的最大行数（单个文件）
-config.git_max_diff_line_characters=差异对比显示的最大字符数（单行）
-config.git_max_diff_files=差异对比显示的最大文件数
-config.git_gc_args=GC 参数
-config.git_migrate_timeout=迁移操作超时
-config.git_mirror_timeout=镜像更新操作超时
-config.git_clone_timeout=克隆操作超时
-config.git_pull_timeout=拉取操作超时
-config.git_gc_timeout=GC 操作超时
+config.git.disable_diff_highlight=禁用差异对比语法高亮
+config.git.max_diff_lines=差异行限制（单个文件）
+config.git.max_diff_line_characters=差异字符限制（单行）
+config.git.max_diff_files=差异文件数量限制（单次提交）
+config.git.gc_args=GC 参数
+config.git.migrate_timeout=迁移超时
+config.git.mirror_timeout=镜像拉取超时
+config.git.clone_timeout=克隆超时
+config.git.pull_timeout=拉取超时
+config.git.gc_timeout=GC 超时
+
+config.lfs_config=LFS 配置
+config.lfs.storage=存储方式
+config.lfs.objects_path=对象路径
 
 config.log_config=日志配置
+config.log_file_root_path=日志文件根目录
 config.log_mode=模式
 config.log_options=选项
 
@@ -1283,7 +1369,6 @@ notices.delete_success=系统提示删除成功！
 
 [action]
 create_repo=创建了仓库 <a href="%s">%s</a>
-fork_repo=派生了仓库 <a href="%s">%s</a>
 rename_repo=重命名仓库 <code>%[1]s</code> 为 <a href="%[2]s">%[3]s</a>
 commit_repo=推送了 <a href="%[1]s/src/%[2]s">%[3]s</a> 分支的代码到 <a href="%[1]s">%[4]s</a>
 compare_commits=对比 %d 次代码提交
@@ -1300,6 +1385,10 @@ create_branch=创建了新的分支 <a href="%[1]s/src/%[2]s">%[3]s</a> 到 <a h
 delete_branch=删除了 <a href="%[1]s">%[3]s</a> 的分支 <code>%[2]s</code>
 push_tag=推送了标签 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>
 delete_tag=删除了 <a href="%[1]s">%[3]s</a> 的标签 <code>%[2]s</code>
+fork_repo=派生了仓库 <a href="%s">%s</a>
+mirror_sync_push=从镜像同步了 <a href="%[1]s/src/%[2]s">%[3]s</a> 分支的代码到 <a href="%[1]s">%[4]s</a>
+mirror_sync_create=从镜像同步了新的引用 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>
+mirror_sync_delete=从镜像同步并从 <a href="%[1]s">%[3]s</a>  删除了引用 <code>%[2]s</code>
 
 [tool]
 ago=之前
@@ -1321,6 +1410,7 @@ months=%d 月%s
 years=%d 年%s
 raw_seconds=秒
 raw_minutes=分钟
+raw_hours=小时
 
 [dropzone]
 default_message=拖曳文件到此处或单击上传

conf/locale/locale_zh-HK.ini

@@ -9,7 +9,6 @@ sign_out=登出
 sign_up=註冊
 register=註冊
 website=網站
-version=版本
 page=頁面
 template=樣板
 language=語言
@@ -44,6 +43,10 @@ issues=問題
 
 cancel=取消
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=安裝頁面
 title=首次安裝步驟
@@ -119,9 +122,10 @@ sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s
 invalid_db_setting=數據庫設置不正確：%v
 invalid_repo_path=倉庫根目錄設置不正確：%v
 run_user_not_match=執行系統用戶非當前用戶：%s -> %s
-smtp_host_missing_port=SMTP Host is missing port in address.
-invalid_smtp_from=SMTP From field is not valid: %v
+smtp_host_missing_port=SMTP Host port missing from address.
+invalid_smtp_from=SMTP From field is invalid: %v
 save_config_failed=應用配置保存失敗：%v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=管理員帳戶設置不正確：%v
 install_success=您好！我們很高興您選擇使用 Gogs，祝您使用愉快，代碼從此無 BUG！
 invalid_log_root_path=日誌根目錄無效: %v
@@ -151,6 +155,8 @@ register_hepler_msg=已經註冊？立即登錄！
 social_register_hepler_msg=已經註冊？立即綁定！
 disable_register_prompt=對不起，註冊功能已被關閉。請聯系網站管理員。
 disable_register_mail=對不起，註冊郵箱確認功能已被關閉。
+auth_source=Authentication Source
+local=Local
 remember_me=記住登錄
 forgot_password=忘記密碼
 forget_password=忘記密碼？
@@ -158,7 +164,7 @@ sign_up_now=還沒帳戶？馬上註冊。
 confirmation_mail_sent_prompt=一封新的確認郵件已經被發送至 <b>%s</b>，請檢查您的收件箱並在 %d 小時內完成確認註冊操作。
 active_your_account=激活您的帳戶
 prohibit_login=Login Prohibited
-prohibit_login_desc=Your account is prohibited to login, please contact site admin.
+prohibit_login_desc=Your account is prohibited from logging in. Please contact the site admin.
 resent_limit_prompt=對不起，您請求發送激活郵件過於頻繁，請等待 3 分鐘後再試！
 has_unconfirmed_mail=%s 您好，您有一封發送至( <b>%s</b>) 但未被確認的郵件。如果您未收到激活郵件，或需要重新發送，請單擊下方的按鈕。
 resend_mail=單擊此處重新發送確認郵件
@@ -175,7 +181,7 @@ login_two_factor_enter_recovery_code=Enter a two-factor recovery code
 login_two_factor_recovery=Two-factor Recovery
 login_two_factor_recovery_code=Recovery Code
 login_two_factor_enter_passcode=Enter a two-factor passcode
-login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+login_two_factor_invalid_recovery_code=Recovery code already used or invalid.
 
 [mail]
 activate_account=請激活您的帳戶
@@ -207,12 +213,12 @@ CommitSummary=Commit summary
 CommitMessage=Commit message
 CommitChoice=Commit choice
 TreeName=File path
-Content=Content
+Content=內容
 
 require_error=不能為空。
 alpha_dash_error=必須為英文字母、阿拉伯數字或橫線（-_）。
 alpha_dash_dot_error=必須為英文字母、阿拉伯數字、橫線（-_）或點。
-alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
+alpha_dash_dot_slash_error=` must be alphanumeric, dash (-_), dot or slash characters.`
 size_error=長度必須為 %s。
 min_size_error=長度最小為 %s 個字符。
 max_size_error=長度最大為 %s 個字符。
@@ -229,6 +235,7 @@ org_name_been_taken=組織名稱已經被佔用。
 team_name_been_taken=團隊名稱已經被佔用。
 email_been_used=郵箱地址已經被使用。
 username_password_incorrect=用戶名或密碼不正確。
+auth_source_mismatch=The authentication source selected is not associated with the user.
 enterred_invalid_repo_name=請檢查您輸入的倉庫名稱是正確。
 enterred_invalid_owner_name=請檢查您輸入的新所有者用戶名是否正確。
 enterred_invalid_password=請檢查您輸入的密碼是否正確。
@@ -250,22 +257,21 @@ change_avatar=Change your avatar
 join_on=加入於
 repositories=倉庫列表
 activity=公開活動
-followers=關註者
+followers=關注者
 starred=已讚好
-following=關註中
+following=關注中
 follow=關注
 unfollow=取消關注
 
-form.name_reserved=用戶名 '%s' 是被保留的。
-form.name_pattern_not_allowed=用戶名不允許 '%s' 的格式。
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
 profile=個人信息
 password=修改密碼
-avatar=Avatar
+avatar=頭像
 ssh_keys=管理 SSH 密鑰
-security=Security
-repos=Repositories
+security=安全
+repos=倉庫
 orgs=管理組織
 applications=管理授權應用
 delete=刪除帳戶
@@ -335,19 +341,20 @@ key_state_desc=該密鑰在 7 天內被使用過
 token_state_desc=此token在過去七天內曾經被使用過
 
 two_factor=Two-factor Authentication
-two_factor_status=Status:
-two_factor_on=On
-two_factor_off=Off
-two_factor_enable=Enable
-two_factor_disable=Disable
+two_factor_status=狀態：
+two_factor_on=開啟
+two_factor_off=關閉
+two_factor_enable=啟用
+two_factor_disable=禁用
 two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
 two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
 two_factor_enable_title=Enable Two-factor Authentication
 two_factor_scan_qr=Please use your authentication application to scan the image:
-two_factor_or_enter_secret=Or enter the secret:
-two_factor_then_enter_passcode=Then enter passcode:
-two_factor_verify=Verify
+two_factor_or_enter_secret=或者輸入密碼：
+two_factor_then_enter_passcode=然後輸入驗證碼：
+two_factor_verify=驗證
 two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_reused_passcode=The passcode you entered has already been used, please try another one!
 two_factor_enable_error=Enable Two-factor authentication failed: %v
 two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
 two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
@@ -370,6 +377,7 @@ delete_token=删除令牌
 access_token_deletion=刪除個人的連接token
 access_token_deletion_desc=刪除此連接token將會刪除與相關應用程式的連結。您想要繼續嗎?
 delete_token_success=您的連接token已成功刪除。請記得更新您的應用程式。
+token_name_exists=Token with same name already exists.
 
 orgs.none=You are not a member of any organizations.
 orgs.leave_title=Leave organization
@@ -417,10 +425,11 @@ mirror_last_synced=Last Synced
 watchers=關注者
 stargazers=稱讚者
 forks=派生倉庫
+repo_description_helper=Description of repository. Maximum 512 characters length.
+repo_description_length=Available characters
 
 form.reach_limit_of_creation=擁有者已達到儲存庫最大的新增上限 %d。
-form.name_reserved=倉庫名稱 '%s' 是被保留的。
-form.name_pattern_not_allowed=倉庫名稱不允許 '%s' 的格式。
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=需要授權驗證
 migrate_type=遷移類型
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=File content has been changed since you starte
 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.fail_to_delete_file=Failed to delete 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'
@@ -634,6 +644,7 @@ pulls.cannot_auto_merge_desc=由於存在衝突，不能自動合併這推送請
 pulls.cannot_auto_merge_helper=請手動合併來解決衝突。
 pulls.create_merge_commit=Create a merge commit
 pulls.rebase_before_merging=Rebase before merging
+pulls.commit_description=Commit Description
 pulls.merge_pull_request=合併請求
 pulls.open_unmerged_pull_exists=`由於已經存在來自相同倉庫和合併信息的未合併請求（#%d），您無法執行重新開啟操作。`
 pulls.delete_branch=Delete Branch
@@ -738,7 +749,7 @@ settings.tracker_issue_style=External Issue Tracker Naming Style:
 settings.tracker_issue_style.numeric=Numeric
 settings.tracker_issue_style.alphanumeric=Alphanumeric
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分別作為用戶名、倉庫名和問題索引的占位符。
-settings.pulls_desc=啟用合併請求以接受社區貢獻
+settings.pulls_desc=Enable pull requests to accept contributions between repositories and branches
 settings.pulls.ignore_whitespace=Ignore changes in whitespace
 settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=危險操作區
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=Repository wiki data have been erased successfull
 settings.delete=刪除本倉庫
 settings.delete_desc=刪除倉庫操作不可逆轉，請三思而後行。
 settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滾。
-settings.delete_notices_2=- 此操作將永久刪除該倉庫，包括 Git 數據、 問題、 評論和協作者的操作權限。
+settings.delete_notices_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
 settings.delete_notices_fork_1=- All forks will become independent after deletion.
 settings.deletion_success=倉庫刪除成功！
 settings.update_settings_success=倉庫設置更新成功！
@@ -777,8 +788,10 @@ 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.add_webhook=添加 Web 鉤子
 settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文檔</a> 獲取更多信息。
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=添加 Web 鉤子
 settings.webhook_deletion=刪除 Web 鉤子
 settings.webhook_deletion_desc=刪除該 Web 鉤子將會刪除與其有關的信息和推送歷史。是否繼續？
 settings.webhook_deletion_success=Web 鉤子刪除成功！
@@ -792,6 +805,8 @@ settings.webhook.response=響應內容
 settings.webhook.headers=標題
 settings.webhook.payload=推送內容
 settings.webhook.body=響應內容
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git 鉤子是由 Git 本身提供的功能，以下為 Gogs 所支持的鉤子列表。
 settings.githook_edit_desc=如果鉤子未啟動，則會顯示樣例文件中的內容。如果想要刪除某個鉤子，則提交空白文本即可。
 settings.githook_name=鉤子名稱
@@ -819,10 +834,10 @@ settings.event_push=推送
 settings.event_push_desc=Git 倉庫推送
 settings.event_issues=Issues
 settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
-settings.event_issue_comment=Issue Comment
-settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_pull_request=Pull Request
 settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
 settings.event_release=Release
 settings.event_release_desc=Release published in a repository.
 settings.active=是否激活
@@ -852,6 +867,8 @@ settings.add_key_success=新的部署密鑰 '%s' 添加成功！
 settings.deploy_key_deletion=刪除部署密鑰
 settings.deploy_key_deletion_desc=刪除該部署密鑰會移除本倉庫所有相關的操作權限。是否繼續？
 settings.deploy_key_deletion_success=刪除部署密鑰成功！
+settings.description_desc=Description of repository. Maximum 512 characters length.
+settings.description_length=Available characters
 
 diff.browse_source=瀏覽代碼
 diff.parent=父節點
@@ -916,9 +933,8 @@ team_name_helper=您可以使用該名稱來通知改組全體成員。
 team_desc_helper=一句話描述這個團隊是做什麼的。
 team_permission_desc=請選擇該團隊所具有的權限等級：
 
-form.name_reserved=組織名稱 '%s' 是被保留的。
-form.name_pattern_not_allowed=組織名稱不允許 '%s' 的格式。
-form.team_name_reserved=Team name '%s' is reserved.
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=組織設置
 settings.options=基本設置
@@ -990,12 +1006,19 @@ first_page=首頁
 last_page=末頁
 total=總計：%d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 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.select_operation_to_run=Please select operation to run
 dashboard.operation_run=執行
 dashboard.clean_unbind_oauth=清理未綁定社交帳號
 dashboard.clean_unbind_oauth_success=所有未綁定社交數據清除成功！
@@ -1087,11 +1110,12 @@ repos.stars=讚好數
 repos.issues=問題數
 repos.size=Size
 
-auths.auth_manage_panel=認證管理面板
+auths.auth_sources=Authentication Sources
 auths.new=添加新認證源
 auths.name=認證名稱
 auths.type=認證類型
 auths.enabled=已啟用
+auths.default=Default
 auths.updated=最後更新時間
 auths.auth_type=認證類型
 auths.auth_name=認證名稱
@@ -1128,9 +1152,9 @@ auths.enable_tls=啟用 TLS 加密
 auths.skip_tls_verify=忽略 TLS 驗證
 auths.pam_service_name=PAM 服務名稱
 auths.enable_auto_register=允許授權用戶自動註冊
-auths.tips=幫助提示
 auths.edit=編輯認證設置
 auths.activated=該授權認證已經啟用
+auths.default_auth=This authentication is default login source
 auths.new_success=新的認證源 "%s" 添加成功！
 auths.update_success=認證設置更新成功！
 auths.update=更新認證設置
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=該認證將被刪除。是否繼續？
 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=認證源刪除成功！
 auths.login_source_exist=Login source '%s' already exists.
+auths.github_api_endpoint=API Endpoint
 
 config.not_set=(not set)
 config.server_config=服務器配置
-config.app_name=應用名稱
-config.app_ver=應用版本
-config.app_url=應用 URL
-config.domain=應用域名
-config.offline_mode=離線模式
-config.disable_router_log=關閉路由日志
+config.brand_name=Brand name
 config.run_user=執行用戶
 config.run_mode=執行模式
-config.git_version=Git Version
-config.static_file_root_path=靜態文件根目錄
-config.log_file_root_path=日志文件根目錄
-config.reverse_auth_user=反向代理認證
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH 配置
-config.ssh_enabled=已啟用
-config.ssh_start_builtin_server=啟動內建伺服器
-config.ssh_domain=Domain
-config.ssh_port=埠
-config.ssh_listen_port=監聽埠
-config.ssh_root_path=根路徑
-config.ssh_key_test_path=金鑰測試路徑
-config.ssh_keygen_path=金鑰產生 (' ssh-keygen ') 路徑
-config.ssh_minimum_key_size_check=金鑰最小大小檢查
-config.ssh_minimum_key_sizes=金鑰最小大小
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
-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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo_config=Repository configuration
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=數據庫配置
-config.db_type=數據庫類型
-config.db_host=主機地址
-config.db_name=數據庫名稱
-config.db_user=數據庫用戶
-config.db_ssl_mode=SSL 模式
-config.db_ssl_mode_helper=（僅限 "postgres" 使用）
-config.db_path=數據庫路徑
-config.db_path_helper=（用於 "sqlite3" 和 "tidb"）
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=服務配置
-config.register_email_confirm=註冊電子郵件確認
-config.disable_register=關閉註冊功能
-config.show_registration_button=顯示註冊按鈕
-config.require_sign_in_view=強制登錄瀏覽
-config.mail_notify=郵件通知提醒
-config.disable_key_size_check=禁用密鑰最小長度檢查
-config.enable_captcha=啟用驗證碼服務
-config.active_code_lives=激活用戶連結有效期
-config.reset_password_code_lives=重置密碼連結有效期
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Web 鉤子配置
-config.queue_length=隊列長度
-config.deliver_timeout=推送超時
-config.skip_tls_verify=忽略 TLS 驗證
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=郵件配置
-config.mailer_enabled=啟用服務
-config.mailer_disable_helo=禁用 HELO 操作
-config.mailer_name=發送者名稱
-config.mailer_host=郵件主機地址
-config.mailer_user=發送者帳號
-config.send_test_mail=發送測試郵件
-config.test_mail_failed=無法向 '%s' 發送測試郵件: %v
-config.test_mail_sent=測試電子郵件已發送到 '%s'。
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=社交帳號配置
-config.oauth_enabled=啟用服務
-
-config.cache_config=Cache 配置
-config.cache_adapter=Cache 適配器
-config.cache_interval=Cache 周期
-config.cache_conn=Cache 連接字符串
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Session 配置
-config.session_provider=Session 提供者
-config.provider_config=提供者配置
-config.cookie_name=Cookie 名稱
-config.enable_set_cookie=啟用設置 Cookie
-config.gc_interval_time=垃圾收集周期
-config.session_life_time=Session 生命周期
-config.https_only=僅限 HTTPS
-config.cookie_life_time=Cookie 生命周期
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Cache 配置
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP configuration
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=圖片配置
-config.picture_service=圖片服務
-config.disable_gravatar=禁用 Gravatar 頭像
-config.enable_federated_avatar=Enable Federated Avatars
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
 
-config.git_config=Git Configuration
-config.git_disable_diff_highlight=Disable Diff Syntax Highlight
-config.git_max_diff_lines=Max Diff Lines (for a single file)
-config.git_max_diff_line_characters=Max Diff Characters (for a single line)
-config.git_max_diff_files=Max Diff Files (to be shown)
-config.git_gc_args=GC Arguments
-config.git_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.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Web 鉤子配置
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
+
+config.git_config=Git configuration
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=日誌配置
+config.log_file_root_path=日志文件根目錄
 config.log_mode=Mode
 config.log_options=Options
 
@@ -1283,7 +1368,6 @@ notices.delete_success=系統提示刪除成功！
 
 [action]
 create_repo=創建了儲存庫 <a href="%s">%s</a>
-fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=重新命名倉庫 <code>%[1]s</code> 為 <a href="%[2]s">%[3]s</a>
 commit_repo=推送了 <a href="%[1]s/src/%[2]s">%[3]s</a> 分支的代碼到 <a href="%[1]s">%[4]s</a>
 compare_commits=查看 %d 次提交的內容比對
@@ -1300,6 +1384,10 @@ create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href=
 delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=推送了標籤 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>
 delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
+mirror_sync_push=synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
+mirror_sync_create=synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
+mirror_sync_delete=synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 
 [tool]
 ago=之前
@@ -1321,6 +1409,7 @@ months=%d 月%s
 years=%d 年%s
 raw_seconds=秒
 raw_minutes=分鐘
+raw_hours=hours
 
 [dropzone]
 default_message=拖曳文件到此處或單擊上傳

conf/locale/locale_zh-TW.ini

@@ -1,7 +1,7 @@
-app_desc=基於 Go 語言的自助 Git 服務
+app_desc=一款極易搭建的自助 Git 服務
 
 home=首頁
-dashboard=控制面版
+dashboard=控制面板
 explore=探索
 help=說明
 sign_in=登入
@@ -9,7 +9,6 @@ sign_out=登出
 sign_up=註冊
 register=註冊
 website=網站
-version=版本
 page=頁面
 template=樣板
 language=語言
@@ -35,7 +34,7 @@ manage_org=管理組織
 admin_panel=管理面板
 account_settings=帳號設定
 settings=設定
-your_profile=個人資料
+your_profile=個人資訊
 your_settings=用戶設定
 
 activities=活動
@@ -44,6 +43,10 @@ issues=問題
 
 cancel=取消
 
+[status]
+page_not_found=Page Not Found
+internal_server_error=Internal Server Error
+
 [install]
 install=安裝頁面
 title=首次安裝步驟
@@ -82,8 +85,8 @@ app_url=應用程式網址
 app_url_helper=該設置影響 HTTP/HTTPS 複製地址和一些郵箱中的連結。
 log_root_path=日誌路徑
 log_root_path_helper=寫入日誌檔目錄
-enable_console_mode=Enable Console Mode
-enable_console_mode_popup=In addition to file mode, also print logs to console.
+enable_console_mode=開啟主控台模式
+enable_console_mode_popup=除了使用檔案模式之外, 還要將日誌列印到控制台。
 
 optional_title=可選設置
 email_title=電子郵件服務設定
@@ -107,7 +110,7 @@ enable_captcha=啟用驗證碼服務
 enable_captcha_popup=要求在用戶註冊時輸入驗證碼
 require_sign_in_view=啓用登錄訪問限制
 require_sign_in_view_popup=只有已登錄的用戶才能夠訪問頁面，否則將只能看到登錄或註冊頁面。
-admin_setting_desc=創建管理員帳號並不是必須的，因為 ID=1 的用戶將自動獲得管理員權限。
+admin_setting_desc=建立管理員帳號並不是必須的，因為 ID=1 的使用者將自動獲得管理員權限。
 admin_title=管理員帳號設置
 admin_name=管理員用戶名
 admin_password=管理員密碼
@@ -119,9 +122,10 @@ sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s
 invalid_db_setting=資料庫設定不正確: %v
 invalid_repo_path=倉庫根目錄設置不正確：%v
 run_user_not_match=執行系統用戶非當前用戶：%s -> %s
-smtp_host_missing_port=SMTP Host is missing port in address.
+smtp_host_missing_port=SMTP 主機缺少位址中的埠。
 invalid_smtp_from=SMTP 寄件者欄位無效﹔%v
 save_config_failed=設定儲存失敗：%v
+init_failed=Failed to initialize application: %v
 invalid_admin_setting=管理員帳戶設置不正確：%v
 install_success=您好！我們很高興您選擇使用 Gogs，祝您使用愉快，代碼從此無 BUG！
 invalid_log_root_path=日誌根目錄無效: %v
@@ -151,6 +155,8 @@ register_hepler_msg=已經註冊？立即登錄！
 social_register_hepler_msg=已經註冊？立即綁定！
 disable_register_prompt=對不起，註冊功能已被關閉。請聯系網站管理員。
 disable_register_mail=對不起，註冊郵箱確認功能已被關閉。
+auth_source=認證來源
+local=本地
 remember_me=記住登錄
 forgot_password=忘記密碼
 forget_password=忘記密碼？
@@ -169,13 +175,13 @@ reset_password_helper=單擊此處重置密碼
 password_too_short=密碼長度不能少於 6 位！
 non_local_account=非本地帳戶無法通過 Gogs 修改密碼。
 
-login_two_factor=Two-factor Authentication
-login_two_factor_passcode=Authentication Passcode
-login_two_factor_enter_recovery_code=Enter a two-factor recovery code
-login_two_factor_recovery=Two-factor Recovery
-login_two_factor_recovery_code=Recovery Code
-login_two_factor_enter_passcode=Enter a two-factor passcode
-login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+login_two_factor=兩步驗證
+login_two_factor_passcode=驗證碼
+login_two_factor_enter_recovery_code=鍵入兩部驗證碼
+login_two_factor_recovery=兩步恢復
+login_two_factor_recovery_code=恢復代碼
+login_two_factor_enter_passcode=鍵入兩步驗證碼
+login_two_factor_invalid_recovery_code=恢復代碼已使用或無效。
 
 [mail]
 activate_account=請激活您的帳戶
@@ -195,7 +201,7 @@ RepoName=儲存庫名稱
 Email=郵箱地址
 Password=密碼
 Retype=確認密碼
-SSHTitle=SSH 密鑰名稱
+SSHTitle=SSH 公鑰名稱
 HttpsUrl=HTTPS URL 地址
 PayloadUrl=推送地址
 TeamName=團隊名稱
@@ -229,6 +235,7 @@ org_name_been_taken=組織名稱已經被佔用。
 team_name_been_taken=團隊名稱已經被佔用。
 email_been_used=郵箱地址已經被使用。
 username_password_incorrect=用戶名或密碼不正確。
+auth_source_mismatch=此用戶未與所用的認證來源相關聯
 enterred_invalid_repo_name=請檢查您輸入的倉庫名稱是正確。
 enterred_invalid_owner_name=請檢查您輸入的新所有者用戶名是否正確。
 enterred_invalid_password=請檢查您輸入的密碼是否正確。
@@ -250,22 +257,21 @@ change_avatar=更改頭像
 join_on=加入於
 repositories=倉庫列表
 activity=公開活動
-followers=關註者
+followers=關注者
 starred=已讚好
-following=關註中
+following=關注中
 follow=關注
 unfollow=取消關注
 
-form.name_reserved=用戶名 '%s' 是被保留的。
-form.name_pattern_not_allowed=用戶名不允許 '%s' 的格式。
+form.name_not_allowed=User name or pattern %q is not allowed.
 
 [settings]
-profile=個人信息
+profile=個人資訊
 password=修改密碼
 avatar=頭像
 ssh_keys=管理 SSH 密鑰
-security=Security
-repos=Repositories
+security=安全
+repos=倉庫
 orgs=管理組織
 applications=管理授權應用
 delete=刪除帳戶
@@ -277,7 +283,7 @@ full_name=自定義名稱
 website=個人網站
 location=所在地區
 update_profile=更新信息
-update_profile_success=您的個人信息更新成功！
+update_profile_success=您的個人資訊更新成功！
 change_username=用戶名將被修改
 change_username_prompt=該操作將會影響到所有與您帳戶有關的鏈接
 continue=繼續操作
@@ -318,7 +324,7 @@ manage_ssh_keys=管理 SSH 密鑰
 add_key=增加密鑰
 ssh_desc=以下是與您帳戶所關聯的 SSH 密鑰，如果您發現有陌生的密鑰，請立即刪除它！
 ssh_helper=<strong>需要幫助嗎?</strong> 請查看有關 <a href="%s"> 如何生成 SSH 密鑰</a> 的指南或 <a href="%s"> SSH 的常見問題</a> 的疑難排解。
-add_new_key=增加 SSH 密鑰
+add_new_key=增加 SSH 公鑰
 ssh_key_been_used=公共密鑰已經被使用
 ssh_key_name_used=使用相同名稱的公共密鑰已經存在！
 key_name=密鑰名稱
@@ -332,44 +338,46 @@ add_on=增加於
 last_used=上次使用在
 no_activity=沒有最近活動
 key_state_desc=該密鑰在 7 天內被使用過
-token_state_desc=此token在過去七天內曾經被使用過
+token_state_desc=此令牌在過去七天內曾經被使用過
 
-two_factor=Two-factor Authentication
-two_factor_status=Status:
-two_factor_on=On
-two_factor_off=Off
-two_factor_enable=Enable
-two_factor_disable=Disable
-two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
-two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
-two_factor_enable_title=Enable Two-factor Authentication
-two_factor_scan_qr=Please use your authentication application to scan the image:
-two_factor_or_enter_secret=Or enter the secret:
-two_factor_then_enter_passcode=Then enter passcode:
-two_factor_verify=Verify
-two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
-two_factor_enable_error=Enable Two-factor authentication failed: %v
-two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
-two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
-two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
-two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
-two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
-two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
-two_factor_disable_title=Disable Two-factor Authentication
-two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
-two_factor_disable_success=Two-factor authentication has disabled successfully!
+two_factor=兩步驗證
+two_factor_status=狀態：
+two_factor_on=開啟
+two_factor_off=關閉
+two_factor_enable=啟用
+two_factor_disable=禁用
+two_factor_view_recovery_codes=在安全的地方查看並保存 <a href="%s%s"> 您的恢復代碼 </a>。如果您失去對身份驗證應用程式的存取權限, 則可以將它們用作密碼。
+two_factor_http=在 HTTP/HTTPS 動作中，您不能使用純文字使用者名稱及密碼。請建立並使用<a href="%[1]s%[2]s">個人存取令牌</a>作為您的認證方式，範例：<code>%[3]s</code>。
+two_factor_enable_title=啟用兩步驗證
+two_factor_scan_qr=請使用您的身份驗證應用程式掃描圖像：
+two_factor_or_enter_secret=或輸入密碼: %s
+two_factor_then_enter_passcode=然後輸入驗證碼：
+two_factor_verify=驗證
+two_factor_invalid_passcode=您輸入的密碼無效，請再試一次。
+two_factor_reused_passcode=您输入的验证码已经被使用过了，请换一个重试！
+two_factor_enable_error=啟用兩步驗證失敗: %v
+two_factor_enable_success=您帳戶的兩步驗證已成功啟用！
+two_factor_recovery_codes_title=兩步驗證恢復代碼
+two_factor_recovery_codes_desc=當您無法存取您的認證應用程式時，可以使用救援代碼。每個救援代碼只能使用一次，因此 <b>請在安全的地方妥善保存您的救援代碼</b>。
+two_factor_regenerate_recovery_codes=重新生成恢復代碼
+two_factor_regenerate_recovery_codes_error=重新生成恢復代碼失敗: %v
+two_factor_regenerate_recovery_codes_success=已成功生成新的恢復代碼!
+two_factor_disable_title=停用兩步驗證
+two_factor_disable_desc=停用兩步驗證後，您的帳戶安全級別將降低。是否繼續？
+two_factor_disable_success=您帳戶的兩步驗證已成功停用！
 
 manage_access_token=管理個人操作令牌
 generate_new_token=生成新的令牌
-tokens_desc=您所產生的token將被用來存取Gogs APIs
+tokens_desc=您產生的令牌可以用來存取 Gogs API。
 new_token_desc=目前為止，任何令牌都對您的帳戶擁有完整的操作權限。
 token_name=令牌名稱
 generate_token=生成令牌
 generate_token_succees=新的操作令牌生成成功！您必須立即複製到一個安全的地方，因為該令牌只會顯示一次！
-delete_token=删除令牌
-access_token_deletion=刪除個人的連接token
+delete_token=刪除令牌
+access_token_deletion=刪除個人存取令牌
 access_token_deletion_desc=刪除此連接token將會刪除與相關應用程式的連結。您想要繼續嗎?
 delete_token_success=您的連接token已成功刪除。請記得更新您的應用程式。
+token_name_exists=有同樣名稱的令牌已經存在。
 
 orgs.none=您現在還不是任何組織的成員。
 orgs.leave_title=離開組織
@@ -378,7 +386,7 @@ orgs.leave_desc=離開組織後，所有與組織相關的倉庫和團隊權限
 repos.leave=離開
 repos.leave_title=離開存儲庫
 repos.leave_desc=在你離開後，您將無法進入到存儲庫。你想要繼續嗎？
-repos.leave_success=You have left repository '%s' successfully!
+repos.leave_success=您已經成功退出「%s」版本庫！
 
 delete_account=刪除當前帳戶
 delete_prompt=刪除操作會永久清除您的帳戶信息，並且 <strong>不可恢復</strong>！
@@ -417,10 +425,11 @@ mirror_last_synced=上次同步
 watchers=關注者
 stargazers=稱讚者
 forks=派生倉庫
+repo_description_helper=儲存庫的說明文字。最長 512 個字元。
+repo_description_length=可用字元
 
 form.reach_limit_of_creation=擁有者已達到儲存庫最大的新增上限 %d。
-form.name_reserved=倉庫名稱 '%s' 是被保留的。
-form.name_pattern_not_allowed=倉庫名稱不允許 '%s' 的格式。
+form.name_not_allowed=Repository name or pattern %q is not allowed.
 
 need_auth=需要授權驗證
 migrate_type=遷移類型
@@ -440,7 +449,7 @@ copy_link_success=複製成功！
 copy_link_error=請按下 ⌘-C 或 Ctrl-C 複製
 copied=複製成功
 unwatch=取消關注
-watch=關註
+watch=關注
 unstar=取消讚好
 star=讚好
 fork=複刻
@@ -450,7 +459,7 @@ quick_guide=快速幫助
 clone_this_repo=複製當前倉庫
 create_new_repo_command=從命令行創建一個新的倉庫
 push_exist_repo=從命令行推送已經創建的倉庫
-bare_message=This repository does not have any content yet.
+bare_message=此版本庫空空如也。
 
 files=檔案
 branch=分支
@@ -514,6 +523,7 @@ editor.file_changed_while_editing=從您開始編輯已更改檔的內容。<a t
 editor.file_already_exists=帶有名稱 '%s' 的檔已經存在在這個資料庫中。
 editor.no_changes_to_show=沒有可以顯示的變更。
 editor.fail_to_update_file=上傳/創建檔案 '%s' 失敗, 錯誤訊息: %v
+editor.fail_to_delete_file=無法刪除檔案「%s」，錯誤訊息：%v
 editor.add_subdir=新增子目錄...
 editor.unable_to_upload_files=上傳檔案失敗到 '%s', 錯誤訊息: %v
 editor.upload_files_to_dir=上傳檔案到 '%s'
@@ -616,7 +626,7 @@ pulls.compare_compare=對比文件變化
 pulls.filter_branch=過濾分支
 pulls.no_results=未找到結果
 pulls.nothing_to_compare=基準和對比分支代碼已經同步，無需進行對比。
-pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history.
+pulls.nothing_merge_base=因為兩個分支有完全不同的提交紀錄，因此無法比較。
 pulls.has_pull_request=`已經存在目標分支的合併請求：<a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create=創建合併請求
 pulls.title_desc=請求將 %[1]d 次代碼提交從 <code>%[2]s</code> 合併至 <code>%[3]s</code>
@@ -632,8 +642,9 @@ pulls.is_checking=該合併請求正在進行衝突檢查，請稍後再刷新
 pulls.can_auto_merge_desc=這個拉請求可以自動合併。
 pulls.cannot_auto_merge_desc=由於存在衝突，不能自動合併這推送請求。
 pulls.cannot_auto_merge_helper=請手動合併來解決衝突。
-pulls.create_merge_commit=Create a merge commit
-pulls.rebase_before_merging=Rebase before merging
+pulls.create_merge_commit=創建一個合併提交
+pulls.rebase_before_merging=合併前先 Rebase
+pulls.commit_description=提交記錄說明
 pulls.merge_pull_request=合併請求
 pulls.open_unmerged_pull_exists=`由於已經存在來自相同倉庫和合併信息的未合併請求（#%d），您無法執行重新開啟操作。`
 pulls.delete_branch=刪除分支
@@ -689,11 +700,11 @@ settings.collaboration.write=可寫權限
 settings.collaboration.read=可讀權限
 settings.collaboration.undefined=未定義
 settings.branches=分支列表
-settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
+settings.branches_bare=您無法管理空版本庫。請先推送一些內容至版本庫。
 settings.default_branch=預設分支
 settings.default_branch_desc=預設分支是程式碼 commit、pull requests 及線上編輯的基準分支。
 settings.update=更新
-settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
+settings.update_default_branch_unsupported=伺服器的 Git 版本不支援變更預設分支。
 settings.update_default_branch_success=這個 repository 的預設分支更新成功！
 settings.protected_branches=保護分支
 settings.protected_branches_desc=保護分支不被強制 Push、意外刪除以及限制 Commit 者白名單
@@ -723,13 +734,13 @@ settings.change_reponame_prompt=該操作將會影響到所有與該倉庫有關
 settings.advanced_settings=高級設置
 settings.wiki_desc=啓用 Wiki 系統
 settings.use_internal_wiki=使用內建 wiki
-settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
+settings.allow_public_wiki_desc=當版本庫為私有狀態時，允許 Wiki 的公開存取。
 settings.use_external_wiki=使用外部 wiki
 settings.external_wiki_url=外部 Wiki 連結
 settings.external_wiki_url_desc=當分頁上按一下，訪客將會重新導到 URL。
 settings.issues_desc=啟用問題追蹤
 settings.use_internal_issue_tracker=使用內建輕量級問題追蹤
-settings.allow_public_issues_desc=Allow public access to issues when repository is private
+settings.allow_public_issues_desc=當版本庫為私有狀態時，允許議題的公開存取。
 settings.use_external_issue_tracker=使用外部的問題管理系統
 settings.external_tracker_url=外部Issue Tracker網址
 settings.external_tracker_url_desc=當訪客在分頁上按一下，他們將會重新導向到 URL。
@@ -738,9 +749,9 @@ settings.tracker_issue_style=外部公單管理系統命名風格：
 settings.tracker_issue_style.numeric=數字
 settings.tracker_issue_style.alphanumeric=字母及數字
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分別作為用戶名、倉庫名和問題索引的占位符。
-settings.pulls_desc=啟用合併請求以接受社區貢獻
-settings.pulls.ignore_whitespace=Ignore changes in whitespace
-settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
+settings.pulls_desc=啟用「合併請求」功能，接受版本庫與分支之間的貢獻
+settings.pulls.ignore_whitespace=忽略空白符號的更改
+settings.pulls.allow_rebase_merge=允許使用 rebase 合併提交
 settings.danger_zone=危險操作區
 settings.cannot_fork_to_same_owner=你不可以 fork 一個 repository 到它的擁有者。
 settings.new_owner_has_same_repo=新的倉庫擁有者已經存在同名倉庫！
@@ -761,7 +772,7 @@ settings.wiki_deletion_success=儲存庫 wiki 資料已成功清除。
 settings.delete=刪除本倉庫
 settings.delete_desc=刪除倉庫操作不可逆轉，請三思而後行。
 settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滾。
-settings.delete_notices_2=- 此操作將永久刪除該倉庫，包括 Git 數據、 問題、 評論和協作者的操作權限。
+settings.delete_notices_2=- 此動作將永久移除版本庫，包含了 Git 資料、議題、留言與協作者的存取權限。
 settings.delete_notices_fork_1=- 刪除後所有的派生倉庫將會成為獨立倉庫
 settings.deletion_success=倉庫刪除成功！
 settings.update_settings_success=倉庫設置更新成功！
@@ -777,8 +788,10 @@ settings.collaborator_deletion_desc=刪除後此使用者將不再有協同者
 settings.remove_collaborator_success=被操作的協作者已經被收回權限！
 settings.search_user_placeholder=搜索用戶...
 settings.org_not_allowed_to_be_collaborator=組織不允許被加為協同者。
-settings.add_webhook=添加 Web 鉤子
 settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文檔</a> 獲取更多信息。
+settings.webhooks.add_new=Add a new webhook:
+settings.webhooks.choose_a_type=Choose a type...
+settings.add_webhook=添加 Web 鉤子
 settings.webhook_deletion=刪除 Web 鉤子
 settings.webhook_deletion_desc=刪除該 Web 鉤子將會刪除與其有關的信息和推送歷史。是否繼續？
 settings.webhook_deletion_success=Web 鉤子刪除成功！
@@ -786,12 +799,14 @@ settings.webhook.test_delivery=測試推送
 settings.webhook.test_delivery_desc=生成並推送一個模擬的 Push 事件
 settings.webhook.test_delivery_success=測試推送已經加入到隊列，請耐心等待數秒再刷新推送記錄。
 settings.webhook.redelivery=重新傳送
-settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
+settings.webhook.redelivery_success=任務「%s」已經重新加入至隊列。可能需要幾秒鐘來更新歷史的隊列狀態
 settings.webhook.request=請求內容
 settings.webhook.response=響應內容
 settings.webhook.headers=標題
 settings.webhook.payload=推送內容
 settings.webhook.body=響應內容
+settings.webhook.err_cannot_parse_payload_url=Cannot parse payload URL: %v
+settings.webhook.err_cannot_use_local_addresses=Non admins are not allowed to use local addresses.
 settings.githooks_desc=Git 鉤子是由 Git 本身提供的功能，以下為 Gogs 所支持的鉤子列表。
 settings.githook_edit_desc=如果鉤子未啟動，則會顯示樣例文件中的內容。如果想要刪除某個鉤子，則提交空白文本即可。
 settings.githook_name=鉤子名稱
@@ -819,10 +834,10 @@ settings.event_push=推送
 settings.event_push_desc=Git 倉庫推送
 settings.event_issues=Issues
 settings.event_issues_desc=已經開啟、關閉、重啟、修改、指派、取消指派、更新標籤、清除標籤、新增里程碑或刪除里程碑的 issue。
-settings.event_issue_comment=Issue 評論
-settings.event_issue_comment_desc=已經建立、編輯或刪除的 Issue 評論。
 settings.event_pull_request=合併請求
 settings.event_pull_request_desc=已經開啟、關閉、重啟、編輯、指派、解除指派、更新標籤、清除標籤、新增里程碑、刪除里程碑或同步的 pull request。
+settings.event_issue_comment=Issue 評論
+settings.event_issue_comment_desc=已經建立、編輯或刪除的 Issue 評論。
 settings.event_release=Release
 settings.event_release_desc=Release 將發佈在一個 repository 中。
 settings.active=是否激活
@@ -835,12 +850,12 @@ 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.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository.
+settings.add_dingtalk_hook_desc=在您的版本庫增加 <a href="%s">Dingtalk</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.deploy_keys_helper=<b>噢不！</b> 如果要新增個人的公開金鑰，請到 <a href="%s%s">用戶設定</a> 新增。
 settings.add_deploy_key=添加部署密鑰
 settings.deploy_key_desc=部署密鑰僅具有隻讀權限，它在功能上和個人用戶的公開密鑰有本質區別。
 settings.no_deploy_keys=您還沒有添加任何部署密鑰。
@@ -852,6 +867,8 @@ settings.add_key_success=新的部署密鑰 '%s' 添加成功！
 settings.deploy_key_deletion=刪除部署密鑰
 settings.deploy_key_deletion_desc=刪除該部署密鑰會移除本倉庫所有相關的操作權限。是否繼續？
 settings.deploy_key_deletion_success=刪除部署密鑰成功！
+settings.description_desc=儲存庫的說明文字。最長 512 個字元。
+settings.description_length=可用字元
 
 diff.browse_source=瀏覽代碼
 diff.parent=父節點
@@ -916,9 +933,8 @@ team_name_helper=您可以使用該名稱來通知改組全體成員。
 team_desc_helper=一句話描述這個團隊是做什麼的。
 team_permission_desc=請選擇該團隊所具有的權限等級：
 
-form.name_reserved=組織名稱 '%s' 是被保留的。
-form.name_pattern_not_allowed=組織名稱不允許 '%s' 的格式。
-form.team_name_reserved=團隊名稱 '%s' 已被保留。
+form.name_not_allowed=Organization name or pattern %q is not allowed.
+form.team_name_not_allowed=Team name or pattern %q is not allowed.
 
 settings=組織設置
 settings.options=基本設置
@@ -990,12 +1006,19 @@ first_page=首頁
 last_page=末頁
 total=總計：%d
 
+dashboard.build_info=Build Information
+dashboard.app_ver=Application version
+dashboard.git_version=Git version
+dashboard.go_version=Go version
+dashboard.build_time=Build time
+dashboard.build_commit=Build commit
 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.select_operation_to_run=Please select operation to run
 dashboard.operation_run=執行
 dashboard.clean_unbind_oauth=清理未綁定社交帳號
 dashboard.clean_unbind_oauth_success=所有未綁定社交數據清除成功！
@@ -1082,16 +1105,17 @@ repos.repo_manage_panel=倉庫管理界面
 repos.owner=所有者
 repos.name=倉庫名稱
 repos.private=私有庫
-repos.watches=關註數
+repos.watches=關注數
 repos.stars=讚好數
 repos.issues=問題數
 repos.size=大小
 
-auths.auth_manage_panel=認證管理面板
+auths.auth_sources=認證來源
 auths.new=添加新認證源
 auths.name=認證名稱
 auths.type=認證類型
 auths.enabled=已啟用
+auths.default=預設
 auths.updated=最後更新時間
 auths.auth_type=認證類型
 auths.auth_name=認證名稱
@@ -1100,7 +1124,7 @@ auths.domain=域名
 auths.host=主機地址
 auths.port=主機端口
 auths.bind_dn=綁定DN
-auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
+auths.bind_dn_helper=可以使用'%s'作為用戶名稱的預留位置，例如：DOM\%s
 auths.bind_password=綁定密碼
 auths.bind_password_helper=警告：該密碼將會以明文的形式保存在數據庫中。請不要使用擁有高權限的帳戶！
 auths.user_base=用戶搜索基準
@@ -1110,11 +1134,11 @@ auths.attribute_username_placeholder=留空表示使用用戶登錄時所使用
 auths.attribute_name=歸納名字
 auths.attribute_surname=姓氏屬性
 auths.attribute_mail=電子郵箱屬性
-auths.verify_group_membership=Verify group membership
-auths.group_search_base_dn=Group Search Base DN
-auths.group_filter=Group Filter
-auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
-auths.user_attribute_listed_in_group=User Attribute Listed in Group
+auths.verify_group_membership=驗證組成員身份
+auths.group_search_base_dn=組蒐索基準 DN
+auths.group_filter=組篩選器
+auths.group_attribute_contain_user_list=包含使用者列表的群組屬性
+auths.user_attribute_listed_in_group=組中列出的使用者屬性
 auths.attributes_in_bind=從 Bind DN 中獲取屬性信息
 auths.filter=使用者篩選器
 auths.admin_filter=管理者篩選器
@@ -1128,9 +1152,9 @@ auths.enable_tls=啟用 TLS 加密
 auths.skip_tls_verify=忽略 TLS 驗證
 auths.pam_service_name=PAM 服務名稱
 auths.enable_auto_register=允許授權用戶自動註冊
-auths.tips=幫助提示
 auths.edit=編輯認證設置
 auths.activated=該授權認證已經啟用
+auths.default_auth=此認證方式為預設登入來源
 auths.new_success=新的認證源 "%s" 添加成功！
 auths.update_success=認證設置更新成功！
 auths.update=更新認證設置
@@ -1140,119 +1164,180 @@ auths.delete_auth_desc=該認證將被刪除。是否繼續？
 auths.still_in_used=一些使用者仍然使用此驗證方式，請先刪除或轉換這些使用者到其它登入類型。
 auths.deletion_success=認證源刪除成功！
 auths.login_source_exist=登錄源 '%s' 已存在。
+auths.github_api_endpoint=API 端點
 
-config.not_set=(not set)
+config.not_set=(未設定)
 config.server_config=服務器配置
-config.app_name=應用名稱
-config.app_ver=應用版本
-config.app_url=應用 URL
-config.domain=應用域名
-config.offline_mode=離線模式
-config.disable_router_log=關閉路由日志
+config.brand_name=Brand name
 config.run_user=執行用戶
 config.run_mode=執行模式
-config.git_version=Git 版本
-config.static_file_root_path=靜態文件根目錄
-config.log_file_root_path=日志文件根目錄
-config.reverse_auth_user=反向代理認證
+config.server.external_url=External URL
+config.server.domain=Domain
+config.server.protocol=Protocol
+config.server.http_addr=HTTP address
+config.server.http_port=HTTP port
+config.server.cert_file=Certificate file
+config.server.key_file=Key file
+config.server.tls_min_version=Minimum TLS version
+config.server.unix_socket_permission=Unix socket permission
+config.server.local_root_url=Local root URL
+config.server.offline_mode=Offline mode
+config.server.disable_router_log=Disable router log
+config.server.enable_gzip=Enable Gzip
+config.server.app_data_path=Application data path
+config.server.load_assets_from_disk=Load assets from disk
+config.server.landing_url=Landing URL
 
 config.ssh_config=SSH 配置
-config.ssh_enabled=已啟用
-config.ssh_start_builtin_server=啟動內建伺服器
-config.ssh_domain=域名
-config.ssh_port=埠
-config.ssh_listen_port=監聽埠
-config.ssh_root_path=根路徑
-config.ssh_key_test_path=金鑰測試路徑
-config.ssh_keygen_path=金鑰產生 (' ssh-keygen ') 路徑
-config.ssh_minimum_key_size_check=金鑰最小大小檢查
-config.ssh_minimum_key_sizes=金鑰最小大小
+config.ssh.enabled=Enabled
+config.ssh.domain=Exposed domain
+config.ssh.port=Exposed port
+config.ssh.root_path=Root path
+config.ssh.keygen_path=Keygen path
+config.ssh.key_test_path=Key test path
+config.ssh.minimum_key_size_check=Minimum key size check
+config.ssh.minimum_key_sizes=Minimum key sizes
+config.ssh.rewrite_authorized_keys_at_start=Rewrite "authorized_keys" at start
+config.ssh.start_builtin_server=Start builtin server
+config.ssh.listen_host=Listen host
+config.ssh.listen_port=Listen port
+config.ssh.server_ciphers=Server ciphers
 
 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.http_config=HTTP Configuration
-config.http_access_control_allow_origin=Access Control Allow Origin
+config.repo.root_path=Root path
+config.repo.script_type=Script type
+config.repo.ansi_chatset=ANSI charset
+config.repo.force_private=Force private
+config.repo.max_creation_limit=Max creation limit
+config.repo.preferred_licenses=Preferred licenses
+config.repo.disable_http_git=Disable HTTP Git
+config.repo.enable_local_path_migration=Enable local path migration
+config.repo.enable_raw_file_render_mode=Enable raw file render mode
+config.repo.commits_fetch_concurrency=Commits fetch concurrency
+config.repo.editor.line_wrap_extensions=Editor line wrap extensions
+config.repo.editor.previewable_file_modes=Editor previewable file modes
+config.repo.upload.enabled=Upload enabled
+config.repo.upload.temp_path=Upload temporary path
+config.repo.upload.allowed_types=Upload allowed types
+config.repo.upload.file_max_size=Upload file size limit
+config.repo.upload.max_files=Upload files limit
 
 config.db_config=資料庫設定
-config.db_type=數據庫類型
-config.db_host=主機地址
-config.db_name=數據庫名稱
-config.db_user=數據庫用戶
-config.db_ssl_mode=SSL 模式
-config.db_ssl_mode_helper=（僅限 "postgres" 使用）
-config.db_path=數據庫路徑
-config.db_path_helper=（用於 "sqlite3" 和 "tidb"）
+config.db.type=Type
+config.db.host=Host
+config.db.name=Name
+config.db.user=User
+config.db.ssl_mode=SSL mode
+config.db.ssl_mode_helper=(for "postgres" only)
+config.db.path=Path
+config.db.path_helper=(for "sqlite3"only)
+config.db.max_open_conns=Maximum open connections
+config.db.max_idle_conns=Maximum idle connections
 
-config.service_config=服務配置
-config.register_email_confirm=註冊電子郵件確認
-config.disable_register=關閉註冊功能
-config.show_registration_button=顯示註冊按鈕
-config.require_sign_in_view=強制登錄瀏覽
-config.mail_notify=郵件通知提醒
-config.disable_key_size_check=禁用密鑰最小長度檢查
-config.enable_captcha=啟用驗證碼服務
-config.active_code_lives=激活用戶連結有效期
-config.reset_password_code_lives=重置密碼連結有效期
+config.security_config=Security configuration
+config.security.login_remember_days=Login remember days
+config.security.cookie_remember_name=Remember cookie
+config.security.cookie_username=Username cookie
+config.security.cookie_secure=Enable secure cookie
+config.security.reverse_proxy_auth_user=Reverse proxy authentication header
+config.security.enable_login_status_cookie=Enable login status cookie
+config.security.login_status_cookie_name=Login status cookie
 
-config.webhook_config=Web 鉤子配置
-config.queue_length=隊列長度
-config.deliver_timeout=推送超時
-config.skip_tls_verify=忽略 TLS 驗證
+config.email_config=Email configuration
+config.email.enabled=Enabled
+config.email.subject_prefix=Subject prefix
+config.email.host=Host
+config.email.from=From
+config.email.user=User
+config.email.disable_helo=Disable HELO
+config.email.helo_hostname=HELO hostname
+config.email.skip_verify=Skip certificate verify
+config.email.use_certificate=Use custom certificate
+config.email.cert_file=Certificate file
+config.email.key_file=Key file
+config.email.use_plain_text=Use plain text
+config.email.add_plain_text_alt=Add plain text alternative
+config.email.send_test_mail=Send test email
+config.email.test_mail_failed=Failed to send test email to '%s': %v
+config.email.test_mail_sent=Test email has been sent to '%s'.
 
-config.mailer_config=郵件配置
-config.mailer_enabled=啟用服務
-config.mailer_disable_helo=禁用 HELO 操作
-config.mailer_name=發送者名稱
-config.mailer_host=郵件主機地址
-config.mailer_user=發送者帳號
-config.send_test_mail=發送測試郵件
-config.test_mail_failed=無法向 '%s' 發送測試郵件: %v
-config.test_mail_sent=測試電子郵件已發送到 '%s'。
+config.auth_config=Authentication configuration
+config.auth.activate_code_lives=Activate code lives
+config.auth.reset_password_code_lives=Reset password code lives
+config.auth.require_email_confirm=Require email confirmation
+config.auth.require_sign_in_view=Require sign in view
+config.auth.disable_registration=Disable registration
+config.auth.enable_registration_captcha=Enable registration captcha
+config.auth.enable_reverse_proxy_authentication=Enable reverse proxy authentication
+config.auth.enable_reverse_proxy_auto_registration=Enable reverse proxy auto registration
+config.auth.reverse_proxy_authentication_header=Reverse proxy authentication header
 
-config.oauth_config=社交帳號配置
-config.oauth_enabled=啟用服務
-
-config.cache_config=Cache 配置
-config.cache_adapter=Cache 適配器
-config.cache_interval=Cache 周期
-config.cache_conn=Cache 連接字符串
+config.user_config=User configuration
+config.user.enable_email_notify=Enable email notification
 
 config.session_config=Session 配置
-config.session_provider=Session 提供者
-config.provider_config=提供者配置
-config.cookie_name=Cookie 名稱
-config.enable_set_cookie=啟用設置 Cookie
-config.gc_interval_time=垃圾收集周期
-config.session_life_time=Session 生命周期
-config.https_only=僅限 HTTPS
-config.cookie_life_time=Cookie 生命周期
+config.session.provider=Provider
+config.session.provider_config=Provider config
+config.session.cookie_name=Cookie
+config.session.https_only=HTTPS only
+config.session.gc_interval=GC interval
+config.session.max_life_time=Max life time
+config.session.csrf_cookie_name=CSRF cookie
+
+config.cache_config=Cache 配置
+config.cache.adapter=Adapter
+config.cache.interval=GC interval
+config.cache.host=Host
+
+config.http_config=HTTP設定
+config.http.access_control_allow_origin=Access control allow origin
+
+config.attachment_config=Attachment configuration
+config.attachment.enabled=Enabled
+config.attachment.path=Path
+config.attachment.allowed_types=Allowed types
+config.attachment.max_size=Size limit
+config.attachment.max_files=Files limit
+
+config.release_config=Release configuration
+config.release.attachment.enabled=Attachment enabled
+config.release.attachment.allowed_types=Attachment allowed types
+config.release.attachment.max_size=Attachment size limit
+config.release.attachment.max_files=Attachment files limit
 
 config.picture_config=圖片配置
-config.picture_service=圖片服務
-config.disable_gravatar=禁用 Gravatar 頭像
-config.enable_federated_avatar=開啟聯合頭像
+config.picture.avatar_upload_path=User avatar upload path
+config.picture.repo_avatar_upload_path=Repository avatar upload path
+config.picture.gravatar_source=Gravatar source
+config.picture.disable_gravatar=Disable Gravatar
+config.picture.enable_federated_avatar=Enable federated avatars
+
+config.mirror_config=Mirror configuration
+config.mirror.default_interval=Default interval
+
+config.webhook_config=Web 鉤子配置
+config.webhook.types=Types
+config.webhook.deliver_timeout=Deliver timeout
+config.webhook.skip_tls_verify=Skip TLS verify
 
 config.git_config=Git 配置
-config.git_disable_diff_highlight=禁用比較語法高亮
-config.git_max_diff_lines=Max Diff 線 （對於單個檔）
-config.git_max_diff_line_characters=最大比較的字元 （單行）
-config.git_max_diff_files=Max Diff 檔 （顯示）
-config.git_gc_args=GC 參數
-config.git_migrate_timeout=移動超時
-config.git_mirror_timeout=鏡像更新超時
-config.git_clone_timeout=複製操作超時
-config.git_pull_timeout=操作超時
-config.git_gc_timeout=GC 操作超時
+config.git.disable_diff_highlight=Disable diff syntax highlight
+config.git.max_diff_lines=Diff lines limit (for a single file)
+config.git.max_diff_line_characters=Diff characters limit (for a single line)
+config.git.max_diff_files=Diff files limit (for a single diff)
+config.git.gc_args=GC arguments
+config.git.migrate_timeout=Migration timeout
+config.git.mirror_timeout=Mirror fetch timeout
+config.git.clone_timeout=Clone timeout
+config.git.pull_timeout=Pull timeout
+config.git.gc_timeout=GC timeout
+
+config.lfs_config=LFS configuration
+config.lfs.storage=Storage
+config.lfs.objects_path=Objects path
 
 config.log_config=日誌配置
+config.log_file_root_path=日志文件根目錄
 config.log_mode=模式
 config.log_options=選項
 
@@ -1283,7 +1368,6 @@ notices.delete_success=系統提示刪除成功！
 
 [action]
 create_repo=創建了儲存庫 <a href="%s">%s</a>
-fork_repo=已經 fork 一個 repository 到 <a href="%s">%s</a>
 rename_repo=重新命名倉庫 <code>%[1]s</code> 為 <a href="%[2]s">%[3]s</a>
 commit_repo=推送了 <a href="%[1]s/src/%[2]s">%[3]s</a> 分支的代碼到 <a href="%[1]s">%[4]s</a>
 compare_commits=查看 %d 次提交的內容比對
@@ -1300,6 +1384,10 @@ create_branch=在 <a href="%[1]s">%[4]s</a> 建立新的分支 <a href="%[1]s/sr
 delete_branch=已經刪除在 <a href="%[1]s">%[3]s</a> 上的分支 <code>%[2]s</code>
 push_tag=推送了標籤 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>
 delete_tag=已經刪除在 <a href="%[1]s">%[3]s</a> 上的標籤 <code>%[2]s</code>
+fork_repo=已經 fork 一個 repository 到 <a href="%s">%s</a>
+mirror_sync_push=已經從鏡像同步了提交 <a href="%[1]s/src/%[2]s">%[3]s</a> 於 <a href="%[1]s">%[4]s</a>
+mirror_sync_create=已經從鏡像同步了參考 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>
+mirror_sync_delete=已經從鏡像同步並移除了參考 <code>%[2]s</code> 於 <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=之前
@@ -1321,6 +1409,7 @@ months=%d 月%s
 years=%d 年%s
 raw_seconds=秒
 raw_minutes=分鐘
+raw_hours=hours
 
 [dropzone]
 default_message=拖曳文件到此處或單擊上傳

docker/Dockerfile.rpi

@@ -0,0 +1,45 @@
+FROM arm32v7/golang:1.14-alpine3.14 AS binarybuilder
+RUN apk --no-cache --no-progress add --virtual \
+  build-deps \
+  build-base \
+  git \
+  linux-pam-dev
+
+WORKDIR /gogs.io/gogs
+COPY . .
+RUN make build TAGS="cert pam"
+
+FROM arm32v7/alpine:3.14
+RUN wget https://github.com/tianon/gosu/releases/download/1.12/gosu-armhf -O /usr/sbin/gosu \
+  && chmod +x /usr/sbin/gosu \
+  && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \
+  && apk --no-cache --no-progress add \
+  bash \
+  ca-certificates \
+  curl \
+  git \
+  linux-pam \
+  openssh \
+  s6 \
+  shadow \
+  socat \
+  tzdata \
+  rsync
+
+ENV GOGS_CUSTOM /data/gogs
+
+# Configure LibC Name Service
+COPY docker/nsswitch.conf /etc/nsswitch.conf
+
+WORKDIR /app/gogs
+COPY docker ./docker
+COPY --from=binarybuilder /gogs.io/gogs/gogs .
+
+RUN ./docker/finalize.sh
+
+# Configure Docker Container
+VOLUME ["/data", "/backup"]
+EXPOSE 22 3000
+HEALTHCHECK CMD (nc -z -w 3 localhost 22 && curl -o /dev/null -sS http://localhost:3000/healthcheck) || exit 1
+ENTRYPOINT ["/app/gogs/docker/start.sh"]
+CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]

docker/README.md

@@ -1,9 +1,13 @@
 # Docker for Gogs
 
-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.
+![Docker pulls](https://img.shields.io/docker/pulls/gogs/gogs?logo=docker&style=for-the-badge)
+
+Visit [Docker Hub](https://hub.docker.com/u/gogs) or [GitHub Container registry](https://github.com/gogs/gogs/pkgs/container/gogs) to see all available images and tags.
 
 ## Usage
 
+ℹ️ Please use `gogs/gogs-rpi` if you're using Raspberry Pis!
+
 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
@@ -14,13 +18,13 @@ $ docker pull gogs/gogs
 $ mkdir -p /var/gogs
 
 # Use `docker run` for the first time.
-$ docker run --name=gogs -p 10022:22 -p 10080:3000 -v /var/gogs:/data gogs/gogs
+$ docker run --name=gogs -p 10022:22 -p 10880:3000 -v /var/gogs:/data gogs/gogs
 
 # Use `docker start` if you have stopped it.
 $ docker start gogs
 ```
 
-Note: It is important to map the Gogs ssh service from the container to the host and set the appropriate SSH Port and URI settings when setting up Gogs for the first time. To access and clone Gogs Git repositories with the above configuration you would use: `git clone ssh://git@hostname:10022/username/myrepo.git` for example.
+Note: It is important to map the SSH service from the container to the host and set the appropriate SSH Port and URI settings when setting up Gogs for the first time. To access and clone Git repositories with the above configuration you would use: `git clone ssh://git@hostname:10022/username/myrepo.git` for example.
 
 Files will be store in local path `/var/gogs` in my case.
 
@@ -36,46 +40,38 @@ Directory `/var/gogs` keeps Git repositories and Gogs data:
         |-- data
         |-- log
 
-### Volume With Data Container
+#### Custom directory
 
-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:
+The "custom" directory may not be obvious in Docker environment. The `/var/gogs/gogs` (in the host) and `/data/gogs` (in the container) is already the "custom" directory and you do not need to create another layer but directly edit corresponding files under this directory.
 
-```sh
-# Create data container
-docker run --name=gogs-data --entrypoint /bin/true gogs/gogs
-
-# Use `docker run` for the first time.
-docker run --name=gogs --volumes-from gogs-data -p 10022:22 -p 10080:3000 gogs/gogs
-```
-
-#### Using Docker 1.9 Volume Command
+#### Using Docker volumes
 
 ```sh
 # Create docker volume.
 $ docker volume create --name gogs-data
 
 # Use `docker run` for the first time.
-$ docker run --name=gogs -p 10022:22 -p 10080:3000 -v gogs-data:/data gogs/gogs
+$ docker run --name=gogs -p 10022:22 -p 10880:3000 -v gogs-data:/data gogs/gogs
 ```
 
 ## Settings
 
 ### Application
 
-Most of settings are obvious and easy to understand, but there are some settings can be confusing by running Gogs inside Docker:
+Most of the settings are obvious and easy to understand, but there are some settings can be confusing by running Gogs inside Docker:
 
 - **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 `build.sh` already setup a user with name `git`.
+- **Run User**: keep it as default value `git` because `finalize.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.
-- **Application URL**: Use combination of **Domain** and **exposed HTTP Port** values (e.g. `http://192.168.99.100:10080/`).
+- **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 `10880: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:10880/`).
 
-Full documentation of application settings can be found [here](https://gogs.io/docs/advanced/configuration_cheat_sheet.html).
+Full documentation of application settings can be found [here](https://github.com/gogs/gogs/blob/main/conf/app.ini).
 
-### 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:
+This container has some options available via environment variables, these options are opt-in features that can help the administration of this container:
 
 - **SOCAT_LINK**:
   - <u>Possible value:</u>
@@ -94,6 +90,45 @@ This container have some options available via environment variables, these opti
       `false`
   - <u>Action:</u>
       Request crond to be run inside the container. Its default configuration will periodically run all scripts from `/etc/periodic/${period}` but custom crontabs can be added to `/var/spool/cron/crontabs/`.
+- **BACKUP_INTERVAL**:
+  - <u>Possible value:</u>
+      `3h`, `7d`, `3M`
+  - <u>Default:</u>
+      `null`
+  - <u>Action:</u>
+      In combination with `RUN_CROND` set to `true`, enables backup system.\
+      See: [Backup System](#backup-system)
+- **BACKUP_RETENTION**:
+  - <u>Possible value:</u>
+      `360m`, `7d`, `...m/d`
+  - <u>Default:</u>
+      `7d`
+  - <u>Action:</u>
+      Used by backup system. Backups older than specified in expression are deleted periodically.\
+      See: [Backup System](#backup-system)
+- **BACKUP_ARG_CONFIG**:
+  - <u>Possible value:</u>
+      `/app/gogs/example/custom/config`
+  - <u>Default:</u>
+      `null`
+  - <u>Action:</u>
+      Used by backup system. If defined, supplies `--config` argument to `gogs backup`.\
+      See: [Backup System](#backup-system)
+- **BACKUP_ARG_EXCLUDE_REPOS**:
+  - <u>Possible value:</u>
+      `test-repo1`, `test-repo2`
+  - <u>Default:</u>
+      `null`
+  - <u>Action:</u>
+      Used by backup system. If defined, supplies `--exclude-repos` argument to `gogs backup`.\
+      See: [Backup System](#backup-system)
+
+## Backup system
+
+Automated backups with retention policy:
+
+- `BACKUP_INTERVAL` controls how often the backup job runs and supports interval in hours (h), days (d), and months (M), eg. `3h`, `7d`, `3M`. The lowest possible value is one hour (`1h`).
+- `BACKUP_RETENTION` supports expressions in minutes (m) and days (d), eg. `360m`, `2d`. The lowest possible value is 60 minutes (`60m`).
 
 ## Upgrade
 
@@ -104,12 +139,12 @@ Steps to upgrade Gogs with Docker:
 - `docker pull gogs/gogs`
 - `docker stop gogs`
 - `docker rm gogs`
-- Finally, create container as the first time and don't forget to do same volume and port mapping.
+- Finally, create a container for the first time and don't forget to do the same for the volume and port mapping.
 
-## Known Issues
+## 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.
+- The docker container cannot currently be built on Raspberry 1 (armv6l) as our base image `alpine` does not have a `go` package available for this platform.
 
-## Useful Links
+## 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)

docker/armhf/build.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-go build -ldflags "-w -s" resin-xbuild.go

docker/armhf/resin-xbuild.go

@@ -1,66 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-	"os/exec"
-	"syscall"
-)
-
-func crossBuildStart() {
-	err := os.Remove("/bin/sh")
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = os.Link("/usr/bin/resin-xbuild", "/bin/sh")
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func crossBuildEnd() {
-	err := os.Remove("/bin/sh")
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = os.Link("/bin/sh.real", "/bin/sh")
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func runShell() error {
-	cmd := exec.Command("/usr/bin/qemu-arm-static", append([]string{"-0", "/bin/sh", "/bin/sh"}, os.Args[1:]...)...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
-}
-
-func main() {
-	switch os.Args[0] {
-	case "cross-build-start":
-		crossBuildStart()
-	case "cross-build-end":
-		crossBuildEnd()
-	case "/bin/sh":
-		code := 0
-		crossBuildEnd()
-
-		if err := runShell(); err != nil {
-			code = 1
-			if exiterr, ok := err.(*exec.ExitError); ok {
-				if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
-					code = status.ExitStatus()
-				}
-			}
-		}
-
-		crossBuildStart()
-
-		// Hack to bypass apk issues with triggering
-		code = 0
-
-		os.Exit(code)
-	}
-}

docker/build-go.sh

@@ -1,32 +0,0 @@
-#!/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

docker/build.sh

@@ -1,30 +0,0 @@
-#!/bin/sh
-set -x
-set -e
-
-# Set temp environment vars
-export GOPATH=/tmp/go
-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
-
-# Build Gogs
-mkdir -p ${GOPATH}/src/github.com/gogits/
-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
-make build TAGS="sqlite cert pam"
-
-# Cleanup GOPATH
-rm -r $GOPATH
-
-# Remove build deps
-apk --no-progress del build-deps
-
-# Create git user for Gogs
-addgroup -S git
-adduser -G git -H -D -g 'Gogs Git User' git -h /data/git -s /bin/bash && usermod -p '*' git && passwd -u git
-echo "export GOGS_CUSTOM=${GOGS_CUSTOM}" >> /etc/profile

docker/finalize.sh

@@ -4,16 +4,13 @@
 set -x
 set -e
 
-# Move to final place
-mv /app/gogs/build/gogs /app/gogs/
+# Create git user for Gogs
+addgroup -S git
+adduser -G git -H -D -g 'Gogs Git User' git -h /data/git -s /bin/bash && usermod -p '*' git && passwd -u git
+echo "export GOGS_CUSTOM=${GOGS_CUSTOM}" >> /etc/profile
 
 # 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

docker/no-pic.patch

@@ -1,16 +0,0 @@
-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 {

docker/runtime/backup-init.sh

@@ -0,0 +1,144 @@
+#!/usr/bin/env bash
+set -e
+
+BACKUP_PATH="/backup"
+
+# Make sure that required directories exist
+mkdir -p "${BACKUP_PATH}"
+mkdir -p "/etc/crontabs"
+chown git:git /backup
+chmod 2770 /backup
+
+# [string] BACKUP_INTERVAL   Period expression
+# [string] BACKUP_RETENTION  Period expression
+if [ -z "${BACKUP_INTERVAL}" ]; then
+	echo "Backup disabled: BACKUP_INTERVAL has not been found" 1>&2
+	exit 1
+fi
+
+if [ -z "${BACKUP_RETENTION}" ]; then
+	echo "Backup retention period is not defined, default to 7 days" 1>&2
+	BACKUP_RETENTION='7d'
+fi
+
+# Parse BACKUP_INTERVAL environment variable and generate appropriate cron expression. Backup cron task will be run as scheduled.
+# Expected format: nu (n - number, u - unit) (eg. 3d means 3 days)
+# Supported units: h - hours, d - days, M - months
+parse_generate_cron_expression() {
+	CRON_EXPR_MINUTES="*"
+	CRON_EXPR_HOURS="*"
+	CRON_EXPR_DAYS="*"
+	CRON_EXPR_MONTHS="*"
+
+    # shellcheck disable=SC2001
+	TIME_INTERVAL=$(echo "${BACKUP_INTERVAL}" | sed -e 's/[hdM]$//')
+    # shellcheck disable=SC2001
+	TIME_UNIT=$(echo "${BACKUP_INTERVAL}" | sed -e 's/^[0-9]\+//')
+
+	if [ "${TIME_UNIT}" = "h" ]; then
+		if [ ! "${TIME_INTERVAL}" -le 23 ]; then
+			echo "Parse error: Time unit 'h' (hour) cannot be greater than 23" 1>&2
+			exit 1
+		fi
+
+		CRON_EXPR_MINUTES=0
+		CRON_EXPR_HOURS="*/${TIME_INTERVAL}"
+	elif [ "${TIME_UNIT}" = "d" ]; then
+		if [ ! "${TIME_INTERVAL}" -le 30 ]; then
+			echo "Parse error: Time unit 'd' (day) cannot be greater than 30" 1>&2
+			exit 1
+		fi
+
+		CRON_EXPR_MINUTES=0
+		CRON_EXPR_HOURS=0
+		CRON_EXPR_DAYS="*/${TIME_INTERVAL}"
+	elif [ "${TIME_UNIT}" = "M" ]; then
+		if [ ! "${TIME_INTERVAL}" -le 12 ]; then
+			echo "Parse error: Time unit 'M' (month) cannot be greater than 12" 1>&2
+			exit 1
+		fi
+
+		CRON_EXPR_MINUTES=0
+		CRON_EXPR_HOURS=0
+		CRON_EXPR_DAYS="1"
+		CRON_EXPR_MONTHS="*/${TIME_INTERVAL}"
+	else
+		echo "Parse error: BACKUP_INTERVAL expression is invalid" 1>&2
+		exit 1
+	fi
+
+	echo "${CRON_EXPR_MINUTES} ${CRON_EXPR_HOURS} ${CRON_EXPR_DAYS} ${CRON_EXPR_MONTHS} *"
+}
+
+# Parse BACKUP_RETENTION environment variable and generate appropriate find command expression.
+# Expected format: nu (n - number, u - unit) (eg. 3d means 3 days)
+# Supported units: m - minutes, d - days
+parse_generate_retention_expression() {
+	FIND_TIME_EXPR='mtime'
+
+	# shellcheck disable=SC2001
+	TIME_INTERVAL=$(echo "${BACKUP_RETENTION}" | sed -e 's/[mhdM]$//')
+	# shellcheck disable=SC2001
+	TIME_UNIT=$(echo "${BACKUP_RETENTION}" | sed -e 's/^[0-9]\+//')
+
+	if [ "${TIME_UNIT}" = "m" ]; then
+		if [ "${TIME_INTERVAL}" -le 59 ]; then
+			echo "Warning: Minimal retention is 60m. Value set to 60m" 1>&2
+			TIME_INTERVAL=60
+		fi
+
+		FIND_TIME_EXPR="mmin"
+	elif [ "${TIME_UNIT}" = "h" ]; then
+		echo "Error: Unsupported expression - Try: eg. 120m for 2 hours." 1>&2
+		exit 1
+	elif [ "${TIME_UNIT}" = "d" ]; then
+		FIND_TIME_EXPR="mtime"
+	elif [ "${TIME_UNIT}" = "M" ]; then
+		echo "Error: Unsupported expression - Try: eg. 60d for 2 months." 1>&2
+		exit 1
+	else
+		echo "Parse error: BACKUP_RETENTION expression is invalid" 1>&2
+		exit 1
+	fi
+
+	echo "${FIND_TIME_EXPR} +${TIME_INTERVAL:-7}"
+}
+
+add_backup_cronjob() {
+	CRONTAB_USER="${1:-git}"
+	CRONTAB_FILE="/etc/crontabs/${CRONTAB_USER}"
+	CRONJOB_EXPRESSION="${2:-}"
+	CRONJOB_EXECUTOR="${3:-}"
+	CRONJOB_EXECUTOR_ARGUMENTS="${4:-}"
+  CRONJOB_TASK="${CRONJOB_EXPRESSION} /bin/sh ${CRONJOB_EXECUTOR} ${CRONJOB_EXECUTOR_ARGUMENTS}"
+
+	if [ -f "${CRONTAB_FILE}" ]; then
+		CRONJOB_EXECUTOR_COUNT=$(grep -c "${CRONJOB_EXECUTOR}" "${CRONTAB_FILE}" || exit 0)
+		if [ "${CRONJOB_EXECUTOR_COUNT}" != "0" ]; then
+			echo "Cron job already exists for ${CRONJOB_EXECUTOR}. Updating existing." 1>&2
+			CRONJOB_TASK=$(echo "{CRONJOB_TASK}" | sed 's/\//\\\//g' )
+			CRONJOB_EXECUTOR=$(echo "{CRONJOB_EXECUTOR}" | sed 's/\//\\\//g' )
+			sed -i "/${CRONJOB_EXECUTOR}/c\\${CRONJOB_TASK}" "${CRONTAB_FILE}"
+			return 0
+		fi
+	fi
+
+	# Finally append new line with cron task expression
+	echo "${CRONJOB_TASK}" >>"${CRONTAB_FILE}"
+}
+
+CRONTAB_USER=$(awk -v val="${PUID}" -F ":" '$3==val{print $1}' /etc/passwd)
+
+# Up to this point, it was desirable that interpreter handles the command errors and halts execution upon any error.
+# From now, we handle the errors our self.
+set +e
+RETENTION_EXPRESSION="$(parse_generate_retention_expression)"
+
+if [ -z "${RETENTION_EXPRESSION}" ]; then
+	echo "Couldn't generate backup retention expression. Aborting backup setup" 1>&2
+	exit 1
+fi
+
+# Backup rotator cron will run every 5 minutes
+add_backup_cronjob "${CRONTAB_USER}" "*/5 * * * *" "/app/gogs/docker/runtime/backup-rotator.sh" "'${BACKUP_PATH}' '${RETENTION_EXPRESSION}'"
+add_backup_cronjob "${CRONTAB_USER}" "$(parse_generate_cron_expression)" "/app/gogs/docker/runtime/backup-job.sh" "'${BACKUP_PATH}'"

docker/runtime/backup-job.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+execute_backup_job() {
+	BACKUP_ARG_PATH="${1:-}"
+	BACKUP_ARG_CONFIG="${BACKUP_ARG_CONFIG:-}"
+	BACKUP_ARG_EXCLUDE_REPOS="${BACKUP_ARG_EXCLUDE_REPOS:-}"
+	cd "/app/gogs" || exit 1
+
+	BACKUP_ARGS="--target=${BACKUP_ARG_PATH}"
+
+	if [ -n "${BACKUP_ARG_CONFIG}" ]; then
+		BACKUP_ARGS="${BACKUP_ARGS} --config=${BACKUP_ARG_CONFIG}"
+	fi
+
+	if [ -n "${BACKUP_ARG_EXCLUDE_REPOS}" ]; then
+		BACKUP_ARGS="${BACKUP_ARGS} --exclude-repos=${BACKUP_ARG_EXCLUDE_REPOS}"
+	fi
+
+	./gogs backup "${BACKUP_ARGS}" || echo "Error: Backup job returned non-successful code." && exit 1
+}
+
+main() {
+	BACKUP_PATH="${1:-}"
+
+	if [ -z "${BACKUP_PATH}" ]; then
+		echo "Required argument missing BACKUP_PATH" 1>&2
+		exit 1
+	fi
+
+	execute_backup_job "${BACKUP_PATH}"
+}
+
+main "$@"

docker/runtime/backup-rotator.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env sh
+
+# This is very simple, yet effective backup rotation script.
+# Using find command, all files that are older than BACKUP_RETENTION_DAYS are accumulated and deleted using rm.
+main() {
+	BACKUP_PATH="${1:-}"
+	FIND_EXPRESSION="${2:-mtime +7}"
+
+	if [ -z "${BACKUP_PATH}" ]; then
+		echo "Error: Required argument missing BACKUP_PATH" 1>&2
+		exit 1
+	fi
+
+	if [ "$(realpath "${BACKUP_PATH}")" = "/" ]; then
+		echo "Error: Dangerous BACKUP_PATH: /" 1>&2
+		exit 1
+	fi
+
+	if [ ! -d "${BACKUP_PATH}" ]; then
+	  echo "Error: BACKUP_PATH doesn't exist or is not a directory" 1>&2
+		exit 1
+	fi
+
+	# shellcheck disable=SC2086
+	find "${BACKUP_PATH}/" -type f -name "gogs-backup-*.zip" -${FIND_EXPRESSION} -print -exec rm "{}" +
+}
+
+main "$@"

docker/s6/.s6-svscan/finish

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 # Cleanup SOCAT services and s6 event folder
-rm -rf $(find /app/gogs/docker/s6/ -name 'event')
+rm -rf "$(find /app/gogs/docker/s6/ -name 'event')"
 rm -rf /app/gogs/docker/s6/SOCAT_*

docker/s6/crond/run

@@ -3,6 +3,7 @@
 # The default configuration is also calling all the scripts in /etc/periodic/${period}
 
 if test -f ./setup; then
+    # shellcheck disable=SC2039,SC1091,SC3046
     source ./setup
 fi
 

docker/s6/gogs/run

@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if test -f ./setup; then
+    # shellcheck disable=SC2039,SC1091,SC3046
     source ./setup
 fi
 
-export USER=git
-exec gosu $USER /app/gogs/gogs web
+exec gosu "$USER" /app/gogs/gogs web

docker/s6/gogs/setup

@@ -1,16 +1,16 @@
 #!/bin/sh
 
 if ! test -d ~git/.ssh; then
-    mkdir -p ~git/.ssh
+    gosu "$USER" mkdir -p ~git/.ssh
     chmod 700 ~git/.ssh
 fi
 
 if ! test -f ~git/.ssh/environment; then
-    echo "GOGS_CUSTOM=${GOGS_CUSTOM}" > ~git/.ssh/environment
+    gosu "$USER" echo "GOGS_CUSTOM=${GOGS_CUSTOM}" > ~git/.ssh/environment
     chmod 600 ~git/.ssh/environment
 fi
 
-cd /app/gogs
+cd /app/gogs || exit 1
 
 # Link volumed data with app data
 ln -sfn /data/gogs/log  ./log
@@ -19,5 +19,4 @@ ln -sfn /data/gogs/data ./data
 # Backward Compatibility with Gogs Container v0.6.15
 ln -sfn /data/git /home/git
 
-chown -R git:git /data /app/gogs ~git/
 chmod 0755 /data /data/gogs ~git/

docker/s6/openssh/run

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 if test -f ./setup; then
+    # shellcheck disable=SC2039,SC1091,SC3046
     source ./setup
 fi