prepare release

14 files changed, 405 insertions, 147 deletions

diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS
index c7d7f9ed54..37cc2198ac 100644
--- a/conf/locale/TRANSLATORS
+++ b/conf/locale/TRANSLATORS
@@ -20,10 +20,11 @@ Luc Stepniewski <luc AT stepniewski DOT fr>
 Marc Schiller <marc AT schiller DOT im>
 Miguel de la Cruz <miguel AT mcrx DOT me>
 Morten Sørensen <klim8d AT gmail DOT com>
+Nakao Takamasa <at.mattenn AT gmail DOT com>
 Natan Albuquerque <natanalbuquerque5 AT gmail DOT com>
 Odilon Junior <odilon DOT junior93 AT gmail DOT com>
 Thomas Fanninger <gogs DOT thomas AT fanninger DOT at>
 Tilmann Bach <tilmann AT outlook DOT com>
 Vladimir Vissoultchev <wqweto AT gmail DOT com>
 YJSoft <yjsoft AT yjsoft DOT pe DOT kr>
-Łukasz Jan Niemier <lukasz AT niemier DOT pl>
\ No newline at end of file
+Łukasz Jan Niemier <lukasz AT niemier DOT pl>
diff --git a/conf/locale/locale_bg-BG.ini b/conf/locale/locale_bg-BG.ini
index b425d79639..084def8536 100755
--- a/conf/locale/locale_bg-BG.ini
+++ b/conf/locale/locale_bg-BG.ini
@@ -4,10 +4,10 @@ home=Начало
 dashboard=Табло
 explore=Преглед
 help=Помощ
-sign_in=Влизане
+sign_in=Вписване
 sign_out=Излизане
 sign_up=Регистрирайте се
-register=Регистриране
+register=Регистрация
 website=Уебсайт
 version=Версия
 page=Страница
@@ -375,11 +375,11 @@ copy_link=Копирай
 copy_link_success=Копирано!
 copy_link_error=Натиснете ⌘-C или Ctrl-C за да копирате
 copied=Успешно копиране
-unwatch=Не следи
-watch=Следи
+unwatch=Не наблюдавам
+watch=Наблюдаван
 unstar=Не харесвам
-star=Харесвам
-fork=Разклонение
+star=Харесван
+fork=Разклонения
 
 no_desc=Няма описание
 quick_guide=Бърз справочник
@@ -400,9 +400,9 @@ labels=Етикети
 milestones=Етапи
 commits=Ревизии
 releases=Издания
-file_raw=Изходен файл
+file_raw=Директен файл
 file_history=История
-file_view_raw=Виж изходен файл
+file_view_raw=Виж директен файл
 file_permalink=Постоянна връзка
 
 commits.commits=Ревизии
@@ -536,21 +536,21 @@ milestones.deletion=Изтрий етап
 milestones.deletion_desc=При изтриване на етап ще се премахне информацията за него от всички свързани проблеми. Желаете ли да продължите?
 milestones.deletion_success=Етапът е изтрит успешно!
 
-wiki=Wiki
-wiki.welcome=Welcome to Wiki!
-wiki.welcome_desc=Wiki is the place where you would like to document your project together and make it better.
-wiki.create_first_page=Create the first page
-wiki.page=Page
-wiki.filter_page=Filter page
-wiki.new_page=Create New Page
-wiki.default_commit_message=Write a note about this update (optional).
-wiki.save_page=Save Page
-wiki.last_commit_info=%s edited this page %s
-wiki.edit_page_button=Edit
-wiki.new_page_button=New Page
-wiki.page_already_exists=Wiki page with same name already exists.
-wiki.pages=Pages
-wiki.last_updated=Last updated %s
+wiki=Уики
+wiki.welcome=Добре дошли в Уики!
+wiki.welcome_desc=Уики е място, където заедно можете да документирате проекта си, за да го направите по-добър.
+wiki.create_first_page=Създай първата страница
+wiki.page=Страница
+wiki.filter_page=Филтър страница
+wiki.new_page=Създай нова страница
+wiki.default_commit_message=Напишете описание на тази модификация (опционално).
+wiki.save_page=Запис на страница
+wiki.last_commit_info=%s редактира тази страница %s
+wiki.edit_page_button=Редакция
+wiki.new_page_button=Нова страница
+wiki.page_already_exists=Страница със същото име вече съществува.
+wiki.pages=Страници
+wiki.last_updated=Последна модификация на %s
 
 settings=Настройки
 settings.options=Опции
@@ -558,10 +558,17 @@ settings.collaboration=Сътрудничество
 settings.hooks=Уеб-куки
 settings.githooks=Git куки
 settings.basic_settings=Основни настройки
-settings.danger_zone=Опасна зона
 settings.site=Официален сайт
 settings.update_settings=Обнови настройките
 settings.change_reponame_prompt=Тази промяна ще засегне връзките, които се отнасят до това хранилището.
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=Опасна зона
 settings.transfer=Прехвърли притежание
 settings.transfer_desc=Прехвърля това хранилище на друг потребител или към организация, в която имате права на администратор.
 settings.new_owner_has_same_repo=Новият притежател вече има хранилище със същото име. Изберете друго име.
@@ -575,6 +582,7 @@ settings.delete_notices_2=- Тази операция ще изтрие всич
 settings.delete_notices_fork_1=- Ако това хранилище е публично, всички негови разклонения ще останат независими след изтриването му.
 settings.delete_notices_fork_2=- Ако това хранилище е частно, всички негови разклонения ще бъдат премахнати по време на изтриването.
 settings.delete_notices_fork_3=- Ако желаете да запазите всички разклонения след изтриването му, първо направете хранилището публично.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=Настройките на хранилището са запазени успешно.
 settings.transfer_owner=Нов притежател
 settings.make_transfer=Прехвърли
@@ -590,6 +598,9 @@ settings.hooks_desc=Уеб-куките много приличат на оби�
 settings.webhook_deletion=Изтрий уеб-кука
 settings.webhook_deletion_desc=При изтриване на тази уеб-кука ще се премахне информацията за нея и цялата хронология на нейното изпращане. Желаете ли да продължите?
 settings.webhook_deletion_success=Уеб-куката е изтрита успешно!
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Заявка
 settings.webhook.response=Отговор
 settings.webhook.headers=Заглавки
@@ -629,7 +640,7 @@ settings.slack_domain=Домейн
 settings.slack_channel=Канал
 settings.deploy_keys=Ключове за внедряване
 settings.add_deploy_key=Добави ключ за внедряване
-settings.deploy_key_desc=Deploy key only has read-only access. It is not same as personal account SSH keys.
+settings.deploy_key_desc=Този ключ за внедряване има права само за четене. Това не е същото като SSH ключове на персонален потребител.
 settings.no_deploy_keys=Все още няма настроен никакъв ключ за внедряване.
 settings.title=Заглавие
 settings.deploy_key_content=Съдържание
@@ -640,14 +651,14 @@ settings.deploy_key_deletion=Изтрий ключ за внедряване
 settings.deploy_key_deletion_desc=При изтриването на този ключ за внедряване ще се премахнат свързаните права за достъп до това хранилище. Желаете ли да продължите?
 settings.deploy_key_deletion_success=Ключът за внедряване е изтрит успешно!
 
-diff.browse_source=Всички файлове в ревизията
+diff.browse_source=Преглед на файлове
 diff.parent=родител
 diff.commit=ревизия
 diff.data_not_available=Няма данни за разлики.
 diff.show_diff_stats=Покажи статистика за разликите
 diff.stats_desc=променени са <strong>%d файла</strong>, в които са <strong>добавени %d</strong> реда и са <strong>изтрити %d</strong> реда
 diff.bin=BIN
-diff.view_file=Преглед на файла
+diff.view_file=Целия файл
 
 release.releases=Издания
 release.new_release=Ново издание
@@ -879,6 +890,8 @@ auths.bind_password=Парола за свръзка
 auths.bind_password_helper=Внимание: Тази парола се запазва некриптирана. Моля използвайте потребител, който няма административен достъп.
 auths.user_base=Базов OU за търсене
 auths.user_dn=Име (DN) на потребител
+auths.attribute_username=Атрибут за име
+auths.attribute_username_placeholder=Оставете празно за да използва потребителското име от форма за вписване.
 auths.attribute_name=Атрибут за име
 auths.attribute_surname=Атрибут за фамилия
 auths.attribute_mail=Атрибут за ел. поща
@@ -982,11 +995,18 @@ monitor.start=Начален час
 monitor.execute_time=Време за изпълнение
 
 notices.system_notice_list=Системни известия
+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.type=Тип
 notices.type_1=Хранилище
 notices.desc=Описание
 notices.op=Oп.
-notices.delete_success=Системното съобщение е изтрито успешно.
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=създаде хранилище <a href="%s"> %s</a>
diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini
index 8106022e39..c900763803 100755
--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
@@ -537,20 +537,20 @@ milestones.deletion_desc=Das Löschen dieses Meilensteins wird alle zugehörigen
 milestones.deletion_success=Meilenstein erfolgreich gelöscht!
 
 wiki=Wiki
-wiki.welcome=Welcome to Wiki!
-wiki.welcome_desc=Wiki is the place where you would like to document your project together and make it better.
-wiki.create_first_page=Create the first page
-wiki.page=Page
-wiki.filter_page=Filter page
-wiki.new_page=Create New Page
-wiki.default_commit_message=Write a note about this update (optional).
-wiki.save_page=Save Page
-wiki.last_commit_info=%s edited this page %s
-wiki.edit_page_button=Edit
-wiki.new_page_button=New Page
-wiki.page_already_exists=Wiki page with same name already exists.
-wiki.pages=Pages
-wiki.last_updated=Last updated %s
+wiki.welcome=Willkommen im Wiki!
+wiki.welcome_desc=Das Wiki ist der Ort, wo du zusammen dein Projekt dokumentieren und es besser machen kannst.
+wiki.create_first_page=Erstelle die erste Seite
+wiki.page=Seite
+wiki.filter_page=Seite filtern
+wiki.new_page=Neue Seite erstellen
+wiki.default_commit_message=Schreibe eine Notiz zu dieser Aktualisierung (optional).
+wiki.save_page=Seite speichern
+wiki.last_commit_info=%s hat diese Seite bearbeitet %s
+wiki.edit_page_button=Bearbeiten
+wiki.new_page_button=Neue Seite
+wiki.page_already_exists=Eine Wiki-Seite mit dem gleichen Namen existiert bereits.
+wiki.pages=Seiten
+wiki.last_updated=Zuletzt aktualisiert %s
 
 settings=Einstellungen
 settings.options=Optionen
@@ -558,10 +558,17 @@ settings.collaboration=Zusammenarbeit
 settings.hooks=Webhooks
 settings.githooks=Git-Hooks
 settings.basic_settings=Grundeinstellungen
-settings.danger_zone=Gefahrenzone
 settings.site=Offizielle Webseite
 settings.update_settings=Einstellungen speichern
 settings.change_reponame_prompt=Diese Änderung wirkt sich darauf aus, wie sich Links auf Repositories beziehen.
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=Gefahrenzone
 settings.transfer=Besitz übertragen
 settings.transfer_desc=Übertrage diese Repository auf einen anderen Benutzer oder eine Organisation in der du Admin-Rechte hast.
 settings.new_owner_has_same_repo=Der neue Eigentümer hat bereits ein Repository mit dem gleichen Namen.
@@ -575,6 +582,7 @@ settings.delete_notices_2=- Die Operation wird alles, was mit dieser Git-Reposit
 settings.delete_notices_fork_1=- Wenn dies eine öffentliche Repository ist, werden nach der Löschung alle Forks unabhängig.
 settings.delete_notices_fork_2=- Wenn dies eine private Repository ist, dann werden gleichzeitig alle Forks entfernt.
 settings.delete_notices_fork_3=Wenn alle Forks erhalten bleiben sollen, dann muss zuerst die Sichtbarkeit der Repository auf öffentlich gesetzt werden.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=Repository-Optionen aktualisiert.
 settings.transfer_owner=Neuer Besitzer
 settings.make_transfer=übertragen
@@ -590,6 +598,9 @@ settings.hooks_desc=Webhooks erlauben es dir, externe Dienste zu informieren, we
 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=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Anfrage
 settings.webhook.response=Rückmeldung
 settings.webhook.headers=Kopfzeilen
@@ -879,6 +890,8 @@ auths.bind_password=Passwort binden
 auths.bind_password_helper=Warnung: Das Passwort wird im Klartext gespeichert. Benutze keinen Account mit hohen Zugriffsrechten.
 auths.user_base=Benutzer-Such-Basis
 auths.user_dn=Benutzer DN
+auths.attribute_username=Attribute des Benutzernamens
+auths.attribute_username_placeholder=Leer lassen, um den Wert aus dem Login-Formular als Benutzername zu verwenden.
 auths.attribute_name=Vorname Attribut
 auths.attribute_surname=Nachname Attribut
 auths.attribute_mail=E-Mail Attribut
@@ -982,11 +995,18 @@ monitor.start=Startzeit
 monitor.execute_time=Ausführungszeit
 
 notices.system_notice_list=System-Mitteilungen
+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.type=Typ
 notices.type_1=Repository
 notices.desc=Beschreibung
 notices.op=Op.
-notices.delete_success=System-Mitteilung erfolgreich gelöscht.
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=hat Repository <a href="%s">%s</a> erstellt
diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini
index bbba7dccc2..3ba3fb79ce 100755
--- a/conf/locale/locale_es-ES.ini
+++ b/conf/locale/locale_es-ES.ini
@@ -192,7 +192,7 @@ min_size_error=` debe contener al menos %s caracteres.`
 max_size_error=` debe contener como máximo %s caracteres.`
 email_error=` no es una dirección de correo válida.`
 url_error=` no es una URL válida.`
-include_error='debe contener la subcadena '%s'.'
+include_error=` debe contener la subcadena '%s'.`
 unknown_error=Error desconocido:
 captcha_incorrect=El captcha no es válido.
 password_not_match=La contraseña de confirmación no coincide.
@@ -388,7 +388,7 @@ create_new_repo_command=Crear un nuevo repositorio desde línea de comandos
 push_exist_repo=Hacer Push de un repositorio existente desde línea de comandos
 repo_is_empty=Este repositorio está vacío, por favor, ¡vuelva más tarde!
 
-code=Code
+code=Código
 branch=Rama
 tree=Árbol
 filter_branch_and_tag=Filtrar por rama o etiqueta
@@ -537,20 +537,20 @@ milestones.deletion_desc=El borrado de este milestone eliminará su información
 milestones.deletion_success=¡El milestone ha sido eliminado con éxito!
 
 wiki=Wiki
-wiki.welcome=Welcome to Wiki!
-wiki.welcome_desc=Wiki is the place where you would like to document your project together and make it better.
-wiki.create_first_page=Create the first page
-wiki.page=Page
-wiki.filter_page=Filter page
-wiki.new_page=Create New Page
-wiki.default_commit_message=Write a note about this update (optional).
-wiki.save_page=Save Page
-wiki.last_commit_info=%s edited this page %s
-wiki.edit_page_button=Edit
-wiki.new_page_button=New Page
-wiki.page_already_exists=Wiki page with same name already exists.
-wiki.pages=Pages
-wiki.last_updated=Last updated %s
+wiki.welcome=¡Bienvenido a la Wiki!
+wiki.welcome_desc=La Wiki es el lugar donde os gustaría documentar juntos vuestro proyecto y hacerlo mejor.
+wiki.create_first_page=Crear la primera página
+wiki.page=Página
+wiki.filter_page=Filtrar página
+wiki.new_page=Crear nueva página
+wiki.default_commit_message=Escribe una nota sobre esta actualización (opcional).
+wiki.save_page=Guardar página
+wiki.last_commit_info=%s editó esta página %s
+wiki.edit_page_button=Editar
+wiki.new_page_button=Nueva página
+wiki.page_already_exists=Ya existe una página con el mismo nombre.
+wiki.pages=Páginas
+wiki.last_updated=Última actualización %s
 
 settings=Configuración
 settings.options=Opciones
@@ -558,10 +558,17 @@ settings.collaboration=Colaboración
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Configuración Básica
-settings.danger_zone=Zona de Peligro
 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
+settings.wiki_desc=Habilitar a las personas en la Wiki a que puedan escribir documentos
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=Zona de Peligro
 settings.transfer=Transferir la Propiedad
 settings.transfer_desc=Transferir este repositorio a otro usuario u organización donde tengas permisos de administración.
 settings.new_owner_has_same_repo=El nuevo propietario tiene un repositorio con el mismo nombre.
@@ -575,6 +582,7 @@ settings.delete_notices_2=- Esta operación eliminará de manera permanente todo
 settings.delete_notices_fork_1=- Si este repositorio es público, todos los forks se convertirán en repositorios independientes tras el borrado.
 settings.delete_notices_fork_2=- Si este repositorio es privado, todos los forks serán eliminados simultáneamente.
 settings.delete_notices_fork_3=- Si desea mantener los forks tras el borrado, por favor convierta este repositorio en público antes de proceder.
+settings.deletion_success=¡El respositorio ha sido eliminado satisfactoriamente!
 settings.update_settings_success=Las opciones del repositorio se han actualizado correctamente.
 settings.transfer_owner=Nuevo Propietario
 settings.make_transfer=Transferir
@@ -590,6 +598,9 @@ settings.hooks_desc=Los Webhooks permiten a servicios externos recibir notificac
 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!
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Petición
 settings.webhook.response=Respuesta
 settings.webhook.headers=Encabezado
@@ -879,6 +890,8 @@ 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
 auths.user_dn=DN de Usuario
+auths.attribute_username=Username attribute
+auths.attribute_username_placeholder=Dejar vacío para usar el campo de inicio de sesión como nombre de usuario.
 auths.attribute_name=Atributo nombre
 auths.attribute_surname=Atributo apellido
 auths.attribute_mail=Atributo correo electrónico
@@ -982,11 +995,18 @@ monitor.start=Hora de Inicio
 monitor.execute_time=Tiempo de ejecución
 
 notices.system_notice_list=Notificaciones del Sistema
+notices.view_detail_header=Ver detalles de la notificación
+notices.actions=Acciones
+notices.select_all=Sleccionar todo
+notices.deselect_all=Deseleccionar todo
+notices.inverse_selection=Selección inversa
+notices.delete_selected=Eliminar seleccionado
+notices.delete_all=Eliminar todas las notificaciones
 notices.type=Tipo
 notices.type_1=Repositorio
 notices.desc=Descripción
 notices.op=Op.
-notices.delete_success=La notificación del sistema se ha eliminado correctamente.
+notices.delete_success=Las notificaciones del sistema han sido eliminadas satisfactoriamente.
 
 [action]
 create_repo=repositorio creado <a href="%s">%s</a>
diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini
index 4828846ddf..01275bccaf 100755
--- a/conf/locale/locale_fr-FR.ini
+++ b/conf/locale/locale_fr-FR.ini
@@ -405,8 +405,8 @@ file_history=Historique
 file_view_raw=Voir le Raw
 file_permalink=Lien permanent
 
-commits.commits=Commissions
-commits.search=Rechercher des commissions
+commits.commits=Commits
+commits.search=Rechercher des commits
 commits.find=Trouver
 commits.author=Auteur
 commits.message=Message
@@ -558,10 +558,17 @@ settings.collaboration=Collaboration
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Paramètres de base
-settings.danger_zone=Zone de danger
 settings.site=Site officiel
 settings.update_settings=Valider
 settings.change_reponame_prompt=Ce changement affectera comment les liens sont reliés avec le dépôt.
+settings.advanced_settings=Paramètres Avancés
+settings.wiki_desc=Activer le wiki pour permettre l'écriture de documents
+settings.issues_desc=Activer le bug-tracker léger intégré
+settings.use_external_issue_tracker=Utiliser un bug-tracker externe
+settings.tracker_url_format=Format d'URL du bug tracker
+settings.tracker_url_format_desc=Vous pouvez utiliser l'espace réservé <code>{user} {repo} {index}</code> pour le nom d'utilisateur, le nom du dépôt et le numéro de bug.
+settings.pulls_desc=Activer les pull requests pour accepter les contributions publiques
+settings.danger_zone=Zone de danger
 settings.transfer=Transférer les propriétés
 settings.transfer_desc=Transfèrer ce dépôt à un autre utilisateur ou une organisation dont vous possédez des droits d'administrateur.
 settings.new_owner_has_same_repo=Le nouveau propriétaire a déjà un dépôt nommé ainsi.
@@ -575,6 +582,7 @@ settings.delete_notices_2=-Cette opération supprimera définitivement le dépô
 settings.delete_notices_fork_1=-Si ce dépôt est public, tous les embranchements vont devenir indépendants après la suppression.
 settings.delete_notices_fork_2=-Si ce dépôt est privé, tous les embranchements seront supprimés en même temps.
 settings.delete_notices_fork_3=-Si vous souhaitez conserver tous les embranchements après suppression, veuillez tout d'abord modifier la visibilité de ce dépôt en public.
+settings.deletion_success=Le dépôt a été supprimé avec succès!
 settings.update_settings_success=Options mises à jour avec succès.
 settings.transfer_owner=Nouveau propriétaire
 settings.make_transfer=Transférer
@@ -590,6 +598,9 @@ settings.hooks_desc=Les Webhooks sont des déclencheurs de POST HTTP . Lorsque q
 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 !
+settings.webhook.test_delivery=Tester la publication
+settings.webhook.test_delivery_desc=Envoyer un faux push pour tester la configuration des webhooks
+settings.webhook.test_delivery_success=Le webhook de test a été ajouté à la file d'attente de livraison. L'affichage dans l'historique de livraison peut prendre quelques secondes.
 settings.webhook.request=Requête
 settings.webhook.response=Réponse
 settings.webhook.headers=Entêtes 
@@ -642,7 +653,7 @@ settings.deploy_key_deletion_success=La clé de déploiement a été supprimée
 
 diff.browse_source=Parcourir la Source
 diff.parent=Parent
-diff.commit=Commettre
+diff.commit=commit
 diff.data_not_available=Données Diff indisponibles.
 diff.show_diff_stats=Afficher les stats Diff
 diff.stats_desc=<strong> %d fichiers modifiés</strong> avec <strong>%d ajouts</strong> et <strong>%d suppressions</strong>
@@ -655,7 +666,7 @@ release.draft=Brouillon
 release.prerelease=Pré-publication
 release.stable=Stable
 release.edit=Éditer
-release.ahead=<strong>%d</strong> commissions à %s depuis cette publication
+release.ahead=<strong>%d</strong> commits jusqu'à %s depuis cette publication
 release.source_code=Code Source
 release.new_subheader=Publier une version pour itérer sur le produit.
 release.edit_subheader=Un changelog détaillé peut aider les utilisateurs à comprendre ce qui a été amélioré.
@@ -879,6 +890,8 @@ 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=Attribut du prénom
 auths.attribute_surname=Attribut du nom de famille
 auths.attribute_mail=Attribut de l'e-mail
@@ -982,11 +995,18 @@ monitor.start=Heure de Démarrage
 monitor.execute_time=Heure d'Éxécution
 
 notices.system_notice_list=Notes Systèmes
+notices.view_detail_header=Voir les détails de la notification
+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_all=Supprimer toutes les notifications
 notices.type=Type
 notices.type_1=Dépôt
 notices.desc=Description
 notices.op=Opération
-notices.delete_success=Note système supprimée avec succès.
+notices.delete_success=Notifications système supprimées avec succès.
 
 [action]
 create_repo=a crée le dépôt <a href="%s">%s</a>
@@ -998,7 +1018,7 @@ comment_issue=`a commenté le problème <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`pull request fusionné le <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=a transféré le dépôt <code>%s</code> à <a href="%s">%s</a>
 push_tag=a soumis le tag <a href="%s/src/%s">%[2]s</a> à <a href="%[1]s">%[3]s</a>
-compare_2_commits=Comparer ces 2 commissions
+compare_2_commits=Comparer ces 2 commits
 
 [tool]
 ago=auparavant
diff --git a/conf/locale/locale_it-IT.ini b/conf/locale/locale_it-IT.ini
index 6d5b668528..f3a70902a5 100755
--- a/conf/locale/locale_it-IT.ini
+++ b/conf/locale/locale_it-IT.ini
@@ -528,12 +528,12 @@ milestones.clear=Clear
 milestones.invalid_due_date_format=Due date format is invalid, must be 'yyyy-mm-dd'.
 milestones.create_success=Milestone '%s' has been created successfully!
 milestones.edit=Edit Milestone
-milestones.edit_subheader=Use better description for milestones so people won't be confused.
+milestones.edit_subheader=Use a better description for milestones so people won't be confused.
 milestones.cancel=Cancel
 milestones.modify=Modify Milestone
 milestones.edit_success=Changes of milestone '%s' has been saved successfully!
 milestones.deletion=Milestone Deletion
-milestones.deletion_desc=Delete this milestone will remove its information in all related issues. Do you want to continue?
+milestones.deletion_desc=Deleting this milestone will remove its information in all related issues. Do you want to continue?
 milestones.deletion_success=Milestone has been deleted successfully!
 
 wiki=Wiki
@@ -558,10 +558,17 @@ settings.collaboration=Collaborazione
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Impostazioni di Base
-settings.danger_zone=Zona Pericolosa
 settings.site=Sito Ufficiale
 settings.update_settings=Aggiorna Impostazioni
 settings.change_reponame_prompt=This change will affect how links relate to the repository.
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=Zona Pericolosa
 settings.transfer=Trasferisci proprietà
 settings.transfer_desc=Trasferisci questa repository a un altro utente o a un'organizzazione nella quale hai diritti d'amministratore.
 settings.new_owner_has_same_repo=Il nuovo proprietario ha già un repository con lo stesso nome. Per favore scegli un altro nome.
@@ -575,6 +582,7 @@ settings.delete_notices_2=- This operation will permanently delete the everythin
 settings.delete_notices_fork_1=- If this repository is public, all forks will be became independent after deletion.
 settings.delete_notices_fork_2=- If this repository is private, all forks will be removed at the same time.
 settings.delete_notices_fork_3=- If you want to keep all forks after deletion, please change visibility of this repository to public first.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=Le opzioni repository sono state aggiornate con successo.
 settings.transfer_owner=Nuovo Proprietario
 settings.make_transfer=Trasferisci
@@ -590,6 +598,9 @@ settings.hooks_desc=I Webhooks sono molto simili a un basilare evento trigger HT
 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!
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Request
 settings.webhook.response=Response
 settings.webhook.headers=Headers
@@ -634,10 +645,10 @@ settings.no_deploy_keys=You haven't added any deploy key.
 settings.title=Title
 settings.deploy_key_content=Content
 settings.key_been_used=Deploy key content has been used.
-settings.key_name_used=Deploy key with same name has already existed.
+settings.key_name_used=Deploy key with the same name already exists.
 settings.add_key_success=New deploy key '%s' has been added successfully!
 settings.deploy_key_deletion=Delete Deploy Key
-settings.deploy_key_deletion_desc=Delete this deploy key will remove all related accesses for this repository. Do you want to continue?
+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!
 
 diff.browse_source=Sfoglia il codice sorgente
@@ -675,7 +686,7 @@ release.save_draft=Salva Bozza
 release.edit_release=Modifica Rilascio
 release.delete_release=Delete This Release
 release.deletion=Release Deletion
-release.deletion_desc=Delete this release will delete corresponding Git tag. Do you want to continue?
+release.deletion_desc=Deleting this release will delete the corresponding Git tag. Do you want to continue?
 release.deletion_success=Release has been deleted successfully!
 release.tag_name_already_exist=Un rilascio con questo tag esiste già.
 release.downloads=Downloads
@@ -879,6 +890,8 @@ auths.bind_password=Bind Password
 auths.bind_password_helper=Warning: This password is stored in plain text. Do not use a high privileged account.
 auths.user_base=User Search Base
 auths.user_dn=User DN
+auths.attribute_username=Username attribute
+auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
 auths.attribute_name=Attributo Nome
 auths.attribute_surname=Attributo Cognome
 auths.attribute_mail=Attributo Email
@@ -982,11 +995,18 @@ monitor.start=Orario Avvio
 monitor.execute_time=Tempo di Esecuzione
 
 notices.system_notice_list=Avvisi di Sistema
+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.type=Tipo
 notices.type_1=Repository
 notices.desc=Descrizione
 notices.op=Op.
-notices.delete_success=Avviso di sistema cancellato con successo.
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=ha creato il repository <a href="%s">%s</a>
diff --git a/conf/locale/locale_ja-JP.ini b/conf/locale/locale_ja-JP.ini
index b74661cc6d..16b963aba0 100755
--- a/conf/locale/locale_ja-JP.ini
+++ b/conf/locale/locale_ja-JP.ini
@@ -537,20 +537,20 @@ milestones.deletion_desc=このマイルス トーンを削除すると、関連
 milestones.deletion_success=マイルス トーンは正常に削除されました。
 
 wiki=Wiki
-wiki.welcome=Welcome to Wiki!
+wiki.welcome=Wiki へようこそ！
 wiki.welcome_desc=Wiki is the place where you would like to document your project together and make it better.
-wiki.create_first_page=Create the first page
-wiki.page=Page
+wiki.create_first_page=最初のページを作成する。
+wiki.page=ページ
 wiki.filter_page=Filter page
-wiki.new_page=Create New Page
-wiki.default_commit_message=Write a note about this update (optional).
-wiki.save_page=Save Page
-wiki.last_commit_info=%s edited this page %s
-wiki.edit_page_button=Edit
-wiki.new_page_button=New Page
-wiki.page_already_exists=Wiki page with same name already exists.
-wiki.pages=Pages
-wiki.last_updated=Last updated %s
+wiki.new_page=新しいページを作成
+wiki.default_commit_message=このアップデートについてメモを書く(オプション)
+wiki.save_page=ページを保存
+wiki.last_commit_info=%s このページを編集 %s
+wiki.edit_page_button=編集
+wiki.new_page_button=新規ページ
+wiki.page_already_exists=既に同じ名前のWiki ページが存在します。
+wiki.pages=ページ
+wiki.last_updated=最終更新 %s
 
 settings=設定
 settings.options=オプション
@@ -558,10 +558,17 @@ settings.collaboration=コラボレーション
 settings.hooks=Webhooks
 settings.githooks=Git のフック
 settings.basic_settings=基本設定
-settings.danger_zone=危険地帯
 settings.site=公式サイト
 settings.update_settings=設定の更新
 settings.change_reponame_prompt=この変更はリンクがリポジトリに関連付ける方法に影響します。
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=危険地帯
 settings.transfer=オーナー移転
 settings.transfer_desc=リポジトリをあなたが管理者権限を持っている別のユーザーまた組織に移譲します。
 settings.new_owner_has_same_repo=新しいオーナーは、既に同じ名前のリポジトリを持っています。
@@ -575,6 +582,7 @@ settings.delete_notices_2=- This operation will permanently delete the everythin
 settings.delete_notices_fork_1=- If this repository is public, all forks will be became independent after deletion.
 settings.delete_notices_fork_2=- If this repository is private, all forks will be removed at the same time.
 settings.delete_notices_fork_3=- If you want to keep all forks after deletion, please change visibility of this repository to public first.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=リポジトリ オプションが更新されました。
 settings.transfer_owner=新しいオーナー
 settings.make_transfer=転送
@@ -590,6 +598,9 @@ settings.hooks_desc=Webhooksは、Gogsで特定のイベントの発生時に指
 settings.webhook_deletion=Webhook を削除
 settings.webhook_deletion_desc=このwebhookを削除すると、すべての情報と配信履歴が削除されます。続行しますか？
 settings.webhook_deletion_success=Webhook が正常に削除されました。
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=リクエスト
 settings.webhook.response=レスポンス
 settings.webhook.headers=ヘッダ
@@ -675,7 +686,7 @@ release.save_draft=下書きを保存
 release.edit_release=リリースを編集
 release.delete_release=このリリースを削除
 release.deletion=リリースの削除
-release.deletion_desc=Delete this release will delete corresponding Git tag. Do you want to continue?
+release.deletion_desc=Deleting this release will delete the corresponding Git tag. Do you want to continue?
 release.deletion_success=リリースが正常に削除されました。
 release.tag_name_already_exist=このタグ名には既にリリースが存在します。
 release.downloads=Downloads
@@ -879,6 +890,8 @@ auths.bind_password=バインド パスワード
 auths.bind_password_helper=警告: このパスワードは暗号化されずに格納されます。特権を持つアカウントに使用しないでください。
 auths.user_base=ユーザ検索ベース
 auths.user_dn=User DN
+auths.attribute_username=Username attribute
+auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
 auths.attribute_name=名前属性
 auths.attribute_surname=名字属性
 auths.attribute_mail=Eメール属性
@@ -982,11 +995,18 @@ monitor.start=開始日時
 monitor.execute_time=実行時間:
 
 notices.system_notice_list=システム通知
+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.type=タイプ
 notices.type_1=リポジトリ
 notices.desc=説明
 notices.op=Op。
-notices.delete_success=システム通知が正常に削除されました。
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=リポジトリ <a href="%s"> %s</a>を作成しました
diff --git a/conf/locale/locale_lv-LV.ini b/conf/locale/locale_lv-LV.ini
index 6725a66ab1..5771f0f794 100755
--- a/conf/locale/locale_lv-LV.ini
+++ b/conf/locale/locale_lv-LV.ini
@@ -536,21 +536,21 @@ milestones.deletion=Atskaites punkta dzēšana
 milestones.deletion_desc=Dzēšot šo atskaites punktu tiks noņemta arī saistītā informācija no problēmu ziņojumiem. Vai vēlaties turpināt?
 milestones.deletion_success=Atskaites punkts tika veiksmīgi izdzēsts!
 
-wiki=Wiki
-wiki.welcome=Welcome to Wiki!
-wiki.welcome_desc=Wiki is the place where you would like to document your project together and make it better.
-wiki.create_first_page=Create the first page
-wiki.page=Page
-wiki.filter_page=Filter page
-wiki.new_page=Create New Page
-wiki.default_commit_message=Write a note about this update (optional).
-wiki.save_page=Save Page
-wiki.last_commit_info=%s edited this page %s
-wiki.edit_page_button=Edit
-wiki.new_page_button=New Page
-wiki.page_already_exists=Wiki page with same name already exists.
-wiki.pages=Pages
-wiki.last_updated=Last updated %s
+wiki=Vikivietne
+wiki.welcome=Laipni lūgti vikivietnē!
+wiki.welcome_desc=Vikivietne ir vieta, kur Jūs varat dokumentēt savu projektu, lai padarīto to labāku.
+wiki.create_first_page=Izveidot pirmo lapu
+wiki.page=Lapa
+wiki.filter_page=Meklēt lapu
+wiki.new_page=Izveidot jaunu lapu
+wiki.default_commit_message=Uzrakstiet piezīmes par šīm izmaiņām (neobligāti).
+wiki.save_page=Saglabāt lapu
+wiki.last_commit_info=%s laboja lapu %s
+wiki.edit_page_button=Labot
+wiki.new_page_button=Jauna lapa
+wiki.page_already_exists=Vikivietnes lapa ar šādu nosaukumu jau eksistē.
+wiki.pages=Lapas
+wiki.last_updated=Pēdējo reizi labota %s
 
 settings=Iestatījumi
 settings.options=Opcijas
@@ -558,10 +558,17 @@ settings.collaboration=Sadarbība
 settings.hooks=Tīmekļa āķi
 settings.githooks=Git āķi
 settings.basic_settings=Pamatiestatījumi
-settings.danger_zone=Bīstamā zona
 settings.site=Oficiālā mājas lapa
 settings.update_settings=Mainīt iestatījumus
 settings.change_reponame_prompt=Šī izmaiņa ietekmēs saites, kas ir saistītas ar šo repozitoriju.
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=Bīstamā zona
 settings.transfer=Mainīt īpašnieku
 settings.transfer_desc=Mainīt šī repozitorija īpašnieku uz citu lietotāju vai organizāciju, kurai Jums ir administratora tiesībs.
 settings.new_owner_has_same_repo=Jaunajam īpašniekam jau ir repozitorijs ar šādu nosaukumu.
@@ -575,6 +582,7 @@ settings.delete_notices_2=- Šī darbība neatgriezeniski izdzēsīs visus šī
 settings.delete_notices_fork_1=- Ja repozitorijs ir publisks, visi atdalītie repozitoriji kļūs neatkarīgi.
 settings.delete_notices_fork_2=- Ja repozitorijs ir privāts, tiks dzēsti arī visi atdalītie repozitoriji.
 settings.delete_notices_fork_3=- Ja vēlaties saglabāt atdalīts repozitorijus pēc dzēšanas, sākumā nomainiet repozitorija redzamību uz publisku.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=Repozitorija opcijas ir veiksmīgi saglabātas.
 settings.transfer_owner=Jaunais īpašnieks
 settings.make_transfer=Mainīt
@@ -590,6 +598,9 @@ settings.hooks_desc=Tīmekļa āķi ļauj paziņot ārējiem servisiem par notei
 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!
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Pieprasījums
 settings.webhook.response=Atbilde
 settings.webhook.headers=Galvenes
@@ -629,7 +640,7 @@ settings.slack_domain=Domēns
 settings.slack_channel=Kanāls
 settings.deploy_keys=Izvietot atslēgas
 settings.add_deploy_key=Pievienot izvietošanas atslēgu
-settings.deploy_key_desc=Deploy key only has read-only access. It is not same as personal account SSH keys.
+settings.deploy_key_desc=Izvietošanas atslēgai ir tikai lasīšanas piekļuve. Tā nav tā pati kā Jūsu personīgā konta SSH atslēga.
 settings.no_deploy_keys=Nav pievienota neviena izvietošanas atslēga.
 settings.title=Virsraksts
 settings.deploy_key_content=Saturs
@@ -879,6 +890,8 @@ auths.bind_password=Saistīšanas parole
 auths.bind_password_helper=Brīdinājums: Šī parole tiks saglabāta nešifrētā veidā. Neizmantojiet kontu ar augstām privilēģijām.
 auths.user_base=Lietotāja pamatnosacījumi
 auths.user_dn=Lietotāja DN
+auths.attribute_username=Lietotājvārda atribūts
+auths.attribute_username_placeholder=Atstājiet tukšu, lai izmantotu lietotājvārdu ar kuru autorizējaties.
 auths.attribute_name=Vārda atribūts
 auths.attribute_surname=Uzvārda atribūts
 auths.attribute_mail=E-pasta atribūts
@@ -982,11 +995,18 @@ monitor.start=Sākuma laiks
 monitor.execute_time=Izpildes laiks
 
 notices.system_notice_list=Sistēmas paziņojumi
+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.type=Veids
 notices.type_1=Repozitorijs
 notices.desc=Apraksts
 notices.op=Op.
-notices.delete_success=Sistēmas paziņojums tika veiksmīgi izdzēsts.
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=izveidoja repozitoriju <a href="%s">%s</a>
diff --git a/conf/locale/locale_nl-NL.ini b/conf/locale/locale_nl-NL.ini
index 71c93ed498..1301d3ff63 100755
--- a/conf/locale/locale_nl-NL.ini
+++ b/conf/locale/locale_nl-NL.ini
@@ -111,7 +111,7 @@ admin_title=Instellingen beheerdersaccount
 admin_name=Gebruikersnaam
 admin_password=Wachtwoord
 confirm_password=Verifieer wachtwoord
-admin_email=Admin E-mail
+admin_email=Admin Email
 install_gogs=Installeer Gogs
 test_git_failed=Git test niet gelukt: 'git' commando %v
 sqlite3_not_available=Uw versie biedt geen ondersteuning voor SQLite3, download de officiële binaire versie van %s, niet de gobuild versie.
@@ -161,9 +161,9 @@ password_too_short=De lengte van uw wachtwoord moet minimaal zes karakters zijn.
 
 [mail]
 activate_account=Please activate your account
-activate_email=Verify your e-mail address
+activate_email=Verify your email address
 reset_password=Reset your password
-register_success=Register success, Welcome
+register_success=Registration successful, welcome
 register_notify=Welcome on board
 
 [modal]
@@ -278,9 +278,9 @@ email_desc=Uw primaire e-mailadres zal worden gebruikt voor meldingen en andere
 primary=Primair
 primary_email=Instellen als primair
 delete_email=Verwijder
-email_deletion=E-mail Deletion
-email_deletion_desc=Delete this e-mail address will remove related information from your account. Do you want to continue?
-email_deletion_success=E-mail has been deleted successfully!
+email_deletion=Email Deletion
+email_deletion_desc=Deleting this email address will remove related information from your account. Do you want to continue?
+email_deletion_success=Email has been deleted successfully!
 add_new_email=Nieuw e-mailadres toevoegen
 add_email=E-mailadres toevoegen
 add_email_confirmation_sent=Een nieuwe bevestiging e-mail werd verstuurd naar '%s', gelieve uw inbox in de komende %d uren te controleren om het bevestigingsproces te voltooien.
@@ -558,10 +558,17 @@ settings.collaboration=Samenwerking
 settings.hooks=Webhooks
 settings.githooks=Git haken
 settings.basic_settings=Basis instellingen
-settings.danger_zone=Gevaren zone
 settings.site=Officiële site
 settings.update_settings=Instellingen bewerken
 settings.change_reponame_prompt=This change will affect how links relate to the repository.
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=Gevaren zone
 settings.transfer=Eigendom overdragen
 settings.transfer_desc=Draag deze repo over aan een andere gebruiker of een organisatie waar u beheerders rechten heeft.
 settings.new_owner_has_same_repo=De nieuwe eigenaar heeft al een repositorie met deze naam
@@ -575,6 +582,7 @@ settings.delete_notices_2=- This operation will permanently delete the everythin
 settings.delete_notices_fork_1=- If this repository is public, all forks will be became independent after deletion.
 settings.delete_notices_fork_2=- If this repository is private, all forks will be removed at the same time.
 settings.delete_notices_fork_3=- If you want to keep all forks after deletion, please change visibility of this repository to public first.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=Repositorie instellingen zijn succesvol bijgewerkt.
 settings.transfer_owner=Nieuwe eigenaar
 settings.make_transfer=Maak overdracht
@@ -590,6 +598,9 @@ settings.hooks_desc=Webhooks dat de externe diensten om kennisgevingen te ontvan
 settings.webhook_deletion=Webhook verwijderen
 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!
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Verzoek
 settings.webhook.response=Antwoord
 settings.webhook.headers=Headers
@@ -675,7 +686,7 @@ release.save_draft=Concept opslaan
 release.edit_release=Release bewerken
 release.delete_release=Delete This Release
 release.deletion=Release Deletion
-release.deletion_desc=Delete this release will delete corresponding Git tag. Do you want to continue?
+release.deletion_desc=Deleting this release will delete the corresponding Git tag. Do you want to continue?
 release.deletion_success=Release has been deleted successfully!
 release.tag_name_already_exist=Versie met deze naam bestaat al.
 release.downloads=Downloads
@@ -879,6 +890,8 @@ auths.bind_password=Bind Password
 auths.bind_password_helper=Warning: This password is stored in plain text. Do not use a high privileged account.
 auths.user_base=User Search Base
 auths.user_dn=User DN
+auths.attribute_username=Username attribute
+auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
 auths.attribute_name=Voornaam attribuut
 auths.attribute_surname=Achternaam attribuut
 auths.attribute_mail=E-mail attribuut
@@ -982,11 +995,18 @@ monitor.start=Starttijd
 monitor.execute_time=Uitvoertijd
 
 notices.system_notice_list=Systeem aankondigingen
+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.type=Type
 notices.type_1=Opslagplaats
 notices.desc=Beschrijving
 notices.op=Op.
-notices.delete_success=Systeem bericht is met succes verwijderd.
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=repositorie aangemaakt in <a href="%s">%s</a>
diff --git a/conf/locale/locale_pl-PL.ini b/conf/locale/locale_pl-PL.ini
index 08b306da4a..6d1fc8848f 100755
--- a/conf/locale/locale_pl-PL.ini
+++ b/conf/locale/locale_pl-PL.ini
@@ -111,7 +111,7 @@ admin_title=Ustawienia konta administratora
 admin_name=Nazwa Użytkownika
 admin_password=Hasło
 confirm_password=Potwierdź hasło
-admin_email=Admin E-mail
+admin_email=Admin Email
 install_gogs=Zainstaluj Gogs
 test_git_failed=Nie udało się przetestować polecenia "git": %v
 sqlite3_not_available=Twoje wydanie nie obsługuje SQLite3, proszę pobrać oficjalne wydanie z %s, a NIE wersję z gobuild.
@@ -279,7 +279,7 @@ primary=Podstawowy
 primary_email=Ustaw jako podstawowy
 delete_email=Usuń
 email_deletion=Usunięcie wiadomości e-mail
-email_deletion_desc=Delete this e-mail address will remove related information from your account. Do you want to continue?
+email_deletion_desc=Deleting this email address will remove related information from your account. Do you want to continue?
 email_deletion_success=E-mail został usunięty pomyślnie!
 add_new_email=Dodaj nowy e-mail
 add_email=Dodaj e-mail
@@ -370,7 +370,7 @@ migrate.invalid_local_path=Ścieżka jest niepoprawna. Nie istnieje lub nie jest
 migrate.failed=Migration failed: %v
 
 forked_from=sklonowany z
-fork_from_self=You cannot fork repository you already owned!
+fork_from_self=You cannot fork a repository you already own!
 copy_link=Kopiuj
 copy_link_success=Skopiowane!
 copy_link_error=Naciśnij klawisze ⌘-C i Ctrl-C, aby skopiować
@@ -388,7 +388,7 @@ create_new_repo_command=Utwórz nowe repozytorium z wiersza poleceń
 push_exist_repo=Wyślij istniejące repozytorium z wiersza poleceń
 repo_is_empty=To repozytorium jest puste, proszę wrócić później!
 
-code=Kod
+code=Code
 branch=Gałąź
 tree=Drzewo
 filter_branch_and_tag=Filter branch or tag
@@ -483,7 +483,7 @@ issues.label_edit=Edytuj
 issues.label_delete=Usuń
 issues.label_modify=Modyfikacja etykiety
 issues.label_deletion=Usunięcie etykiety
-issues.label_deletion_desc=Delete this label will remove its information in all related issues. Do you want to continue?
+issues.label_deletion_desc=Deleting this label will remove its information in all related issues. Do you want to continue?
 issues.label_deletion_success=Etykieta została usunięta pomyślnie!
 
 pulls.new=New Pull Request
@@ -528,12 +528,12 @@ milestones.clear=Wyczyść
 milestones.invalid_due_date_format=Format daty realizacji jest nieprawidłowy, musi być "rrrr-mm-dd".
 milestones.create_success=Kamień milowy "%s" został utworzony pomyślnie!
 milestones.edit=Edytuj kamień milowy
-milestones.edit_subheader=Use better description for milestones so people won't be confused.
+milestones.edit_subheader=Use a better description for milestones so people won't be confused.
 milestones.cancel=Anuluj
 milestones.modify=Modyfikuj kamień milowy
 milestones.edit_success=Changes of milestone '%s' has been saved successfully!
 milestones.deletion=Milestone Deletion
-milestones.deletion_desc=Delete this milestone will remove its information in all related issues. Do you want to continue?
+milestones.deletion_desc=Deleting this milestone will remove its information in all related issues. Do you want to continue?
 milestones.deletion_success=Kamień milowy został usunięty pomyślnie!
 
 wiki=Wiki
@@ -558,10 +558,17 @@ settings.collaboration=Współpraca
 settings.hooks=Webhooks
 settings.githooks=Skrypty Git
 settings.basic_settings=Ustawienia podstawowe
-settings.danger_zone=Strefa niebezpieczeństwa
 settings.site=Oficjalna Strona
 settings.update_settings=Aktualizuj ustawienia
 settings.change_reponame_prompt=Zmiana nazwy repozytorium wpłynie na linki do niego.
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=Strefa niebezpieczeństwa
 settings.transfer=Przeniesienie własności
 settings.transfer_desc=Przenieś to repozytorium do innego użytkownika lub organizacji gdzie masz uprawnienia administratora.
 settings.new_owner_has_same_repo=Nowy właściciel już posiada repozytorium o tej samej nazwie.
@@ -575,6 +582,7 @@ settings.delete_notices_2=- This operation will permanently delete the everythin
 settings.delete_notices_fork_1=- If this repository is public, all forks will be became independent after deletion.
 settings.delete_notices_fork_2=- If this repository is private, all forks will be removed at the same time.
 settings.delete_notices_fork_3=- If you want to keep all forks after deletion, please change visibility of this repository to public first.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=Opcje repozytorium zostały pomyślnie zaktualizowane.
 settings.transfer_owner=Nowy właściciel
 settings.make_transfer=Przenieś
@@ -590,6 +598,9 @@ settings.hooks_desc=Webhooks are much like basic HTTP POST event triggers. Whene
 settings.webhook_deletion=Usuń 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!
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Żądanie
 settings.webhook.response=Response
 settings.webhook.headers=Headers
@@ -634,10 +645,10 @@ settings.no_deploy_keys=You haven't added any deploy key.
 settings.title=Tytuł
 settings.deploy_key_content=Treść
 settings.key_been_used=Deploy key content has been used.
-settings.key_name_used=Deploy key with same name has already existed.
+settings.key_name_used=Deploy key with the same name already exists.
 settings.add_key_success=New deploy key '%s' has been added successfully!
 settings.deploy_key_deletion=Delete Deploy Key
-settings.deploy_key_deletion_desc=Delete this deploy key will remove all related accesses for this repository. Do you want to continue?
+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!
 
 diff.browse_source=Przeglądaj źródła
@@ -675,7 +686,7 @@ release.save_draft=Zapisz szkic
 release.edit_release=Edytuj wydanie
 release.delete_release=Delete This Release
 release.deletion=Release Deletion
-release.deletion_desc=Delete this release will delete corresponding Git tag. Do you want to continue?
+release.deletion_desc=Deleting this release will delete the corresponding Git tag. Do you want to continue?
 release.deletion_success=Release has been deleted successfully!
 release.tag_name_already_exist=Wersja o tej nazwie tagu już istnieje.
 release.downloads=Downloads
@@ -879,6 +890,8 @@ auths.bind_password=Bind Password
 auths.bind_password_helper=Warning: This password is stored in plain text. Do not use a high privileged account.
 auths.user_base=User Search Base
 auths.user_dn=User DN
+auths.attribute_username=Username attribute
+auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
 auths.attribute_name=Atrybut imienia
 auths.attribute_surname=Atrybut nazwiska
 auths.attribute_mail=Atrybut email
@@ -982,11 +995,18 @@ monitor.start=Czas rozpoczęcia
 monitor.execute_time=Czas wykonania
 
 notices.system_notice_list=Powiadomienia systemu
+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.type=Typ
 notices.type_1=Repozytorium
 notices.desc=Opis
 notices.op=Op.
-notices.delete_success=Powiadomienia systemowe zostały usunięte pomyślnie.
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=utworzono repozytorium <a href="%s"> %s</a>
diff --git a/conf/locale/locale_pt-BR.ini b/conf/locale/locale_pt-BR.ini
index 61d50e6eaa..39f5141ce8 100755
--- a/conf/locale/locale_pt-BR.ini
+++ b/conf/locale/locale_pt-BR.ini
@@ -558,10 +558,17 @@ settings.collaboration=Colaboração
 settings.hooks=Webhooks
 settings.githooks=Hooks do Git
 settings.basic_settings=Configurações Básicas
-settings.danger_zone=Zona de Perigo
 settings.site=Site Oficial
 settings.update_settings=Configurações de Atualização
 settings.change_reponame_prompt=Este mudanças vai afetar os links para este repositório.
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=Zona de Perigo
 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.new_owner_has_same_repo=O novo dono já tem um repositório com o mesmo nome. Por favor, escolha outro nome.
@@ -575,6 +582,7 @@ settings.delete_notices_2=- Esta operação irá apagar permanentemente o tudo d
 settings.delete_notices_fork_1=- Se este repositório é público, todos os forks se tornarão independentes após a deleção.
 settings.delete_notices_fork_2=- Se este repositório é privado, todos os forks serão removidos imediatamente.
 settings.delete_notices_fork_3=- Se você deseja manter todos os forks, por favor muda a visibilidade do repositório para pública primeiro.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=As opções do repositório foram atualizadas com sucesso.
 settings.transfer_owner=Novo Dono
 settings.make_transfer=Fazer Transferência
@@ -590,6 +598,9 @@ settings.hooks_desc=Hooks da web ou Webhooks permitem serviços externos serem n
 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!
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Solicitação
 settings.webhook.response=Resposta
 settings.webhook.headers=Cabeçalhos
@@ -879,6 +890,8 @@ 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
 auths.user_dn=Usuário do DN
+auths.attribute_username=Username attribute
+auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
 auths.attribute_name=Atributo primeiro nome
 auths.attribute_surname=Atributo sobrenome
 auths.attribute_mail=Atributo e-mail
@@ -982,11 +995,18 @@ monitor.start=Hora de Início
 monitor.execute_time=Tempo de Execução
 
 notices.system_notice_list=Sistema de Notificações
+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.type=Tipo
 notices.type_1=Repositório
 notices.desc=Descrição
 notices.op=Op.
-notices.delete_success=Aviso do sistema foi deletado com sucesso.
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=repositório criado <a href="%s"> %s</a>
diff --git a/conf/locale/locale_ru-RU.ini b/conf/locale/locale_ru-RU.ini
index a492f6db90..8dc6f4a608 100755
--- a/conf/locale/locale_ru-RU.ini
+++ b/conf/locale/locale_ru-RU.ini
@@ -558,10 +558,17 @@ settings.collaboration=Сотрудничество
 settings.hooks=Автоматическое обновление
 settings.githooks=Git хуки
 settings.basic_settings=Основные параметры
-settings.danger_zone=Опасная зона
 settings.site=Официальный сайт
 settings.update_settings=Обновить настройки
 settings.change_reponame_prompt=Это изменение повлияет на отношения ссылок к этому репозиторию.
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=Опасная зона
 settings.transfer=Передать права собственности
 settings.transfer_desc=Передать репозиторий другому пользователю или организации где у вас есть права администратора.
 settings.new_owner_has_same_repo=У нового владельца уже есть хранилище с таким названием.
@@ -575,6 +582,7 @@ settings.delete_notices_2=- Эта операция перманентно уд�
 settings.delete_notices_fork_1=- Если данный репозиторий является публичным, все склонированные репозитории останутся независимыми, после его удаления.
 settings.delete_notices_fork_2=- Если данный репозиторий является приватным, все его форки будут удалены вместе с ним.
 settings.delete_notices_fork_3=- Если вы хотите сохранить все форки после удаления репозитория, то сначала сделайте его публичным.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=Настройка репозитория обновлена успешно.
 settings.transfer_owner=Новый владелец
 settings.make_transfer=Выполнить передачу
@@ -590,6 +598,9 @@ settings.hooks_desc=Webhooks позволяют внешним службам п
 settings.webhook_deletion=Удалить веб-хук
 settings.webhook_deletion_desc=Удаление этого веб-хука приведет к удалению всей, связанной с ним, информации, включая историю. Хотите продолжить?
 settings.webhook_deletion_success=Веб-хук успешно удален!
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Запрос
 settings.webhook.response=Ответ
 settings.webhook.headers=Заголовки
@@ -984,12 +995,18 @@ monitor.start=Момент начала
 monitor.execute_time=Время выполнения
 
 notices.system_notice_list=Система уведомлений
-notices.empty_all=Remove All 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.type=Тип
 notices.type_1=Репозиторий
 notices.desc=Описание
 notices.op=Op.
-notices.delete_success=Системное уведомление успешно удалено.
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=создан репозиторий <a href="%s"> %s</a>
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 85edadf954..7f5d38a8ba 100755
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -388,7 +388,7 @@ create_new_repo_command=从命令行创建一个新的仓库
 push_exist_repo=从命令行推送已经创建的仓库
 repo_is_empty=该仓库不包含任何内容，请稍后再进行访问！
 
-code=Code
+code=代码
 branch=分支
 tree=目录树
 filter_branch_and_tag=过滤分支或标签
@@ -558,10 +558,17 @@ settings.collaboration=管理协作者
 settings.hooks=管理 Web 钩子
 settings.githooks=管理 Git 钩子
 settings.basic_settings=基本设置
-settings.danger_zone=危险操作区
 settings.site=官方网站
 settings.update_settings=更新仓库设置
 settings.change_reponame_prompt=该操作将会影响到所有与该仓库有关的链接
+settings.advanced_settings=高级设置
+settings.wiki_desc=启用 Wiki 以允许用户协作文档
+settings.issues_desc=启用内置的轻量级工单管理系统
+settings.use_external_issue_tracker=使用外部的工单管理系统
+settings.tracker_url_format=外部工单管理系统的 URL 格式
+settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分别作为用户名、仓库名和工单索引的占位符。
+settings.pulls_desc=启用合并请求以接受社区贡献
+settings.danger_zone=危险操作区
 settings.transfer=转移仓库所有权
 settings.transfer_desc=您可以将仓库转移至您拥有管理员权限的帐户或组织。
 settings.new_owner_has_same_repo=新的仓库拥有者已经存在同名仓库！
@@ -575,6 +582,7 @@ settings.delete_notices_2=- 此操作将永久删除该仓库，包括 Git 数�
 settings.delete_notices_fork_1=- 如果该仓库为公开的，则在删除仓库后所有的派生仓库都将转换成独立的仓库。
 settings.delete_notices_fork_2=- 如果该仓库为私有，则会同时删除所有的派生仓库。
 settings.delete_notices_fork_3=- 如果您想要保留派生仓库，请先将可见性修改为公开的后再进行删除操作。
+settings.deletion_success=仓库删除成功！
 settings.update_settings_success=仓库设置更新成功！
 settings.transfer_owner=新拥有者
 settings.make_transfer=确认转移仓库
@@ -590,6 +598,9 @@ settings.hooks_desc=Web 钩子允许您设定在 Gogs 上发生指定事件时�
 settings.webhook_deletion=删除 Web 钩子
 settings.webhook_deletion_desc=删除该 Web 钩子将会删除与其有关的信息和推送历史。是否继续？
 settings.webhook_deletion_success=Web 钩子删除成功！
+settings.webhook.test_delivery=测试推送
+settings.webhook.test_delivery_desc=生成并推送一个模拟的 Push 事件
+settings.webhook.test_delivery_success=测试推送已经加入到队列，请耐心等待数秒再刷新推送记录。
 settings.webhook.request=请求内容
 settings.webhook.response=响应内容
 settings.webhook.headers=头信息
@@ -879,6 +890,8 @@ auths.bind_password=绑定密码
 auths.bind_password_helper=警告：该密码将会以明文的形式保存在数据库中。请不要使用拥有高权限的帐户！
 auths.user_base=用户搜索基准
 auths.user_dn=User DN
+auths.attribute_username=用户名属性
+auths.attribute_username_placeholder=留空表示使用用户登录时所使用的用户名
 auths.attribute_name=名字属性
 auths.attribute_surname=姓氏属性
 auths.attribute_mail=邮箱属性
@@ -982,6 +995,13 @@ monitor.start=开始时间
 monitor.execute_time=已执行时间
 
 notices.system_notice_list=系统提示管理
+notices.view_detail_header=查看提示详情
+notices.actions=操作
+notices.select_all=选中全部
+notices.deselect_all=取消所有选中
+notices.inverse_selection=反向选中
+notices.delete_selected=删除选中项
+notices.delete_all=删除所有提示
 notices.type=提示类型
 notices.type_1=仓库
 notices.desc=描述
diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini
index 0f81e39667..5ce105ca46 100755
--- a/conf/locale/locale_zh-HK.ini
+++ b/conf/locale/locale_zh-HK.ini
@@ -111,7 +111,7 @@ admin_title=管理員帳號設置
 admin_name=管理員用戶名
 admin_password=管理員密碼
 confirm_password=確認密碼
-admin_email=Admin E-mail
+admin_email=Admin Email
 install_gogs=立即安裝
 test_git_failed=無法識別 'git' 命令：%v
 sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s 下載官方構建版，而不是 gobuild 版本。
@@ -161,9 +161,9 @@ password_too_short=密碼長度不能少於 6 位！
 
 [mail]
 activate_account=Please activate your account
-activate_email=Verify your e-mail address
+activate_email=Verify your email address
 reset_password=Reset your password
-register_success=Register success, Welcome
+register_success=Registration successful, welcome
 register_notify=Welcome on board
 
 [modal]
@@ -278,9 +278,9 @@ email_desc=您的主要邮箱地址将被用于通知提醒和其它操作。
 primary=主要
 primary_email=设为主要
 delete_email=刪除
-email_deletion=E-mail Deletion
-email_deletion_desc=Delete this e-mail address will remove related information from your account. Do you want to continue?
-email_deletion_success=E-mail has been deleted successfully!
+email_deletion=Email Deletion
+email_deletion_desc=Deleting this email address will remove related information from your account. Do you want to continue?
+email_deletion_success=Email has been deleted successfully!
 add_new_email=添加新的電子郵件地址
 add_email=添加電子郵件
 add_email_confirmation_sent=一封待確認的電子郵件已發送到 '%s'，請在%d 小時內檢查您的收件箱，並完成確認過程。
@@ -558,10 +558,17 @@ settings.collaboration=管理協作者
 settings.hooks=管理 Web 鉤子
 settings.githooks=管理 Git 鉤子
 settings.basic_settings=基本設置
-settings.danger_zone=危險操作區
 settings.site=官方網站
 settings.update_settings=更新倉庫設置
 settings.change_reponame_prompt=This change will affect how links relate to the repository.
+settings.advanced_settings=Advanced Settings
+settings.wiki_desc=Enable wiki to allow people write documents
+settings.issues_desc=Enable builtin lightweight issue tracker
+settings.use_external_issue_tracker=Use external issue tracker
+settings.tracker_url_format=External Issue Tracker URL Format
+settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.pulls_desc=Enable pull requests to accept public contributions
+settings.danger_zone=危險操作區
 settings.transfer=轉移倉庫所有權
 settings.transfer_desc=您可以將倉庫轉移至您擁有管理員權限的帳戶或組織。
 settings.new_owner_has_same_repo=新的倉庫擁有者已經存在同名倉庫！
@@ -575,6 +582,7 @@ settings.delete_notices_2=- This operation will permanently delete the everythin
 settings.delete_notices_fork_1=- If this repository is public, all forks will be became independent after deletion.
 settings.delete_notices_fork_2=- If this repository is private, all forks will be removed at the same time.
 settings.delete_notices_fork_3=- If you want to keep all forks after deletion, please change visibility of this repository to public first.
+settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=倉庫設置更新成功！
 settings.transfer_owner=新擁有者
 settings.make_transfer=確認轉移倉庫
@@ -590,6 +598,9 @@ settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時�
 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!
+settings.webhook.test_delivery=Test Delivery
+settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
+settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
 settings.webhook.request=Request
 settings.webhook.response=Response
 settings.webhook.headers=Headers
@@ -675,7 +686,7 @@ release.save_draft=保在草稿
 release.edit_release=編輯發佈信息
 release.delete_release=Delete This Release
 release.deletion=Release Deletion
-release.deletion_desc=Delete this release will delete corresponding Git tag. Do you want to continue?
+release.deletion_desc=Deleting this release will delete the corresponding Git tag. Do you want to continue?
 release.deletion_success=Release has been deleted successfully!
 release.tag_name_already_exist=已經存在使用相同標籤的發佈版本。
 release.downloads=Downloads
@@ -879,6 +890,8 @@ auths.bind_password=綁定密碼
 auths.bind_password_helper=Warning: This password is stored in plain text. Do not use a high privileged account.
 auths.user_base=User Search Base
 auths.user_dn=User DN
+auths.attribute_username=Username attribute
+auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
 auths.attribute_name=名子屬性
 auths.attribute_surname=姓氏屬性
 auths.attribute_mail=電子郵箱屬性
@@ -982,11 +995,18 @@ monitor.start=開始時間
 monitor.execute_time=已執行時間
 
 notices.system_notice_list=系統提示管理
+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.type=提示類型
 notices.type_1=倉庫
 notices.desc=描述
 notices.op=操作
-notices.delete_success=系統提示刪除成功！
+notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=創建了倉庫 <a href="%s">%s</a>