Prepare to release

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,5 @@
+We DO NOT take questions or config/deploy problems on GitHub, please use our forum: https://discuss.gogs.io
+
 Please take a moment to search that an issue doesn't already exist.
 
 For bug reports, please give the relevant info:

.gopmfile

@@ -3,50 +3,50 @@ path = github.com/gogits/gogs
 
 [deps]
 github.com/bradfitz/gomemcache = commit:fb1f79c
-github.com/codegangsta/cli = commit:cf1f63a
-github.com/go-macaron/binding = 
+github.com/codegangsta/cli = commit:5db7419
+github.com/go-macaron/binding = commit:a68f342
 github.com/go-macaron/cache = commit:5617353
 github.com/go-macaron/captcha = commit:8aa5919
 github.com/go-macaron/csrf = commit:715bca0
-github.com/go-macaron/gzip = commit:4938e9b
+github.com/go-macaron/gzip = commit:cad1c65
 github.com/go-macaron/i18n = commit:d2d3329
 github.com/go-macaron/inject = commit:c5ab7bf
 github.com/go-macaron/session = commit:66031fc
 github.com/go-macaron/toolbox = commit:82b5115
-github.com/go-sql-driver/mysql = commit:b4db83c
-github.com/go-xorm/core = commit:1e2868c
-github.com/go-xorm/xorm = 
+github.com/go-sql-driver/mysql = commit:1309049
+github.com/go-xorm/core = commit:9ddf4ee
+github.com/go-xorm/xorm = commit:e72082c
 github.com/gogits/chardet = commit:2404f77725
-github.com/gogits/cron = 
-github.com/gogits/git-module = commit:3b40eae
-github.com/gogits/go-gogs-client = 
+github.com/gogits/cron = commit:3abc0f8
+github.com/gogits/git-module = commit:a1c5096
+github.com/gogits/go-gogs-client = commit:d584b1e
 github.com/issue9/identicon = commit:f8c0d2c
 github.com/kardianos/minwinsvc = commit:cad6b2b
-github.com/klauspost/compress = commit:91e7b09
-github.com/klauspost/cpuid = commit:349c675
-github.com/klauspost/crc32 = commit:999f312
-github.com/lib/pq = commit:8ad2b29
-github.com/mattn/go-sqlite3 = commit:0cc1174
+github.com/klauspost/compress = commit:f962535
+github.com/klauspost/cpuid = commit:2c698c6
+github.com/klauspost/crc32 = commit:19b0b33
+github.com/lib/pq = commit:69552e5
+github.com/mattn/go-sqlite3 = commit:09d5c45
 github.com/mcuadros/go-version = commit:d52711f
 github.com/microcosm-cc/bluemonday = commit:4ac6f27
 github.com/msteinert/pam = commit:02ccfbf
 github.com/nfnt/resize = commit:4d93a29
 github.com/russross/blackfriday = commit:006144a
-github.com/satori/go.uuid = 
+github.com/satori/go.uuid = commit:e673fdd
 github.com/sergi/go-diff = commit:ec7fdbb
 github.com/shurcooL/sanitized_anchor_name = commit:10ef21a
 github.com/Unknwon/cae = commit:7f5e046
 github.com/Unknwon/com = commit:28b053d
 github.com/Unknwon/i18n = commit:3b48b66
 github.com/Unknwon/paginater = commit:7748a72
-golang.org/x/net = commit:04b9de9
-golang.org/x/text = commit:6fc2e00
+golang.org/x/net = commit:4599ae7
+golang.org/x/text = commit:07b9a78
 golang.org/x/crypto = commit:1f22c01
 gopkg.in/asn1-ber.v1 = commit:4e86f43
 gopkg.in/gomail.v2 = commit:fbb71dd
-gopkg.in/ini.v1 = commit:afbd495
-gopkg.in/ldap.v2 = commit:e9a325d
-gopkg.in/macaron.v1 = commit:564f398
+gopkg.in/ini.v1 = commit:776aa73
+gopkg.in/ldap.v2 = commit:07a7330
+gopkg.in/macaron.v1 = commit:b9eee38
 gopkg.in/redis.v2 = commit:e617904962
 
 [res]

README.md

@@ -13,13 +13,13 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ### NOTICES
 
-- :bangbang: You **MUST** read [CONTRIBUTING.md](https://github.com/gogits/gogs/blob/master/.github/CONTRIBUTING.md) for bug report and contributing code. :bangbang:
-- Please [start discussion](http://forum.gogs.io/category/2/general-discussion) or [ask a question](http://forum.gogs.io/category/4/getting-help) on [the forum](http://forum.gogs.io/). GitHub issue tracker only keeps **bugs** and **feature requests**, all other topics will be closed without reason.
-- 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.
-- The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch.
-- If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks!
-- If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki).
-- If your team/company is using Gogs and would like to put your logo on [our website](http://gogs.io), contact us by any means.
+1. :bangbang: You **MUST** **MUST** **MUST** read [CONTRIBUTING.md](https://github.com/gogits/gogs/blob/master/.github/CONTRIBUTING.md) for bug report and contributing code. :bangbang:
+2. **PLEASE** **PLEASE** **PLEASE** [ask questions](https://discuss.gogs.io/c/getting-help) on [the forum](https://discuss.gogs.io/). GitHub issue tracker only keeps **bugs** and **feature requests**, all other topics will be closed without reason.
+3. 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.
+4. The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch.
+5. If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks!
+6. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki).
+7. If your team/company is using Gogs and would like to put your logo on [our website](http://gogs.io), contact us by any means.
 
 [简体中文](README_ZH.md)
 

conf/locale/locale_bg-BG.ini

@@ -38,7 +38,7 @@ settings=Настройки
 your_profile=Вашият профил
 your_settings=Вашите настройки
 
-activities=Activities
+activities=Активности
 pull_requests=Заявки за сливане
 issues=Задачи
 
@@ -86,8 +86,8 @@ http_port=HTTP порт
 http_port_helper=Порт, на който приложението ще слуша.
 app_url=URL адрес на приложението
 app_url_helper=Този настройка променя HTTP/HTTPS адреса за клониране, а понякога и адреса на ел. поща.
-log_root_path=Log Path
-log_root_path_helper=Directory to write log files to.
+log_root_path=Път към журналите
+log_root_path_helper=Директория в която се записват журналите.
 
 optional_title=Опционални настройки
 email_title=Настройки на пощенска услуга
@@ -124,7 +124,7 @@ run_user_not_match=Потребителският контекст на прил
 save_config_failed=Неуспешно запазване на конфигурация: %v
 invalid_admin_setting=Настройките на профил на администратора са невалидни: %v
 install_success=Добре дошли! Радваме се, че избрахте Gogs, и Ви пожелаваме приятна работа и сърдечни поздрави!
-invalid_log_root_path=Log root path is invalid: %v
+invalid_log_root_path=Основният път към журналите е невалиден: %v
 
 [home]
 uname_holder=Име или ел. поща
@@ -585,11 +585,11 @@ settings.tracker_url_format_desc=Можете да използвате текс
 settings.pulls_desc=Включва заявки за сливане за да може да се приемат външни доработки
 settings.danger_zone=Опасна зона
 settings.new_owner_has_same_repo=Новият притежател вече има хранилище със същото име. Изберете друго име.
-settings.convert=Convert To Regular Repository
-settings.convert_desc=You can convert this mirror to a regular repository. This cannot be reversed.
-settings.convert_notices_1=- This operation will convert this repository mirror into a regular repository and cannot be undone.
-settings.convert_confirm=Confirm Conversion
-settings.convert_succeed=Repository has been converted to regular type successfully.
+settings.convert=Промени към редовно хранилище
+settings.convert_desc=Можете да промените това огледало към редовно хранилище. Конверсията не може да се отмени.
+settings.convert_notices_1=- Тази операция ще конвертира огледалото към редовно хранилище и не може да бъде отменена в последствие.
+settings.convert_confirm=Потвърдете конверсията
+settings.convert_succeed=Конверсията към редовно хранилище е извършена успешно.
 settings.transfer=Прехвърли притежание
 settings.transfer_desc=Прехвърля това хранилище на друг потребител или към организация, в която имате права на администратор.
 settings.transfer_notices_1=- Вие ще загубите достъп, ако новият притежател е индивидуален потребител.
@@ -612,6 +612,7 @@ settings.add_collaborator=Добави нов сътрудник
 settings.add_collaborator_success=Добавен е нов сътрудник.
 settings.remove_collaborator_success=Сътрудникът е премахнат.
 settings.search_user_placeholder=Име на потребител...
+settings.org_not_allowed_to_be_collaborator=Невъзможно добавяне на организация като сътрудник.
 settings.user_is_org_member=Потребителят вече участва в организацията и не може да бъде добавен като сътрудник.
 settings.add_webhook=Добави уеб-кука
 settings.hooks_desc=Уеб-куките много приличат на обикновен HTTP POST тригер. Когато нещо се случи в Gogs, ние ще изпратим уведомление до сървъра, който посочите. Научете повече в <a target="_blank" href="%s">Ръководство за уеб-куки</a>.
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Оставете празно за да и
 auths.attribute_name=Атрибут за име
 auths.attribute_surname=Атрибут за фамилия
 auths.attribute_mail=Атрибут за ел. поща
+auths.attributes_in_bind=Извличане на атрибути от контекста на име (DN) за свръзка
 auths.filter=Филтър за потребител
 auths.admin_filter=Филтър за администратор
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ config.register_email_confirm=Изисквай потвърждение на а
 config.disable_register=Изключи нови регистрации
 config.show_registration_button=Покажи бутон за регистрация
 config.require_sign_in_view=Изисквай вписване за преглед
-config.enable_cache_avatar=Включи кеширане на аватари
 config.mail_notify=Уведомяване по ел. поща
 config.disable_key_size_check=Изключи проверка минимален размер на ключ
 config.enable_captcha=Включи Captcha
@@ -1039,6 +1040,8 @@ create_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>
 create_issue=`отвори задача <a href="%s/issues/%s">%s#%[2]s"</a>`
+close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`създаде заявка за сливане <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`коментира задача <a href="%s/issues/%s">%s#%[2]s"</a>`
 merge_pull_request=`обедини заявка за сливане <a href="%s/pulls/%s">%s#%[2]s</a>`

conf/locale/locale_de-DE.ini

@@ -1,4 +1,4 @@
-app_desc=Ein einfacher, selbst gehosteter Git-Service, geschrieben in Go
+app_desc=Ein einfacher, selbst gehosteter Git-Service
 
 home=Home
 dashboard=Übersicht
@@ -35,10 +35,10 @@ manage_org=Organisationen verwalten
 admin_panel=Admin-Panel
 account_settings=Kontoeinstellungen
 settings=Einstellungen
-your_profile=Dein Profil
-your_settings=Deine Einstellungen
+your_profile=Ihr Profil
+your_settings=Ihre Einstellungen
 
-activities=Aktivititäten
+activities=Aktivitäten
 pull_requests=Pull-Requests
 issues=Tickets
 
@@ -62,7 +62,7 @@ host=Host
 user=Benutzer
 password=Passwort
 db_name=Datenbankname
-db_helper=Bitte verwenden sie die InnoDB-Engine mit utf8_general_ci Zeichensatz für MySQL.
+db_helper=Bitte verwenden Sie in MySQL die InnoDB-Engine mit dem Zeichensatz utf8_general_ci.
 ssl_mode=SSL-Modus
 path=Pfad
 sqlite_helper=Der Dateipfad zur SQLite3- oder TiDB-Datenbank. <br> Bitte benutze eine absolute Pfadangabe, wenn Gogs als Service gestartet wird.
@@ -103,10 +103,10 @@ offline_mode=Offline-Modus aktivieren
 offline_mode_popup=Deaktiviere das CDN auch im Produktionsmodus, alle Dateien werden von diesem Server ausgeliefert.
 disable_gravatar=Gravatar-Dienst deaktivieren
 disable_gravatar_popup=Gravatar und benutzerdefinierte Quellen deaktivieren, alle Avatare werden standardmäßig vom Nutzer hochgeladen oder sind Standardavatare.
-disable_registration=Benutzerregistrierung deaktivieren
+disable_registration=Selbstregistrierung deaktivieren
 disable_registration_popup=Deaktiviere die Benutzerregistrierung, nur Administratoren können Benutzerkonten anlegen.
 enable_captcha=Captcha aktivieren
-enable_captcha_popup=Benötigt Captcha-Überprüfung für Registrierung durch Benutzer.
+enable_captcha_popup=Verlange Captcha-Überprüfung für Selbst-Registrierung.
 require_sign_in_view=Erfordere Anmeldung, um Inhalte anzusehen
 require_sign_in_view_popup=Lediglich angemeldete Benutzer können Inhalte betrachten, Gäste sehen nur die Anmelden/Registrieren Seite.
 admin_setting_desc=Sie müssen jetzt noch keinen Administrator-Account anlegen. Der erste Benutzer ("ID=1") erhält automatisch Administrationsrechte.
@@ -136,7 +136,7 @@ my_orgs=Meine Organisationen
 my_mirrors=Meine Spiegel
 view_home=%s betrachten
 
-issues.in_your_repos=In deinen Repositories
+issues.in_your_repos=In ihren Repositories
 
 [explore]
 repos=Repositories
@@ -144,13 +144,13 @@ repos=Repositories
 [auth]
 create_new_account=Neues Konto erstellen
 register_hepler_msg=Du hast bereits ein Konto? Jetzt anmelden!
-social_register_hepler_msg=Du hast bereits ein soziales Konto? Jetzt verknüpfen!
+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.
 remember_me=Angemeldet bleiben
 forgot_password=Passwort vergessen
 forget_password=Passwort vergessen?
-sign_up_now=Du willst ein Konto? Jetzt registrieren!
+sign_up_now=Benötigen Sie ein Konto? Registrieren Sie sich jetzt.
 confirmation_mail_sent_prompt=Eine neue Bestätigungs-E-Mail wurde an <b>%s</b> gesendet. Kontrolliere dein Postfach innerhalb der nächsten %d Stunden, um die Registrierung abzuschließen.
 active_your_account=Aktivieren Sie Ihr Konto
 resent_limit_prompt=Es tut uns leid, Sie erbitten zu häufig Aktivierungs-E-Mails. Bitte warten Sie 3 Minuten.
@@ -182,7 +182,7 @@ Email=E-Mail-Adresse
 Password=Passwort
 Retype=Passwort erneut eingeben
 SSHTitle=SSH-Schlüsselname
-HttpsUrl=HTTPS-URL
+HttpsUrl=HTTPS URL
 PayloadUrl=Payload-URL
 TeamName=Teamname
 AuthName=Authentifizierungsname
@@ -211,7 +211,7 @@ enterred_invalid_repo_name=Bitte achten Sie darauf, dass der von Ihnen eingegebe
 enterred_invalid_owner_name=Bitte achten Sie darauf, dass der eingegebene Besitzersname korrekt ist.
 enterred_invalid_password=Bitte achten Sie darauf, dass das eingegebene Passwort richtig ist.
 user_not_exist=Angegebener Benutzer existiert nicht.
-last_org_owner=Der zu entfernende Benutzer ist der letzte Besitzer einer Organisation. Diese müssen zuerst gelöscht oder übertragen werden.
+last_org_owner=Entfernen des letzten Benutzers von einem Eigentümer-Team ist nicht zulässig, denn es muss immer mindestens ein Besitzer in jeder Organisation.
 
 invalid_ssh_key=Leider sind wir nicht in der Lage, deinen SSH-Schlüssel zu überprüfen: %s
 unable_verify_ssh_key=Gogs kann Ihren SSH-Schlüssel nicht überprüfen, nimmt aber an, dass er gültig ist. Bitte stellen Sie dies selbst sicher.
@@ -228,7 +228,7 @@ target_branch_not_exist=Ziel-Branch existiert nicht
 [user]
 change_avatar=Ändere dein Profilbild auf gravatar.com
 change_custom_avatar=Ändern Sie Ihr Profilbild in den Einstellungen
-join_on=Registriert
+join_on=Beigetreten am
 repositories=Repositories
 activity=Öffentliche Aktivität
 followers=Followers
@@ -276,7 +276,7 @@ old_password=Aktuelles Passwort
 new_password=Neues Passwort
 retype_new_password=Neues Passwort erneut eingeben
 password_incorrect=Aktuelles Passwort ist nicht korrekt.
-change_password_success=Passwort geändert. Du kannst dich jetzt mit deinem neuen Passwort anmelden.
+change_password_success=Ihr Passwort wurde geändert. Sie können sich jetzt mit ihrem neuen Passwort anmelden.
 password_change_disabled=Nicht-lokalen Benutzern ist es nicht erlaubt, ihr Passwort zu ändern.
 
 emails=E-Mail-Adressen
@@ -419,7 +419,7 @@ file_permalink=Permalink
 commits.commits=Commits
 commits.search=Durchsuche Commits
 commits.find=Finden
-commits.author=Author
+commits.author=Autor
 commits.message=Nachricht
 commits.date=Datum
 commits.older=Älter
@@ -446,25 +446,25 @@ issues.close_tab=%d geschlossen
 issues.filter_label=Label
 issues.filter_label_no_select=Kein Label gewählt
 issues.filter_milestone=Meilenstein
-issues.filter_milestone_no_select=Kein ausgewählter Meilenstein
+issues.filter_milestone_no_select=Kein Meilenstein ausgewählt
 issues.filter_assignee=Zuständiger
-issues.filter_assginee_no_select=Kein ausgewählter Zuständiger
+issues.filter_assginee_no_select=Kein Zuständiger ausgewählt
 issues.filter_type=Typ
 issues.filter_type.all_issues=Alle Probleme
 issues.filter_type.assigned_to_you=Ihnen zugewiesenen
-issues.filter_type.created_by_you=Erstellt von dir
+issues.filter_type.created_by_you=von Ihnen erstellt
 issues.filter_type.mentioning_you=Erwähnen Sie
 issues.filter_sort=Sortieren
 issues.filter_sort.latest=Neueste
 issues.filter_sort.oldest=Älteste
-issues.filter_sort.recentupdate=Zuletzt aktualisiert
+issues.filter_sort.recentupdate=Kürzlich aktualisiert
 issues.filter_sort.leastupdate=Am längsten nicht aktualisiert
 issues.filter_sort.mostcomment=Am meisten kommentiert
 issues.filter_sort.leastcomment=Am wenigsten kommentiert
 issues.opened_by=%[1]s geöffnet von <a href="%[2]s">%[3]s</a>
-issues.opened_by_fake=eröffnet %[1]s von %[2]s
-issues.previous=Vorherige Seite
-issues.next=Nächste Seite
+issues.opened_by_fake=geöffnet %[1]s von %[2]s
+issues.previous=Vorherige
+issues.next=Nächste
 issues.open_title=Offen
 issues.closed_title=Geschlossen
 issues.num_comments=%d Kommentare
@@ -472,17 +472,17 @@ issues.commented_at=`kommentiert in <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.no_content=Hier gibt es bis jetzt noch keinen Inhalt.
 issues.close_issue=Schließen
 issues.close_comment_issue=Kommentieren und schließen
-issues.reopen_issue=Wiedereröffnen
-issues.reopen_comment_issue=Kommentieren und wiedereröffnen
+issues.reopen_issue=Wiederöffnen
+issues.reopen_comment_issue=Kommentieren und wiederöffnen
 issues.create_comment=Kommentieren
 issues.closed_at=`geschlossen in <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`wiedereröffnet in <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.reopened_at=`wiedergeöffnet in <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.commit_ref_at=`referenziert dieses Issue aus einem Commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.poster=Ersteller
 issues.admin=Admin
 issues.owner=Besitzer
 issues.sign_up_for_free=Kostenlos anmelden
-issues.sign_in_require_desc=um dieser Konverstion beizutreten. Hast du bereits einen Account? <a href="%s">Anmelden zum kommentieren</a>
+issues.sign_in_require_desc=um dieser Konversation beizutreten. Haben Sie bereits ein Konto? <a href="%s">Anmelden um zu kommentieren</a>
 issues.edit=Bearbeiten
 issues.cancel=Abbrechen
 issues.save=Speichern
@@ -505,7 +505,7 @@ pulls.compare_base=Base
 pulls.compare_compare=vergleichen
 pulls.filter_branch=Filter Branch
 pulls.no_results=Keine Ergebnisse verfügbar.
-pulls.nothing_to_compare=Es ist nichts zu vergleichen, da Base- und Head-Branch gleich sind.
+pulls.nothing_to_compare=Es gibt nichts zu vergleichen, da Base- und Head-Branch gleich sind.
 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
@@ -581,15 +581,15 @@ settings.external_wiki_url_desc=Besucher werden auf die URL umgeleitet, wenn sie
 settings.issues_desc=Benutze eingebauten leichtgewichtigen Issue-Tracker
 settings.use_external_issue_tracker=Benutze externen Issue-Tracker
 settings.tracker_url_format=URL-Format für externen Issu-Tracker
-settings.tracker_url_format_desc=Du kannst einen Platzhalter <code>{user} {repo} {index}</code> für den Benutzernamen, den Repositorynamen und den Issue-Index benutzen.
+settings.tracker_url_format_desc=Sie können einen Platzhalter <code>{user} {repo} {index}</code> für den Benutzernamen, den Namen des Repositorys und den Issue-Index verwenden.
 settings.pulls_desc=Aktiviere Pull-Anforderungen zum Akzeptieren von öffentlichen Beiträgen
 settings.danger_zone=Gefahrenzone
-settings.new_owner_has_same_repo=Der neue Eigentümer hat bereits ein Repository mit dem gleichen Namen.
-settings.convert=Convert To Regular Repository
-settings.convert_desc=You can convert this mirror to a regular repository. This cannot be reversed.
-settings.convert_notices_1=- This operation will convert this repository mirror into a regular repository and cannot be undone.
-settings.convert_confirm=Confirm Conversion
-settings.convert_succeed=Repository has been converted to regular type successfully.
+settings.new_owner_has_same_repo=Der neue Eigentümer hat bereits ein Repository mit dem gleichen Namen. Bitte wählen Sie einen anderen Namen.
+settings.convert=In ein normales Repository umwandeln
+settings.convert_desc=Dieser Spiegel kann in ein normales Repository umgewandelt werden. Dies kann nicht rückgängig gemacht werden.
+settings.convert_notices_1=- Dieser Vorgang wandelt das Spiegel-Repository in ein normales Repository um. Dies kann nicht rückgängig gemacht werden.
+settings.convert_confirm=Bestätige die Umwandlung
+settings.convert_succeed=Das Repository wurde erfolgreich in ein normales Repository umgewandelt.
 settings.transfer=Besitz übertragen
 settings.transfer_desc=Übertrage diese Repository auf einen anderen Benutzer oder eine Organisation in der du Admin-Rechte hast.
 settings.transfer_notices_1=- Du wirst den Zugang verlieren, wenn der neue Besitzer ein individueller Benutzer ist.
@@ -610,19 +610,20 @@ settings.transfer_succeed=Die Repository wurde erfolgreich übertragen.
 settings.confirm_delete=Löschen
 settings.add_collaborator=Mitarbeiter hinzufügen
 settings.add_collaborator_success=Neuer Mitarbeiter hinzugefügt.
-settings.remove_collaborator_success=Mitarbeiter entfernt
+settings.remove_collaborator_success=Mitarbeiter wurde entfernt.
 settings.search_user_placeholder=Benutzer suchen...
+settings.org_not_allowed_to_be_collaborator=Eine Organisation kann nicht als Mitarbeiter hinzugefügt werden.
 settings.user_is_org_member=Benutzer ist ein Organisationsmitglied und kann nicht als Mitarbeiter hinzugefügt werden.
 settings.add_webhook=Webhook hinzufügen
 settings.hooks_desc=Webhooks erlauben es dir, externe Dienste zu informieren, wenn etwas bestimmtes in deiner Repository passiert. Gogs sendet dann einen POST-Request an alle angegebenen URLs. Erfahre mehr in unserer <a target="_blank" href="%s">Webhooks Guide</a>.
 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!
-settings.webhook.test_delivery=Auslieferungstest
+settings.webhook.test_delivery=Auslieferung testen
 settings.webhook.test_delivery_desc=Sende eine imitierte Push-Ereignis-Auslieferung um die Webhook-Einstellungen zu testen
 settings.webhook.test_delivery_success=Test-Webhook wurde zur Auslieferungswarteschlange hinzugefügt. Es kann einige Sekunden dauern, bevor es in der Auslieferungshistorie erscheint.
 settings.webhook.request=Anfrage
-settings.webhook.response=Rückmeldung
+settings.webhook.response=Antwort
 settings.webhook.headers=Kopfzeilen
 settings.webhook.payload=Nutzdaten
 settings.webhook.body=Inhalt
@@ -638,7 +639,7 @@ settings.secret=Secret
 settings.slack_username=Benutzername
 settings.slack_icon_url=Icon URL
 settings.slack_color=Farbe
-settings.event_desc=Welche Ereignisse sollen diesen Webhook auslösen?
+settings.event_desc=Wann soll dieser Webhook ausgelöst werden?
 settings.event_push_only=Nur das <code>push</code>-Ereignis.
 settings.event_send_everything=Ich brauche <strong>alles</strong>.
 settings.event_choose=Lass mich auswählen, was ich brauche.
@@ -781,7 +782,7 @@ teams.update_settings=Einstellungen aktualisieren
 teams.delete_team=Dieses Team löschen
 teams.add_team_member=Teammitglied hinzufügen
 teams.delete_team_title=Team löschen
-teams.delete_team_desc=Dieses Team wird gelöscht, möchtest du fortfahren? Mitglieder dieses Teams verlieren möglicherweise ihren Zugang zu einigen Repositories.
+teams.delete_team_desc=Mitglieder dieses Teams verlieren möglicherweise ihren Zugang zu einigen Repositories, wenn dieses Team gelöscht wird. Möchten Sie fortfahren?
 teams.delete_team_success=Team gelöscht
 teams.read_permission_desc=Dieses Team erlaubt <strong>Lesezugriff</strong>: Mitglieder können Team-Repositories einsehen und klonen.
 teams.write_permission_desc=Dieses Team erlaubt <strong>Schreibzugriff</strong>: Mitglieder können Team-Repositories einsehen und Push Operationen ausführen.
@@ -790,7 +791,7 @@ teams.repositories=Team-Repositorys
 teams.search_repo_placeholder=Repository durchsuchen...
 teams.add_team_repository=Team-Repository hinzufügen
 teams.remove_repo=Entfernen
-teams.add_nonexistent_repo=Die Repository, welche du hinzufügen möchtest, existiert nicht. Bitte erstelle diese zuerst.
+teams.add_nonexistent_repo=Das Repository, das Sie hinzufügen möchten, existiert nicht. Bitte erstellen Sie es zuerst.
 
 [admin]
 dashboard=Dashboard
@@ -838,7 +839,7 @@ dashboard.pointer_lookup_times=Pointer Lookup Times
 dashboard.memory_allocate_times=Memory Allocate Times
 dashboard.memory_free_times=Memory Free Times
 dashboard.current_heap_usage=Aktuelle Heap-Auslastung
-dashboard.heap_memory_obtained=erhaltener Heap-Memory
+dashboard.heap_memory_obtained=Erhaltener Heap-Memory
 dashboard.heap_memory_idle=unbenutzter Heap-Memory
 dashboard.heap_memory_in_use=benutzter Heap-Memory
 dashboard.heap_memory_released=freigegebener Heap-Memory
@@ -921,10 +922,11 @@ auths.attribute_username_placeholder=Leer lassen, um den Wert aus dem Anmelde-Fo
 auths.attribute_name=Vorname Attribut
 auths.attribute_surname=Nachname Attribut
 auths.attribute_mail=E-Mail Attribut
+auths.attributes_in_bind=Hole Attribute im Bind-Kontext
 auths.filter=Benutzernamen Filter
 auths.admin_filter=Admin Filter
 auths.ms_ad_sa=Ms Ad SA
-auths.smtp_auth=SMTP Authentifizierungstyp
+auths.smtp_auth=SMTP Authentifizierung
 auths.smtphost=SMTP-Host
 auths.smtpport=SMTP-Port
 auths.allowed_domains=Erlaubte Domains
@@ -951,7 +953,7 @@ config.app_url=Anwendungs-URL
 config.domain=Domain
 config.offline_mode=Offline-Modus
 config.disable_router_log=Router-Log deaktivieren
-config.run_user=Laufzeit-Benutzer
+config.run_user=Ausführender Benutzer
 config.run_mode=Laufzeit-Modus
 config.repo_root_path=Repository-Verzeichnis
 config.static_file_root_path=Verzeichnis für statische Dateien
@@ -972,7 +974,6 @@ config.register_email_confirm=E-Mail-Bestätigung bei Registrierung
 config.disable_register=Registrierung deaktivieren
 config.show_registration_button=Zeige die Schaltfläche Registrieren
 config.require_sign_in_view=Ansehen erfordert Registrierung
-config.enable_cache_avatar=Avatar-Cache aktivieren
 config.mail_notify=E-Mail-Benachrichtigung
 config.disable_key_size_check=Prüfung der Mindestschlüssellänge deaktiveren
 config.enable_captcha=Captcha aktivieren
@@ -1036,9 +1037,11 @@ notices.delete_success=Systemmitteilungen wurden erfolgreich gelöscht.
 
 [action]
 create_repo=hat Repository <a href="%s">%s</a> erstellt
-rename_repo=das Repository wurde umbenannt von <code>%[1]s</code> zu <a href="%[2]s">%[3]s</a>
+rename_repo=hat das Repository von <code>%[1]s</code> zu <a href="%[2]s">%[3]s</a> umbenannt
 commit_repo=hat nach <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a> gepusht
 create_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> eröffnet`
+close_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> geschlossen`
+reopen_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> wiedereröffnet`
 create_pull_request=`Pull-Anforderung erstellt <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> kommentiert`
 merge_pull_request=`Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> zuammengeführt`

conf/locale/locale_es-ES.ini

@@ -38,7 +38,7 @@ settings=Configuraciones
 your_profile=Tu perfil
 your_settings=Tu configuración
 
-activities=Activities
+activities=Actividad
 pull_requests=Pull Requests
 issues=Incidencias
 
@@ -130,10 +130,10 @@ invalid_log_root_path=La ruta para los registros es inválida: %v
 uname_holder=Nombre de usuario o correo electrónico
 password_holder=Contraseña
 switch_dashboard_context=Cambiar el contexto del Dashboard
-my_repos=Mis Repositorios
+my_repos=Mis repositorios
 collaborative_repos=Repositorios Colaborativos
-my_orgs=Mis Organizaciones
-my_mirrors=Mis Mirrors
+my_orgs=Mis organizaciones
+my_mirrors=Mis réplicas
 view_home=Ver %s
 
 issues.in_your_repos=En tus repositorios
@@ -338,7 +338,7 @@ delete_account_desc=Esta cuenta se va a eliminar permanentemente, ¿quieres cont
 
 [repo]
 owner=Propietario
-repo_name=Nombre del Repositorio
+repo_name=Nombre del repositorio
 repo_name_helper=Los grandes nombres de repositorios son cortos, memorables y <strong>únicos</strong>.
 visibility=Visibilidad
 visiblity_helper=Este repositorio es <span class="ui red text">Privado</span>
@@ -358,7 +358,7 @@ readme_helper=Seleccione una plantilla de archivo readme
 auto_init=Inicializar los archivos seleccionados y plantillas de este repositorio
 create_repo=Crear Repositorio
 default_branch=Rama por defecto
-mirror_interval=Intervalo de mirror(en horas)
+mirror_interval=Intervalo de la réplica (en horas)
 mirror_address=Dirección de la réplica
 mirror_address_desc=Por favor, incluya las credenciales de usuario necesarias en la dirección.
 watchers=Seguidores
@@ -371,7 +371,7 @@ form.name_pattern_not_allowed=El patrón del nombre del repositorio '%s' no est
 
 need_auth=Requiere Autorización
 migrate_type=Tipo de Migración
-migrate_type_helper=Este repositorio será un <span class="text blue">mirror</span>
+migrate_type_helper=Este repositorio será una <span class="text blue">réplica</span>
 migrate_repo=Migrar Repositorio
 migrate.clone_address=Clonar Dirección
 migrate.clone_address_desc=Puede ser una URL HTTP/HTTPS/GIT o una ruta local del servidor.
@@ -570,7 +570,7 @@ settings.collaboration=Colaboración
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Configuración Básica
-settings.site=Sitio Oficial
+settings.site=Sitio oficial
 settings.update_settings=Actualizar configuración
 settings.change_reponame_prompt=Este cambio afectará a los enlaces al repositorio.
 settings.advanced_settings=Ajustes avanzados
@@ -585,17 +585,17 @@ settings.tracker_url_format_desc=Puedes usar las plantillas <code>{user} {repo}
 settings.pulls_desc=Habilitar Pull Requests para aceptar contribuciones públicas
 settings.danger_zone=Zona de Peligro
 settings.new_owner_has_same_repo=El nuevo propietario tiene un repositorio con el mismo nombre.
-settings.convert=Convert To Regular Repository
+settings.convert=Convertir en un repositorio normal
 settings.convert_desc=Puedes convertir este repositorio en un repositorio normal. Este cambio no se puede deshacer.
-settings.convert_notices_1=- This operation will convert this repository mirror into a regular repository and cannot be undone.
-settings.convert_confirm=Confirm Conversion
-settings.convert_succeed=Repository has been converted to regular type successfully.
-settings.transfer=Transferir la Propiedad
+settings.convert_notices_1=- Esta operación convertirá este repositorio espejo en un repositorio normal y no podrá deshacerse.
+settings.convert_confirm=Confirmar conversión
+settings.convert_succeed=El repositorio ha sido convertido en normal satisfactoriamente.
+settings.transfer=Transferir la propiedad
 settings.transfer_desc=Transferir este repositorio a otro usuario u organización donde tengas permisos de administración.
 settings.transfer_notices_1=- Perderá el permiso de acceso si el nuevo propietario es otro usuario.
 settings.transfer_notices_2=- Conservará el privilegio de acceso si el nuevo propietario es una organización y usted es uno de los propietarios de dicha organización.
 settings.transfer_form_title=Por favor introduzca esta información para confirmar la operación:
-settings.delete=Eliminar este Repositorio
+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.
@@ -612,6 +612,7 @@ settings.add_collaborator=Añadir Nuevo Colaborador
 settings.add_collaborator_success=Se ha añadido el nuevo colaborador.
 settings.remove_collaborator_success=Se ha eliminado el colaborador.
 settings.search_user_placeholder=Buscar usuario...
+settings.org_not_allowed_to_be_collaborator=Las organizaciones no tiene permitido ser añadidas como colaboradores.
 settings.user_is_org_member=El usuario es miembro de la organización, no puede ser añadido como colaborador.
 settings.add_webhook=Añadir Webhook
 settings.hooks_desc=Los Webhooks permiten a servicios externos recibir notificaciones cuando sucedan ciertos eventos en Gogs. Cuando sucedan los eventos especificados, enviaremos una petición POST a cada una de las URLs indicadas. Para obtener más información, consulta nuestra <a target="_blank" href="%s">Guía de Webhooks</a>.
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Dejar vacío para usar el campo de inicio d
 auths.attribute_name=Atributo nombre
 auths.attribute_surname=Atributo apellido
 auths.attribute_mail=Atributo correo electrónico
+auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=Filtro de Usuario
 auths.admin_filter=Filtro de Aministrador
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ 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.enable_cache_avatar=Activar la Caché de Avatar
 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
@@ -1039,6 +1040,8 @@ create_repo=creó el repositorio <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>
 create_issue=`incidencia abierta <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`cerró la incidencia <a href="%s/issues/%s">%s#%[2]s"</a>`
+reopen_issue=`reabrió la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`creado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`comentó en la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`fusionado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`

conf/locale/locale_fr-FR.ini

@@ -38,7 +38,7 @@ settings=Paramètres
 your_profile=Votre profil
 your_settings=Vos paramètres
 
-activities=Activities
+activities=Activités
 pull_requests=Pull Requests
 issues=Tickets
 
@@ -86,8 +86,8 @@ http_port=Port HTTP
 http_port_helper=Numéro de port que l'application écoutera.
 app_url=URL de l'application
 app_url_helper=Cela affecte les doublons d'URL HTTP/HTTPS et le contenu d'e-mail.
-log_root_path=Log Path
-log_root_path_helper=Directory to write log files to.
+log_root_path=Chemin des fichiers log
+log_root_path_helper=Répertoire d'écriture des fichiers de log.
 
 optional_title=Paramètres facultatifs
 email_title=Paramètres du Service de Messagerie
@@ -124,7 +124,7 @@ run_user_not_match=L'utilisateur entré n'est pas l'utilisateur actuel : %s -> %
 save_config_failed=La sauvegarde de la configuration a échoué : %v
 invalid_admin_setting=Paramètres du compte administrateur invalides : %v
 install_success=Bienvenue ! Nous sommes heureux que vous ayez choisi Gogs, amusez-vous et prenez soin de vous.
-invalid_log_root_path=Log root path is invalid: %v
+invalid_log_root_path=Le chemin principal des fichiers logs est invalide: %v
 
 [home]
 uname_holder=Nom d'Utilisateur ou E-mail
@@ -585,11 +585,11 @@ settings.tracker_url_format_desc=Vous pouvez utiliser l'espace réservé <code>{
 settings.pulls_desc=Activer les pull requests pour accepter les contributions publiques
 settings.danger_zone=Zone de danger
 settings.new_owner_has_same_repo=Le nouveau propriétaire a déjà un dépôt nommé ainsi.
-settings.convert=Convert To Regular Repository
-settings.convert_desc=You can convert this mirror to a regular repository. This cannot be reversed.
+settings.convert=Convertir en dépôt ordinaire
+settings.convert_desc=Vous pouvez convertir ce miroir en dépôt ordinaire. Cela ne peut pas être inversée.
 settings.convert_notices_1=- This operation will convert this repository mirror into a regular repository and cannot be undone.
-settings.convert_confirm=Confirm Conversion
-settings.convert_succeed=Repository has been converted to regular type successfully.
+settings.convert_confirm=Confirmer la conversion
+settings.convert_succeed=Le dépôt a été converti avec succès en dépôt ordinaire.
 settings.transfer=Changer de propriétaire
 settings.transfer_desc=Transférer ce dépôt à un autre utilisateur ou une organisation dont vous possédez des droits d'administrateur.
 settings.transfer_notices_1=-Vous perdrez l'accès si le nouveau propriétaire est un utilisateur individuel.
@@ -612,6 +612,7 @@ settings.add_collaborator=Ajouter un collaborateur
 settings.add_collaborator_success=Nouveau collaborateur ajouté.
 settings.remove_collaborator_success=Collaborateur supprimé.
 settings.search_user_placeholder=Rechercher un utilisateur...
+settings.org_not_allowed_to_be_collaborator=Organization is not allowed to be added as a collaborator.
 settings.user_is_org_member=Cet utilisateur ne peut pas être ajouté en tant que collaborateur car il fait partie d'une organisation.
 settings.add_webhook=Ajouter un Webhook
 settings.hooks_desc=Les Webhooks sont des déclencheurs de POST HTTP . Lorsque qu'un événement se produit dans Gogs, une notification sera envoyée vers l'hôte cible préalablement spécifié. Apprenez-en davantage dans le <a target="_blank" href="%s">Guide des Webhooks</a>.
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Laisser vide pour utiliser la valeur du for
 auths.attribute_name=Attribut du prénom
 auths.attribute_surname=Attribut du nom de famille
 auths.attribute_mail=Attribut de l'e-mail
+auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=Filtre utilisateur
 auths.admin_filter=Filtre administrateur
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ config.register_email_confirm=Nécessite une confirmation par courriel
 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.enable_cache_avatar=Activer le Cache d'Avatar
 config.mail_notify=Mailer les Notifications
 config.disable_key_size_check=Désactiver la vérification de la taille de clé minimale
 config.enable_captcha=Activez le Captcha
@@ -1039,6 +1040,8 @@ create_repo=a créé le dépôt <a href="%s">%s</a>
 rename_repo=rebaptisé le dépôt de <code>%[1]s</code> à <a href="%[2]s">%[3]s</a>
 commit_repo=a soumis à <a href="%[1]s/src/%[2]s">%[3]s</a> sur <a href="%[1]s">%[4]s</a>
 create_issue=`a ouvert un problème <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`pull request créée le <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`a commenté le problème <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`pull request fusionné le <a href="%s/pulls/%s">%s#%[2]s</a>`

conf/locale/locale_it-IT.ini

@@ -612,6 +612,7 @@ settings.add_collaborator=Aggiungi nuovo collaboratore
 settings.add_collaborator_success=Il nuovo collaboratore è stato aggiunto.
 settings.remove_collaborator_success=Il collaboratore è stato rimosso.
 settings.search_user_placeholder=Cerca utente...
+settings.org_not_allowed_to_be_collaborator=Organization is not allowed to be added as a collaborator.
 settings.user_is_org_member=L'utente è un membro dell'organizzazione che non può essere aggiunto come collaboratore.
 settings.add_webhook=Aggiungi Webhook
 settings.hooks_desc=I Webhooks sono molto simili a un basilare evento trigger HTTP POST. Ogni volta che qualcosa si verifica in Gogs, tratteremo la notifica all'host di destinazione specificato. Ulteriori informazioni in questa <a target="_blank" href="%s">Guida ai Webhooks</a>.
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Leave empty to use sign-in form field value
 auths.attribute_name=Attributo Nome
 auths.attribute_surname=Attributo Cognome
 auths.attribute_mail=Attributo Email
+auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=User Filter
 auths.admin_filter=Admin Filter
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ config.register_email_confirm=Richiedono Conferma dell'Email
 config.disable_register=Disabilita Registrazione
 config.show_registration_button=Mostra Pulsane Registrazione
 config.require_sign_in_view=Richiesto Accesso per Vedere
-config.enable_cache_avatar=Abilitare Cache dell'Avatar
 config.mail_notify=Email di Notifica
 config.disable_key_size_check=Disable Minimum Key Size Check
 config.enable_captcha=Abilita Captcha
@@ -1039,6 +1040,8 @@ create_repo=ha creato il repository <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>
 create_issue=`ha aperto il problema <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`creata pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`ha commentato il problema <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`

conf/locale/locale_ja-JP.ini

@@ -612,6 +612,7 @@ settings.add_collaborator=新しい共同編集者を追加
 settings.add_collaborator_success=新しい共同編集者が追加されました。
 settings.remove_collaborator_success=共同編集者が削除されました。
 settings.search_user_placeholder=Search users
+settings.org_not_allowed_to_be_collaborator=Organization is not allowed to be added as a collaborator.
 settings.user_is_org_member=ユーザーは組織の一員なので、共同編集者として追加することはできません。
 settings.add_webhook=Webhook を追加
 settings.hooks_desc=Webhooksは、Gogsで特定のイベントの発生時に指定された外部サービスに通知を許可します。イベントが発生すると、それぞれ指定されたUrlに、POSTリクエストが送られます。詳細はこちらのの <a target="_blank"href="%s"> Webhooks ガイド</a>をご覧ください。
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Leave empty to use sign-in form field value
 auths.attribute_name=名前属性
 auths.attribute_surname=名字属性
 auths.attribute_mail=Eメール属性
+auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=User フィルター
 auths.admin_filter=Admin フィルター
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ config.register_email_confirm=電子メールの確認を必要
 config.disable_register=登録を無効にする
 config.show_registration_button=登録ボタンを表示します。
 config.require_sign_in_view=サインインを要求
-config.enable_cache_avatar=アバターのキャッシュを有効にします。
 config.mail_notify=メール通知
 config.disable_key_size_check=最小キー サイズ チェックを無効にします
 config.enable_captcha=Captchaを有効にする
@@ -1039,6 +1040,8 @@ create_repo=リポジトリ <a href="%s"> %s</a>を作成しました
 rename_repo=<code>%[1]s</code> から <a href="%[2]s">[3]s</a> にリポジトリ名を変更した
 commit_repo=<a href="%[1]s">%[4]s</a>を<a href="%[1]s/src/%[2]s">%[3]s</a>にプッシュしました
 create_issue=`問題 <a href="%s/issues/%s">%s#%[2]s</a> を開きました`
+close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`プルリクエスト <a href="%s/pulls/%s"> %s[2]s</a>を作成`
 comment_issue=`問題 <a href="%s/issues/%s">%s#%[2]s</a> のコメント`
 merge_pull_request=`プルリクエスト <a href="%s/pulls/%s"> %s[2]s</a>をマージしました`

conf/locale/locale_lv-LV.ini

@@ -612,6 +612,7 @@ settings.add_collaborator=Pievienot jaunu līdzstrādnieku
 settings.add_collaborator_success=Jauns līdzstrādnieks ir pievienots.
 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=Organization is not allowed to be added as a collaborator.
 settings.user_is_org_member=Lietotājs ir organizācijas biedrs, kas nevar tikt pievienots kā līdzstrādnieks.
 settings.add_webhook=Pievienot tīmekļa āķi
 settings.hooks_desc=Tīmekļa āķi ļauj paziņot ārējiem servisiem par noteiktiem notikomiem, kas notiek Git servisā. Kad iestāsies kāds notikums, katram ārējā servisa URL tiks nosūtīts POST pieprasījums. Lai uzzinātu sīkāk skatieties <a target="_blank" href="%s">Tīmekļa āķu rokasgrāmatā</a>.
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Atstājiet tukšu, lai izmantotu lietotājv
 auths.attribute_name=Vārda atribūts
 auths.attribute_surname=Uzvārda atribūts
 auths.attribute_mail=E-pasta atribūts
+auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=Lietotāju filts
 auths.admin_filter=Administratoru filtrs
 auths.ms_ad_sa=MS Ad SA
@@ -972,7 +974,6 @@ 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.enable_cache_avatar=Glabāt profila attēlus kešatmiņā
 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
@@ -1039,6 +1040,8 @@ create_repo=izveidoja repozitoriju <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>
 create_issue=`reģistrēja problēmu <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`izveidoja izmaiņu pieprasījumu <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`pievienoja komentāru problēmai <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`sapludināja izmaiņu pieprasījumu <a href="%s/pulls/%s">%s#%[2]s</a>`

conf/locale/locale_nl-NL.ini

@@ -19,7 +19,7 @@ signed_in_as=Aangemeld als
 
 username=Gebruikersnaam
 email=E-mail
-password=Wachttwoord
+password=Wachtwoord
 re_type=Verificatie
 captcha=CAPTCHA
 
@@ -612,6 +612,7 @@ settings.add_collaborator=Nieuwe medewerker toevoegen
 settings.add_collaborator_success=medewerker is toegevoegd.
 settings.remove_collaborator_success=medewerker is verwijderd.
 settings.search_user_placeholder=Zoek gebruiker...
+settings.org_not_allowed_to_be_collaborator=Organization is not allowed to be added as a collaborator.
 settings.user_is_org_member=Gebruiker is lid van de organisatie die als een medewerker kan niet worden toegevoegd.
 settings.add_webhook=Webhook toevoegen
 settings.hooks_desc=Webhooks dat de externe diensten om kennisgevingen te ontvangen wanneer bepaalde gebeurtenissen op Gogs plaatsvinden. Wanneer de opgegeven gebeurtenissen plaatsvinden, sturen we een POST-aanvraag naar elk van de URL's die u opgeeft. Meer informatie vindt u in onze <a target="_blank" href="%s"> Webhooks gids</a>.
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Leave empty to use sign-in form field value
 auths.attribute_name=Voornaam attribuut
 auths.attribute_surname=Achternaam attribuut
 auths.attribute_mail=E-mail attribuut
+auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=User Filter
 auths.admin_filter=Admin Filter
 auths.ms_ad_sa=MS Ad SA
@@ -972,7 +974,6 @@ 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.enable_cache_avatar=Avatar Cache inschakelen
 config.mail_notify=E-mailnotificaties
 config.disable_key_size_check=Disable Minimum Key Size Check
 config.enable_captcha=Enable Captcha
@@ -1039,6 +1040,8 @@ create_repo=repositorie aangemaakt in <a href="%s">%s</a>
 rename_repo=renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a>
 commit_repo=push update naar <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a>
 create_issue=`opende issue in <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`created pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`reactie op issue <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`

conf/locale/locale_pl-PL.ini

@@ -612,6 +612,7 @@ settings.add_collaborator=Dodaj nowego współpracownika
 settings.add_collaborator_success=Został dodany nowy współpracownik.
 settings.remove_collaborator_success=Współpracownik został usunięty.
 settings.search_user_placeholder=Szukaj użytkownika...
+settings.org_not_allowed_to_be_collaborator=Organization is not allowed to be added as a collaborator.
 settings.user_is_org_member=Użytkownik jest członkiem organizacji, który nie może być dodany jako współpracownik.
 settings.add_webhook=Dodaj webhooka
 settings.hooks_desc=Webooki działają tak jak proste wywołania HTTP POST. Jeśli cokolwiek zdarzy się w Gogs, wyślemy powiadomienie do wybranego hosta. Więcej informacji można znaleźć w <a target="_blank" href="%s">przewodniku webhooków</a>.
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Zostaw puste aby użyć wartości podanej p
 auths.attribute_name=Atrybut imienia
 auths.attribute_surname=Atrybut nazwiska
 auths.attribute_mail=Atrybut e-mail
+auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=Filtr użytkownika
 auths.admin_filter=Filtr administratora
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ 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.enable_cache_avatar=Włącz cache awatarów
 config.mail_notify=Powiadomienia e-mail
 config.disable_key_size_check=Wyłącz sprawdzanie minimalnego rozmiaru klucza
 config.enable_captcha=Włącz Captcha
@@ -1039,6 +1040,8 @@ create_repo=tworzy repozytorium <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>
 create_issue=`zgłasza problem <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`tworzy pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`komentuje problem <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`scala pull request <a href="%s/pulls/%s">%s#%[2]s</a>`

conf/locale/locale_pt-BR.ini

@@ -38,7 +38,7 @@ settings=Configurações
 your_profile=Seu perfil
 your_settings=Suas configurações
 
-activities=Activities
+activities=Atividades
 pull_requests=Pull Requests
 issues=Problemas
 
@@ -86,8 +86,8 @@ http_port=Porta HTTP
 http_port_helper=Número da porta em que a aplicação irá executar.
 app_url=URL do aplicativo
 app_url_helper=Isto afeta a URL de clonagem via HTTP/HTTPs e também o email.
-log_root_path=Log Path
-log_root_path_helper=Directory to write log files to.
+log_root_path=Caminho do log
+log_root_path_helper=Pasta dos arquivos de log.
 
 optional_title=Configurações opcionais
 email_title=Configurações do serviço de e-mail
@@ -124,7 +124,7 @@ run_user_not_match=O usuário da execução não é o usuário atual: %s -> %s
 save_config_failed=Falha ao salvar a configuração: %v
 invalid_admin_setting=Configuração da conta de administrador está inválida: %v
 install_success=Bem-vindo! Estamos contentes que você escolheu o Gogs, divirta-se e tenha cuidado.
-invalid_log_root_path=Log root path is invalid: %v
+invalid_log_root_path=Pasta raíz do log é inválida: %v
 
 [home]
 uname_holder=Nome de Usuário ou E-mail
@@ -518,7 +518,7 @@ pulls.merged=Merge realizado
 pulls.has_merged=Este pull request foi mesclado com sucesso!
 pulls.data_broken=Dados deste pull request foram quebrados devido à deleção de informação do fork.
 pulls.is_checking=A verificação do conflito ainda está em progresso, por favor recarregue a página em instantes.
-pulls.can_auto_merge_desc=Este pull request foi mesclado automaticamente.
+pulls.can_auto_merge_desc=Este pull request pode ser mesclado automaticamente.
 pulls.cannot_auto_merge_desc=Este pull request não pode ser mesclado automaticamente pois há conflitos.
 pulls.cannot_auto_merge_helper=Por favor, mescle manualmente para resolver os conflitos.
 pulls.merge_pull_request=Merge Pull Request
@@ -585,11 +585,11 @@ settings.tracker_url_format_desc=Você pode usar o espaço reservado <code>{user
 settings.pulls_desc=Habilitar pull requests para aceitar contribuições públicas
 settings.danger_zone=Zona de Perigo
 settings.new_owner_has_same_repo=O novo dono já tem um repositório com o mesmo nome. Por favor, escolha outro nome.
-settings.convert=Convert To Regular Repository
-settings.convert_desc=You can convert this mirror to a regular repository. This cannot be reversed.
-settings.convert_notices_1=- This operation will convert this repository mirror into a regular repository and cannot be undone.
-settings.convert_confirm=Confirm Conversion
-settings.convert_succeed=Repository has been converted to regular type successfully.
+settings.convert=Converter para repositório tradicional
+settings.convert_desc=Você pode converter este espelho em um repositório tradicional. Esta ação não pode ser revertida.
+settings.convert_notices_1=- Esta operação vai converter este repositório espelho em um repositório tradicional. Esta ação não pode ser desfeita.
+settings.convert_confirm=Confirmar conversão
+settings.convert_succeed=Repositório espelho convertido para tradicional com sucesso.
 settings.transfer=Transferir Propriedade
 settings.transfer_desc=Transferir este repositório para outro usuário ou para uma organização onde você tem direitos de administrador.
 settings.transfer_notices_1=- Você vai perder acesso se o novo dono for um usuário individual.
@@ -612,6 +612,7 @@ settings.add_collaborator=Adicionar um Novo Colaborador
 settings.add_collaborator_success=O novo colaborador foi adicionado.
 settings.remove_collaborator_success=O colaborador foi removido.
 settings.search_user_placeholder=Pesquisar usuário...
+settings.org_not_allowed_to_be_collaborator=Organization is not allowed to be added as a collaborator.
 settings.user_is_org_member=O usuário é um membro da organização que não pode ser adicionado como um colaborador.
 settings.add_webhook=Adicionar Webhook
 settings.hooks_desc=Hooks da web ou Webhooks permitem serviços externos serem notificados quando certos eventos acontecem no Gogs. Quando acontecem os eventos especificados, enviaremos uma solicitação POST para cada uma das URLs que você fornecer. Saiba mais no nosso <a target="_blank" href="%s"> Guia de Webhooks</a>.
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Deixe vazio para usar o valor do campo de f
 auths.attribute_name=Atributo primeiro nome
 auths.attribute_surname=Atributo sobrenome
 auths.attribute_mail=Atributo e-mail
+auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=Filtro de usuário
 auths.admin_filter=Filtro de administrador
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ 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 Ver
-config.enable_cache_avatar=Habilitar Cache de Avatar
 config.mail_notify=Notificação de Correio
 config.disable_key_size_check=Desativar verificação de tamanho mínimo da chave
 config.enable_captcha=Habilitar o Captcha
@@ -1039,6 +1040,8 @@ create_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>
 create_issue=`questão aberta <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`criou o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`comentou sobre a questão <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`mesclou o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`

conf/locale/locale_ru-RU.ini

@@ -38,7 +38,7 @@ settings=Настройки
 your_profile=Ваш профиль
 your_settings=Ваши настройки
 
-activities=Activities
+activities=Активность
 pull_requests=Запросы на слияние
 issues=Задачи
 
@@ -86,8 +86,8 @@ http_port=Порт HTTP
 http_port_helper=Номер порта, который приложение будет слушать.
 app_url=URL приложения
 app_url_helper=Этот параметр влияет на URL для клонирования по HTTP/HTTPS и на адреса в электронной почте.
-log_root_path=Log Path
-log_root_path_helper=Directory to write log files to.
+log_root_path=Путь к журналу
+log_root_path_helper=Каталог для записи файлов журнала.
 
 optional_title=Расширенные настройки
 email_title=Настройки службы электронной почты
@@ -124,7 +124,7 @@ run_user_not_match=Текущий пользователь не является
 save_config_failed=Не удалось сохранить конфигурацию: %v
 invalid_admin_setting=Указан недопустимый параметр учетной записи администратора: %v
 install_success=Добро пожаловать! Мы рады, что вы выбрали Gogs. Веселитесь и берегите себя.
-invalid_log_root_path=Log root path is invalid: %v
+invalid_log_root_path=Недопустимый путь для логов: %v
 
 [home]
 uname_holder=Имя пользователь или E-mail
@@ -585,11 +585,11 @@ settings.tracker_url_format_desc=Вы можете использовать ша
 settings.pulls_desc=Включить публичные запросы на слияние
 settings.danger_zone=Опасная зона
 settings.new_owner_has_same_repo=У нового владельца уже есть хранилище с таким названием.
-settings.convert=Convert To Regular Repository
-settings.convert_desc=You can convert this mirror to a regular repository. This cannot be reversed.
-settings.convert_notices_1=- This operation will convert this repository mirror into a regular repository and cannot be undone.
-settings.convert_confirm=Confirm Conversion
-settings.convert_succeed=Repository has been converted to regular type successfully.
+settings.convert=Преобразовать в обычный репозиторий
+settings.convert_desc=Это зеркало можно преобразовать в обычный репозиторий. Это не может быть отменено.
+settings.convert_notices_1=- Эта операция преобразует это зеркало в обычный репозиторий, и она не может быть отменена.
+settings.convert_confirm=Подтвердите преобразование
+settings.convert_succeed=Репозиторий был успешно преобразован в обычный.
 settings.transfer=Передать права собственности
 settings.transfer_desc=Передать репозиторий другому пользователю или организации где у вас есть права администратора.
 settings.transfer_notices_1=- Вы можете потерять доступ, если новый владелец является отдельным пользователем.
@@ -612,6 +612,7 @@ settings.add_collaborator=Добавить нового соавтора
 settings.add_collaborator_success=Был добавлен новый соавтор.
 settings.remove_collaborator_success=Соавтор был удален.
 settings.search_user_placeholder=Поиск пользователя...
+settings.org_not_allowed_to_be_collaborator=Организации не могут быть добавлены как соавторы.
 settings.user_is_org_member=Пользователь является членом организации,  члены которой не могут быть добавлены в качестве соавтора.
 settings.add_webhook=Добавить Webhook
 settings.hooks_desc=Webhooks позволяют внешним службам получать уведомления при возникновении определенных событий на Gogs. При возникновении указанных событий мы отправим запрос POST на каждый заданный вами URL. Узнать больше можно в нашем <a target="_blank" href="%s">Руководстве по Webhooks</a>.
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=Оставьте пустым, чтобы
 auths.attribute_name=Имя аттрибута
 auths.attribute_surname=Фамилия аттрибута
 auths.attribute_mail=Электронная почта аттрибута
+auths.attributes_in_bind=Извлечение атрибутов в виде Bind DN
 auths.filter=Фильтр пользователя
 auths.admin_filter=Фильтр администратора
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ config.register_email_confirm=Требуется подтверждение по
 config.disable_register=Отключить регистрацию
 config.show_registration_button=Показать кнопку регистрации
 config.require_sign_in_view=Для просмотра необходима авторизация
-config.enable_cache_avatar=Кешировать аватар
 config.mail_notify=Почтовые уведомления
 config.disable_key_size_check=Отключить проверку на минимальный размер ключа
 config.enable_captcha=Включить капчу
@@ -1035,15 +1036,17 @@ notices.op=Op.
 notices.delete_success=Системное уведомление успешно удалено.
 
 [action]
-create_repo=создал репозиторий <a href="%s"> %s</a>
+create_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>
+commit_repo=запушил(а) <a href="%[1]s/src/%[2]s">%[3]s</a> в <a href="%[1]s">%[4]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>`
 create_pull_request=`созданный пулл-реквест <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`прокомментировал(а) вопрос <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`слил пул реквест <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=перенес репозиторий <code>%s</code> в <a href="%s">%s</a>
-push_tag=запушил тэг <a href="%s/src/%s">%[2]s</a> в <a href="%[1]s">%[3]s</a>
+push_tag=запушил(а) метку <a href="%s/src/%s">%[2]s</a> в <a href="%[1]s">%[3]s</a>
 compare_commits=Просмотр сравнение для этих %d коммитов
 
 [tool]

conf/locale/locale_zh-CN.ini

@@ -612,6 +612,7 @@ settings.add_collaborator=增加新的协作者
 settings.add_collaborator_success=成功添加新的协作者！
 settings.remove_collaborator_success=被操作的协作者已经被收回权限！
 settings.search_user_placeholder=搜索用户...
+settings.org_not_allowed_to_be_collaborator=组织不允许被添加为仓库协作者！
 settings.user_is_org_member=被操作的用户是组织成员，因此无法添加为协作者！
 settings.add_webhook=添加 Web 钩子
 settings.hooks_desc=Web 钩子允许您设定在 Gogs 上发生指定事件时对指定 URL 发送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文档</a> 获取更多信息。
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=留空表示使用用户登录时所使用
 auths.attribute_name=名字属性
 auths.attribute_surname=姓氏属性
 auths.attribute_mail=邮箱属性
+auths.attributes_in_bind=从 Bind DN 中拉取属性信息
 auths.filter=用户过滤规则
 auths.admin_filter=管理员过滤规则
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ config.register_email_confirm=注册邮件确认
 config.disable_register=关闭注册功能
 config.show_registration_button=显示注册按钮
 config.require_sign_in_view=强制登录浏览
-config.enable_cache_avatar=开启缓存头像
 config.mail_notify=邮件通知提醒
 config.disable_key_size_check=禁用密钥最小长度检查
 config.enable_captcha=启用验证码服务
@@ -1039,6 +1040,8 @@ create_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>
 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>`
 create_pull_request=`创建了合并请求 <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`评论了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`合并了合并请求 <a href="%s/pulls/%s">%s#%[2]s</a>`

conf/locale/locale_zh-HK.ini

@@ -612,6 +612,7 @@ settings.add_collaborator=增加新的協作者
 settings.add_collaborator_success=成功添加新的協作者！
 settings.remove_collaborator_success=被操作的協作者已經被收回權限！
 settings.search_user_placeholder=搜索用戶...
+settings.org_not_allowed_to_be_collaborator=Organization is not allowed to be added as a collaborator.
 settings.user_is_org_member=被操作的用戶是組織成員，因此無法添加為協作者！
 settings.add_webhook=添加 Web 鉤子
 settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文檔</a> 獲取更多信息。
@@ -921,6 +922,7 @@ auths.attribute_username_placeholder=留空表示使用用戶登錄時所使用
 auths.attribute_name=名子屬性
 auths.attribute_surname=姓氏屬性
 auths.attribute_mail=電子郵箱屬性
+auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=使用者篩選器
 auths.admin_filter=管理者篩選器
 auths.ms_ad_sa=Ms Ad SA
@@ -972,7 +974,6 @@ config.register_email_confirm=註冊電子郵件確認
 config.disable_register=關閉註冊功能
 config.show_registration_button=顯示註冊按鈕
 config.require_sign_in_view=強制登錄瀏覽
-config.enable_cache_avatar=開啟緩存頭像
 config.mail_notify=郵件通知提醒
 config.disable_key_size_check=禁用密鑰最小長度檢查
 config.enable_captcha=啟用驗證碼服務
@@ -1039,6 +1040,8 @@ create_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>
 create_issue=`創建了問題 <a href="%s/issues/%s">%s#%[2]s</a>`
+close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
+reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`創建了合併請求 <a href="%s/pulls/%s">%s#%[2]s</a>`
 comment_issue=`評論了問題 <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`合併了合併請求 <a href="%s/pulls/%s">%s#%[2]s</a>`