#1612 Ability to send mail when a new pull request is submitted

2015-12-10 11:18:56 -05:00 · 2015-12-10 11:18:56 -05:00 · c6083c335e
commit c6083c335e
parent 2e9c4ddedb
20 changed files with 1375 additions and 1107 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -42,13 +42,7 @@ There is no standard form of making a feature request. Just try to describe the

 ### Pull Request

-Pull requests are always welcome, but note that **ALL PULL REQUESTS MUST APPLY TO THE `develop` BRANCH**.
-
-We are always thrilled to receive pull requests, and do our best to process them as fast as possible. Not sure if that typo is worth a pull request? Do it! We will appreciate it.
-
-If your pull request is not accepted on the first try, don't be discouraged! If there's a problem with the implementation, hopefully you received feedback on what to improve.
-
-We're trying very hard to keep Gogs lean and focused. We don't want it to do everything for everybody. This means that we might decide against incorporating a new feature. We believe you do like to discuss with us first in [Gitter](https://gitter.im/gogits/gogs).
+Please read detailed information on [Wiki](https://github.com/gogits/gogs/wiki/Contributing-Code).

 ### Ask For Help

--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra

 ![](public/img/gogs-large-resize.png)

-##### Current version: 0.7.37 Beta
+##### Current version: 0.7.38 Beta

 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|
--- a/conf/locale/locale_bg-BG.ini
+++ b/conf/locale/locale_bg-BG.ini
@ -2,10 +2,10 @@ app_desc=Безпроблемен собствен Git сървър

 home=Начало
 dashboard=Табло
-explore=Преглед
+explore=Каталог
 help=Помощ
-sign_in=Вписване
-sign_out=Излизане
+sign_in=Вход
+sign_out=Изход
 sign_up=Регистрирайте се
 register=Регистрация
 website=Уебсайт
@ -28,6 +28,7 @@ organization=Организация
 mirror=Огледало
 new_repo=Ново хранилище
 new_migrate=Нова миграция
+new_mirror=New Mirror
 new_fork=Ново разклонено хранилище
 new_org=Нова организация
 manage_org=Управление на организации
@ -38,8 +39,8 @@ your_profile=Вашият профил
 your_settings=Вашите настройки

 news_feed=Поток новини
-pull_requests=Заявки сливане
-issues=Проблеми
+pull_requests=Заявки за сливане
+issues=Задачи

 cancel=Отказ

@ -47,7 +48,7 @@ cancel=Отказ
 search=Търсене...
 repository=Хранилище
 user=Потребител
-issue=Проблем
+issue=Задача
 code=Код

 [install]
@ -250,7 +251,7 @@ profile_desc=Вашият адрес на ел. поща е публичен и
 full_name=Пълно име
 website=Уебсайт
 location=Локация
-update_profile=Обнови профила
+update_profile=Запази профила
 update_profile_success=Вашият профил е запазен успешно.
 change_username=Потребителското име е променено
 change_username_prompt=Този промяна ще засегне всички връзки сочещи към профила Ви.
@ -260,7 +261,7 @@ cancel=Отказ
 enable_custom_avatar=Разреши потребителски аватар
 enable_custom_avatar_helper=Без зареждане от Gravatar
 choose_new_avatar=Избор на нов аватар
-update_avatar=Обнови настройките на аватара
+update_avatar=Запази настройките на аватара
 uploaded_avatar_not_a_image=Каченият файл не е изображение.
 no_custom_avatar_available=Невъзможно използване на външен аватар, защото не е активирано.
 update_avatar_success=Настройките на аватара са запазени успешно.
@ -302,26 +303,26 @@ ssh_key_deletion_desc=При изтриване на този SSH ключ ще
 ssh_key_deletion_success=SSH ключа беше изтрит успешно!
 add_on=Добавен на
 last_used=Последно използван на
-no_activity=Няма скорошна активност
+no_activity=Няма скорошна дейност
 key_state_desc=Този ключ е използван през последните 7 дни
-token_state_desc=Този токен е използван през последните 7 дни
+token_state_desc=Този API ключ е използван през последните 7 дни

 manage_social=Управление на свързани профили в социалните мрежи
 social_desc=Това е списък на свързани профили в социалните мрежи. Премахнете всички, които не разпознавате.
 unbind=Освобождаване
 unbind_success=Социалния профил е освободен.

-manage_access_token=Управление на индивидуални токени за достъп
-generate_new_token=Генериране на нов токен
-tokens_desc=Генерирани токени, които могат да се използват за достъп до API-то на Gogs.
-new_token_desc=Всеки токен ще има пълен достъп до Вашия профил.
-token_name=Име на токена
-generate_token=Генериране на токен
-generate_token_succees=Успешно е генериран токен за достъп. Уверете се, че сте го копирали, тъй като няма да можете да го видите отново!
+manage_access_token=Управление на индивидуални API ключове за достъп
+generate_new_token=Генериране на нов API ключ
+tokens_desc=Генерирани API ключове, които могат да се използват за достъп до API на Gogs.
+new_token_desc=Всеки API ключ ще има пълен достъп до Вашия профил.
+token_name=Име на API ключ
+generate_token=Генериране на API ключ
+generate_token_succees=Успешно е генериран API ключ за достъп. Уверете се, че сте го копирали, тъй като няма да можете да го видите отново!
 delete_token=Изтрий
-access_token_deletion=Изтрий индивидуален токен за достъп
-access_token_deletion_desc=При изтриване на този индивидуален токен за достъп ще се премахнат всички свързани права на приложението. Желаете ли да продължите?
-delete_token_success=Индивидуалния токен за достъп е изтрит успешно! Не забравяйте да преконфигурирате приложението също.
+access_token_deletion=Изтрий индивидуален API ключ за достъп
+access_token_deletion_desc=При изтриване на този индивидуален API ключ за достъп ще се премахнат всички свързани права на приложението. Желаете ли да продължите?
+delete_token_success=Индивидуалният API ключ за достъп е изтрит успешно! Не забравяйте да преконфигурирате приложението също.

 delete_account=Изтриване на собствения профил
 delete_prompt=Тази операция ще изтрие Вашия профил завинаги и тя <strong>НЕ МОЖЕ</strong> да бъде отменена в последствие!
@ -352,6 +353,8 @@ auto_init=Инициализиране на това хранилище с из
 create_repo=Създай хранилище
 default_branch=Клон по подразбиране
 mirror_interval=Интервал на отразяване (часове)
+mirror_address=Адрес на огледало
+mirror_address_desc=Моля включете потребител и парола в адреса ако са нужни.
 watchers=Наблюдаващи
 stargazers=Харесващи
 forks=Разклонения
@ -369,6 +372,7 @@ migrate.permission_denied=Недостатъчни права за импорт
 migrate.invalid_local_path=Невалиден път - не съществува или не е директория.
 migrate.failed=Грешка при миграция: %v

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

-code=Code
+code=Код
 branch=Клон
 tree=ИН на ревизия
 filter_branch_and_tag=Филтър по маркер или клон
 branches=Клонове
 tags=Маркери
-issues=Проблеми
-pulls=Заявки сливане
+issues=Задачи
+pulls=Заявки за сливане
 labels=Етикети
 milestones=Етапи
 commits=Ревизии
-releases=Издания
+releases=Версии
 file_raw=Директен файл
 file_history=История
 file_view_raw=Виж директен файл
@ -414,7 +418,7 @@ commits.date=Дата
 commits.older=По-стари
 commits.newer=По-нови

-issues.new=Нов проблем
+issues.new=Нова задача
 issues.new.labels=Етикети
 issues.new.no_label=Няма етикет
 issues.new.clear_labels=Изчисти етикети
@ -426,7 +430,7 @@ issues.new.closed_milestone=Затворени етапи
 issues.new.assignee=Изпълнител
 issues.new.clear_assignee=Изчисти изпълнител
 issues.new.no_assignee=Няма изпълнител
-issues.create=Докладвай проблем
+issues.create=Създай задача
 issues.new_label=Нов етикет
 issues.new_label_placeholder=Име на етикета...
 issues.create_label=Създай етикет
@ -439,7 +443,7 @@ issues.filter_milestone_no_select=Липсва избран етап
 issues.filter_assignee=Изпълнител
 issues.filter_assginee_no_select=Няма избран изпълнител
 issues.filter_type=Тип
-issues.filter_type.all_issues=Всички проблеми
+issues.filter_type.all_issues=Всички задачи
 issues.filter_type.assigned_to_you=Възложени на Вас
 issues.filter_type.created_by_you=Създадени от Вас
 issues.filter_type.mentioning_you=Споменават лично
@ -466,7 +470,7 @@ issues.reopen_comment_issue=Kоментирай и oтвори отново
 issues.create_comment=Коментирай
 issues.closed_at=`затвори <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`повторно отвори <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`посочи този проблем от ревизия <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at=`посочи тази задача от ревизия <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.poster=Участник
 issues.admin=Администратор
 issues.owner=Притежател
@ -478,12 +482,12 @@ issues.save=Запис
 issues.label_title=Име на етикета
 issues.label_color=Цвят на етикет
 issues.label_count=%d етикети
-issues.label_open_issues=%d отворени проблема
+issues.label_open_issues=%d отворени задачи
 issues.label_edit=Редакция
 issues.label_delete=Изтрий
 issues.label_modify=Промяна на етикет
 issues.label_deletion=Изтрий етикет
-issues.label_deletion_desc=При изтриване на този етикет ще се премахне информацията за него във всички свързани проблеми. Желаете ли да продължите?
+issues.label_deletion_desc=При изтриване на този етикет ще се премахне информацията за него във всички свързани задачи. Желаете ли да продължите?
 issues.label_deletion_success=Етикетът е изтрит успешно!

 pulls.new=Нова заявка за сливане
@ -506,9 +510,9 @@ pulls.merged=Обединени
 pulls.has_merged=Тази заявка за сливане е обединена успешно!
 pulls.data_broken=Данните от тази заявка за сливане са невалидни поради изтрита информация за някое разклонение.
 pulls.is_checking=Проверката за конфликт все още е в ход. Моля обновете страницата след малко.
-pulls.can_auto_merge_desc=Можете да извършвате авто-обединяване на тази заявка за сливане.
-pulls.cannot_auto_merge_desc=Не можете да извършите авто-обединяване, защото съществуват конфликти между ревизиите.
-pulls.cannot_auto_merge_helper=Моля, използвайте инструменти на командния ред за да отстраните проблема.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Обедини заявка за сливане
 pulls.open_unmerged_pull_exists=`Невъзможно повторно отваряне, защото вече съществува заявка за сливане (#%d) от същото хранилище със същата информация за обединяване, която чака да бъде извършена`

@ -519,7 +523,7 @@ milestones.closed=Затворен %s
 milestones.no_due_date=Няма краен срок
 milestones.open=Отвори
 milestones.close=Затвори
-milestones.new_subheader=Създайте етапи за да организирате проблемите.
+milestones.new_subheader=Създайте етапи за да организирате задачите.
 milestones.create=Създай етап
 milestones.title=Заглавие
 milestones.desc=Описание
@ -533,7 +537,7 @@ milestones.cancel=Отказ
 milestones.modify=Промяна на етап
 milestones.edit_success=Промените в етап '%s' са запазени успешно!
 milestones.deletion=Изтрий етап
-milestones.deletion_desc=При изтриване на етап ще се премахне информацията за него от всички свързани проблеми. Желаете ли да продължите?
+milestones.deletion_desc=При изтриване на етап ще се премахне информацията за него от всички свързани задачи. Желаете ли да продължите?
 milestones.deletion_success=Етапът е изтрит успешно!

 wiki=Уики
@ -559,15 +563,15 @@ settings.hooks=Уеб-куки
 settings.githooks=Git куки
 settings.basic_settings=Основни настройки
 settings.site=Официален сайт
-settings.update_settings=Обнови настройките
+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.advanced_settings=Разширени настройки
+settings.wiki_desc=Включва уики за да може потребителите да създават документи
+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=Прехвърля това хранилище на друг потребител или към организация, в която имате права на администратор.
@ -578,11 +582,11 @@ settings.transfer_notices_1=- Вие ще загубите достъп, ако
 settings.transfer_notices_2=- Вие ще запазите достъпа си, ако новият притежател е организация и ако вие сте един от притежателите ѝ.
 settings.transfer_form_title=Моля въведете следната информация за да потвърдите операцията:
 settings.delete_notices_1=- Тази операция <strong>НЕ МОЖЕ</strong> да бъде отменена в последствие.
-settings.delete_notices_2=- Тази операция ще изтрие всичко от това хранилище, включително Git данни, проблеми, коментари и достъпа на сътрудници.
+settings.delete_notices_2=- Тази операция ще изтрие всичко от това хранилище, включително Git данни, задачи, коментари и достъпа на сътрудници.
 settings.delete_notices_fork_1=- Ако това хранилище е публично, всички негови разклонения ще останат независими след изтриването му.
 settings.delete_notices_fork_2=- Ако това хранилище е частно, всички негови разклонения ще бъдат премахнати по време на изтриването.
 settings.delete_notices_fork_3=- Ако желаете да запазите всички разклонения след изтриването му, първо направете хранилището публично.
-settings.deletion_success=Repository has been deleted successfully!
+settings.deletion_success=Хранилището е изтрито успешно!
 settings.update_settings_success=Настройките на хранилището са запазени успешно.
 settings.transfer_owner=Нов притежател
 settings.make_transfer=Прехвърли
@ -598,9 +602,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.test_delivery=Тестово изпращане
+settings.webhook.test_delivery_desc=Симулира тестово изпращане за тест на настройките на уеб-куката
+settings.webhook.test_delivery_success=Тестовата уеб-кука е добавена в опашката за изпращане. Може да отнеме няколко секунди преди да се появи в историята с доставени.
 settings.webhook.request=Заявка
 settings.webhook.response=Отговор
 settings.webhook.headers=Заглавки
@ -610,7 +614,7 @@ settings.githooks_desc=Git куките се изпълняват от Git. Ви
 settings.githook_edit_desc=Ако куката е неактивна, ще бъде представено примерно съдържание. Ако оставите съдържанието празно, то тази кука ще бъде изключена.
 settings.githook_name=Име на куката
 settings.githook_content=Съдържание на куката
-settings.update_githook=Обнови куката
+settings.update_githook=Запази куката
 settings.add_webhook_desc=Gogs ще изпрати <code>POST</code> заявка към указания URL адрес заедно с информация за събитието, което е настъпило. Също можете да укажете в какъв формат желаете да получите данните при задействане на куката (JSON, x-www-form-urlencoded, XML) и др. Допълнително описание можете да намерите в нашето <a target="_blank" href="%s">Ръководство за уеб-куки</a>.
 settings.payload_url=URL адрес на изпращане
 settings.content_type=Тип на съдържанието
@ -629,13 +633,13 @@ settings.event_push_desc=Git предаване към хранилището
 settings.active=Активна
 settings.active_helper=Подробности относно събитието, което е задействало куката, също ще бъдат изпратени.
 settings.add_hook_success=Новата уеб-кука е добавена успешно.
-settings.update_webhook=Обнови уеб-куката
+settings.update_webhook=Запази уеб-куката
 settings.update_hook_success=Уеб-куката е запазена успешно.
 settings.delete_webhook=Изтрий уеб-куката
 settings.recent_deliveries=Последни изпращания
 settings.hook_type=Тип на куката
 settings.add_slack_hook_desc=Добавяне на интеграция със <a href="%s">Slack</a> във Вашето хранилище.
-settings.slack_token=Токен
+settings.slack_token=API ключ
 settings.slack_domain=Домейн
 settings.slack_channel=Канал
 settings.deploy_keys=Ключове за внедряване
@ -660,15 +664,15 @@ diff.stats_desc=променени са <strong>%d файла</strong>, в ко
 diff.bin=BIN
 diff.view_file=Целия файл

-release.releases=Издания
-release.new_release=Ново издание
+release.releases=Версии
+release.new_release=Нова версия
 release.draft=Чернови
 release.prerelease=Предварителни
 release.stable=Стабилни
 release.edit=редактиране
-release.ahead=<strong>%d</strong> ревизии на %s след това издание
+release.ahead=<strong>%d</strong> ревизии на %s след тази версия
 release.source_code=Изходен код
-release.new_subheader=Публикувайте издания на всяка нова итерация.
+release.new_subheader=Публикувайте версия на всяка нова итерация.
 release.edit_subheader=Подробният журнал на промените ще помогне на потребителите да разберат какви подобрения са направени.
 release.tag_name=Име на маркера
 release.target=Цел
@ -678,17 +682,17 @@ release.content=Съдържание
 release.write=Редактор
 release.preview=Преглед
 release.loading=Зареждане...
-release.prerelease_desc=Това е предварително издание
-release.prerelease_helper=Ние ще отбележим, че това издание не е завършено за употреба.
+release.prerelease_desc=Това е предварителна версия
+release.prerelease_helper=Ние ще отбележим, че тази версия не е готова за продукционна употреба.
 release.cancel=Отказ
-release.publish=Публикувай издание
+release.publish=Публикувай версия
 release.save_draft=Запис на чернова
-release.edit_release=Редактирай издание
-release.delete_release=Изтриване на това издание
-release.deletion=Изтрий изданието
-release.deletion_desc=При изтриване на това издание ще се премахне съответния Git маркер. Желаете ли да продължите?
-release.deletion_success=Изданието беше изтрито успешно!
-release.tag_name_already_exist=Издание с това име на маркер вече съществува.
+release.edit_release=Редактирай версия
+release.delete_release=Изтриване на тази версия
+release.deletion=Изтрий версията
+release.deletion_desc=При изтриване на тази версия ще се премахне и съответния Git маркер. Желаете ли да продължите?
+release.deletion_success=Версията беше изтрита успешно!
+release.tag_name_already_exist=Версия с това име на маркер вече съществува.
 release.downloads=Изтегляния

 [org]
@ -718,7 +722,7 @@ settings.options=Опции
 settings.full_name=Пълно име
 settings.website=Уебсайт
 settings.location=Локация
-settings.update_settings=Обнови настройките
+settings.update_settings=Запази настройките
 settings.update_setting_success=Настройките на организацията са запазени успешно.
 settings.change_orgname_prompt=Този промяна ще засегне всички връзки сочещи към организацията.
 settings.update_avatar_success=Настройките на аватара на организацията са запазени успешно.
@ -755,7 +759,7 @@ teams.no_desc=Този екип няма описание
 teams.settings=Настройки
 teams.owners_permission_desc=Притежателите имат пълен достъп до <strong>всички хранилища</strong> и имат <strong>права на администратори</strong> на организацията.
 teams.members=Участници в екипа
-teams.update_settings=Обнови настройките
+teams.update_settings=Запази настройките
 teams.delete_team=Изтриване на този екип
 teams.add_team_member=Добави участник в екипа
 teams.delete_team_title=Изтрий екипа
@ -786,7 +790,7 @@ total=Общо: %d
 dashboard.statistic=Статистика
 dashboard.operations=Операции
 dashboard.system_status=Наблюдение на системния статус
-dashboard.statistic_info=Gogs базата данни има <b>%d</b> потребители, <b>%d</b> организации, <b>%d</b> публични ключове, <b>%d</b> хранилища, <b>%d</b> наблюдавания, <b>%d</b> харесвания, <b>%d</b> действия, <b>%d</b> достъпи, <b>%d</b> проблеми, <b>%d</b> коментари, <b>%d</b> социални регистрации, <b>%d</b> последователи, <b>%d</b> огледала, <b>%d</b> издания, <b>%d</b> източници за вписване, <b>%d</b> уеб-куки, <b>%d</b> етапи, <b>%d</b> етикети, <b>%d</b> задачи на куки, <b>%d</b> екипи, <b>%d</b> задачи при актуализация, <b>%d</b> прикачени файлове.
+dashboard.statistic_info=Gogs базата данни има <b>%d</b> потребители, <b>%d</b> организации, <b>%d</b> публични ключове, <b>%d</b> хранилища, <b>%d</b> наблюдавания, <b>%d</b> харесвания, <b>%d</b> действия, <b>%d</b> достъпи, <b>%d</b> задачи, <b>%d</b> коментари, <b>%d</b> социални регистрации, <b>%d</b> последователи, <b>%d</b> огледала, <b>%d</b> версии, <b>%d</b> начини на удостоверяване, <b>%d</b> уеб-куки, <b>%d</b> етапи, <b>%d</b> етикети, <b>%d</b> задачи на куки, <b>%d</b> екипи, <b>%d</b> задачи при актуализация, <b>%d</b> прикачени файлове.
 dashboard.operation_name=Име на операцията
 dashboard.operation_switch=Превключи
 dashboard.operation_run=Изпълни
@ -845,9 +849,9 @@ users.created=Създаване
 users.send_register_notify=Прати уведомление на потребителя при регистрация
 users.new_success=Новият профил '%s' е добавен успешно.
 users.edit=Редакция
-users.auth_source=Източник за удостоверяване
+users.auth_source=Начин на удостоверяване
 users.local=Локално
-users.auth_login_name=Потребителско име за удостоверяване
+users.auth_login_name=Потребителско име за вход
 users.password_helper=Оставете празна ако не се променя.
 users.update_profile_success=Профилът е запазен успешно.
 users.edit_account=Редактирай профил
@ -855,7 +859,7 @@ users.is_activated=Този профил е активиран
 users.is_admin=Този профил има административни права
 users.allow_git_hook=Този профил има разрешение да създава Git куки
 users.allow_import_local=Този профил има права за импорт на локални хранилища
-users.update_profile=Обнови профила
+users.update_profile=Запази профила
 users.delete_account=Изтрий този профил
 users.still_own_repo=Този профил притежава поне едно хранилище. Първо трябва да изтриете хранилището или да го прехвърлите на друг потребител.
 users.still_has_org=Този профил участва в поне една организация. Първо трябва да напуснете или изтриете тези организации.
@ -872,10 +876,10 @@ repos.name=Име
 repos.private=Частно
 repos.watches=Наблюдавания
 repos.stars=Харесвания
-repos.issues=Проблеми
+repos.issues=Задачи

 auths.auth_manage_panel=Управление на удостоверявания
-auths.new=Добави нов източник за удостоверяване
+auths.new=Добави нов начин на удостоверяване
 auths.name=Име
 auths.type=Тип
 auths.enabled=Активно
@ -912,7 +916,7 @@ auths.edit=Редактирай настройки за удостоверява
 auths.activated=Това удостоверяване е активно
 auths.new_success=Новото удостоверяване '%s' е добавено успешно.
 auths.update_success=Настройките за удостоверяване са запазени успешно.
-auths.update=Обнови настройки за удостоверяване
+auths.update=Запази настройки за удостоверяване
 auths.delete=Изтриване на това удостоверяване
 auths.delete_auth_title=Изтрий удостоверяването
 auths.delete_auth_desc=Това удостоверяване ще бъде изтрито. Желаете ли да продължите?
@ -995,30 +999,30 @@ 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.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=Описание
 notices.op=Oп.
-notices.delete_success=System notices have been deleted successfully.
+notices.delete_success=Системните съобщения са изтрити успешно.

 [action]
 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>`
+create_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>`
+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>
-compare_commits=Сравнение между тези %d ревизии
+compare_commits=View comparison for these %d commits

 [tool]
 ago=преди
--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
@ -28,6 +28,7 @@ organization=Organisation
 mirror=Spiegel
 new_repo=Neues Repository
 new_migrate=Neue Migration
+new_mirror=New Mirror
 new_fork=Neues abgespaltetes Repository
 new_org=Neue Organisation
 manage_org=Organisationen verwalten
@ -352,6 +353,8 @@ auto_init=Repository mit ausgewählten Dateien und Vorlagen initialisieren
 create_repo=Repository erstellen
 default_branch=Standard-Branch
 mirror_interval=Spiegel-Intervall (in Stunden)
+mirror_address=Spiegeladresse
+mirror_address_desc=Bitte notwendige Benutzerangaben in die Adresse aufnehmen.
 watchers=Beobachter
 stargazers=Sterngucker
 forks=Forks
@ -369,6 +372,7 @@ migrate.permission_denied=Ihnen fehlen die Rechte zum Importieren lokaler Reposi
 migrate.invalid_local_path=Lokaler Pfad ist ungültig, er existiert nicht oder ist kein Ordner.
 migrate.failed=Fehler bei Migration: %v

+mirror_from=spiegeln von
 forked_from=Geforkt von
 fork_from_self=Sie können keine Repository forken, welche ihnen gehört!
 copy_link=Kopieren
@ -506,9 +510,9 @@ pulls.merged=Zusammengeführt
 pulls.has_merged=Dieser Pull-Request wurde erfolgreich zusammengeführt!
 pulls.data_broken=Die Daten dieser Pull-Anforderung sind defekt aufgrund des Löschens von Fork-Informationen.
 pulls.is_checking=Die Konfliktprüfung ist in Arbeit. Bitte aktualisiere die Seite in wenigen Momenten.
-pulls.can_auto_merge_desc=Du kannst eine Auto-Merge Operation auf diese Pull-Anforderung durchführen.
-pulls.cannot_auto_merge_desc=Es kann keine Auto-Merge Operation durchgeführt werden, da es Konflikte zwischen den Commits gibt.
-pulls.cannot_auto_merge_helper=Bitte benutze ein Kommandozeilentool, um den Konflikt zu lösen.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Pull-Request zusammenführen
 pulls.open_unmerged_pull_exists=`Du kannst die Pull-Anforderung nicht wiedereröffnen, da bereits eine offene Pull-Anforderung (#%d) aus dem selben Repository mit den gleichen Merge-Informationen existiert und auf das Merging wartet.`

@ -598,9 +602,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.test_delivery=Auslieferungstest
+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.headers=Kopfzeilen
@ -640,7 +644,7 @@ settings.slack_domain=Domain
 settings.slack_channel=Kanal
 settings.deploy_keys=Deploy-Keys
 settings.add_deploy_key=Deploy-Key hinzufügen
-settings.deploy_key_desc=Deploy key only has read-only access. It is not same as personal account SSH keys.
+settings.deploy_key_desc=Auslieferungs-Schlüssel hat nur lesenden Zugriff. Er ist nicht identisch mit dem persönlichen SSH-Schlüssel des Accounts.
 settings.no_deploy_keys=Du hast noch keine Deploy-Schlüssel hinzugefügt.
 settings.title=Titel
 settings.deploy_key_content=Inhalt
@ -1018,7 +1022,7 @@ 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`
 transfer_repo=hat Repository <code>%s</code> transferiert an <a href="%s">%s</a>
 push_tag=hat nach <a href="%s/src/%s">%[2]s</a> in <a href="%[1]s">%[3]s</a> gepusht
-compare_commits=Zeige Vergleich dieser %d Commits
+compare_commits=View comparison for these %d commits

 [tool]
 ago=vor
--- a/conf/locale/locale_es-ES.ini
+++ b/conf/locale/locale_es-ES.ini
@ -28,6 +28,7 @@ organization=Organización
 mirror=Mirror
 new_repo=Nuevo repositorio
 new_migrate=Nueva Migración
+new_mirror=New Mirror
 new_fork=Nuevo Fork del Repositorio
 new_org=Nueva organización
 manage_org=Administrar organizaciones
@ -352,6 +353,8 @@ auto_init=Inicializar los archivos seleccionados y plantillas de este repositori
 create_repo=Crear Repositorio
 default_branch=Rama por defecto
 mirror_interval=Intervalo de mirror(en horas)
+mirror_address=Mirror Address
+mirror_address_desc=Please include necessary user credentials in the address.
 watchers=Seguidores
 stargazers=Fans
 forks=Forks
@ -369,6 +372,7 @@ migrate.permission_denied=No te está permitido importar repositorios locales.
 migrate.invalid_local_path=Rutal local inválida, no existe o no es un directorio.
 migrate.failed=Migración fallida: %v

+mirror_from=mirror from
 forked_from=forked de
 fork_from_self=Eres el propietario del repositorio, ¡no puedes hacer fork!
 copy_link=Copiar
@ -506,9 +510,9 @@ pulls.merged=Fuisionado
 pulls.has_merged=¡Este pull request se ha completado con éxito!
 pulls.data_broken=Los datos de este pull request ya no están disponibles porque se ha eliminado la información del fork.
 pulls.is_checking=Se está procediendo a la búsqueda de conflictos, por favor actualice la página en unos momentos.
-pulls.can_auto_merge_desc=Puede realizar la operación auto-fusionado en este pull request.
-pulls.cannot_auto_merge_desc=No puede realizar la operación de auto-fusionado porque existen conflictos entre los commits.
-pulls.cannot_auto_merge_helper=Por favor use la línea de comandos para resolverlo.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Fusionar Pull Request
 pulls.open_unmerged_pull_exists=`Usted no puede realizar la operación de reapertura porque en estos momentos existe una solicitud de pull request (#%d) para el mismo repositorio con la misma información que se encuentra a la espera de aprobación`

@ -1018,7 +1022,7 @@ comment_issue=`comentó en la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`fusionado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=transfirió el repositorio <code>%s</code> a <a href="%s">%s</a>
 push_tag=hizo push del tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>
-compare_commits=Ver la comparación de estos %d commits
+compare_commits=View comparison for these %d commits

 [tool]
 ago=hace
--- a/conf/locale/locale_fr-FR.ini
+++ b/conf/locale/locale_fr-FR.ini
@ -28,6 +28,7 @@ organization=Organisation
 mirror=Miroir
 new_repo=Nouveau Dépôt
 new_migrate=Nouvelle Migration
+new_mirror=New Mirror
 new_fork=Nouvel embranchement
 new_org=Nouvelle Organisation
 manage_org=Gérer les Organisations
@ -352,6 +353,8 @@ auto_init=Initialiser ce dépôt avec le modèle et les fichiers sélectionnés
 create_repo=Créer un dépôt
 default_branch=Branche par défaut
 mirror_interval=Intervalle du miroir (heure)
+mirror_address=Mirror Address
+mirror_address_desc=Please include necessary user credentials in the address.
 watchers=Observateurs
 stargazers=Stargazers
 forks=Embranchements
@ -369,6 +372,7 @@ migrate.permission_denied=Vous n'êtes pas autorisé à importer des dépôts lo
 migrate.invalid_local_path=Chemin local non valide, non existant ou n'étant pas un dossier.
 migrate.failed=Echec de migration: %v

+mirror_from=mirror from
 forked_from=scindé depuis
 fork_from_self=Vous nous ne pouvez pas scinder un dépôt que vous possédez déja !
 copy_link=Copier
@ -506,9 +510,9 @@ pulls.merged=Fusionné
 pulls.has_merged=Cette Pull Request a été fusionnée avec succès !
 pulls.data_broken=Les données de cette demande de rattachement ont été compromise en raison de la suppression d'informations sur l'embranchement.
 pulls.is_checking=La recherche de conflits est toujours en cours, veuillez rafraichir la page dans quelques instants.
-pulls.can_auto_merge_desc=Vous pouvez effectuer d'opération de fusion automatique sur cette demande de Pull Request.
-pulls.cannot_auto_merge_desc=Vous ne pouvez effectuer des opération de fusion automatique car il y a des conflits entre les Commits.
-pulls.cannot_auto_merge_helper=Veuillez utiliser l'outil en ligne de commande pour le résoudre.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Fusionner la Pull Request
 pulls.open_unmerged_pull_exists=`Vous ne pouvez effectuer une réouverture car il y a déjà une pull-request ouverte (#%d) depuis le même dépôt avec les mêmes informations de fusion et est en attente de fusion.`

@ -1018,7 +1022,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_commits=Comparer ces %d commits
+compare_commits=View comparison for these %d commits

 [tool]
 ago=auparavant
--- a/conf/locale/locale_it-IT.ini
+++ b/conf/locale/locale_it-IT.ini
@ -28,6 +28,7 @@ organization=Organizzazione
 mirror=Mirror
 new_repo=Nuovo Repository
 new_migrate=Nuova Migrazione
+new_mirror=New Mirror
 new_fork=Nuovo Fork Repository
 new_org=Nuova organizzazione
 manage_org=Gestisci le organizzazioni
@ -352,6 +353,8 @@ auto_init=Initialize this repository with selected files and template
 create_repo=Crea Repository
 default_branch=Ramo (Branch) predefinito
 mirror_interval=Intervallo Mirror (in ore)
+mirror_address=Mirror Address
+mirror_address_desc=Please include necessary user credentials in the address.
 watchers=Watchers
 stargazers=Stargazers
 forks=Forks
@ -369,6 +372,7 @@ migrate.permission_denied=You are not allowed to import local repositories.
 migrate.invalid_local_path=Percorso locale non valido, non esiste o non è una cartella.
 migrate.failed=Migration failed: %v

+mirror_from=mirror from
 forked_from=forkato da
 fork_from_self=Non puoi forkare il tuo stesso repository!
 copy_link=Copia
@ -506,9 +510,9 @@ pulls.merged=Merged
 pulls.has_merged=This pull request has been merged successfully!
 pulls.data_broken=Data of this pull request has been broken due to deletion of fork information.
 pulls.is_checking=The conflict checking is still in progress, please refresh page in few moments.
-pulls.can_auto_merge_desc=You can perform auto-merge operation on this pull request.
-pulls.cannot_auto_merge_desc=You can't perform auto-merge operation because there are conflicts between commits.
-pulls.cannot_auto_merge_helper=Please use command line tool to solve it.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Unisci Pull Request
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`

@ -1018,7 +1022,7 @@ comment_issue=`ha commentato il problema <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=ha trasferito il repository <code>%s</code> a <a href="%s">%s</a>
 push_tag=ha pushato il tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>
-compare_commits=Vedi confronto per questi %d commit
+compare_commits=View comparison for these %d commits

 [tool]
 ago=fa
--- a/conf/locale/locale_ja-JP.ini
+++ b/conf/locale/locale_ja-JP.ini
@ -28,6 +28,7 @@ organization=組織
 mirror=ミラー
 new_repo=新しいリポジトリ
 new_migrate=新しい移行
+new_mirror=New Mirror
 new_fork=新しいフォークのリポジトリ
 new_org=新しい組織
 manage_org=組織を管理
@ -352,6 +353,8 @@ auto_init=選択されたファイルおよびテンプレートでリポジト
 create_repo=リポジトリを作成
 default_branch=デフォルトのブランチ
 mirror_interval=ミラー 間隔(時)
+mirror_address=Mirror Address
+mirror_address_desc=Please include necessary user credentials in the address.
 watchers=ウォッチャー
 stargazers=Stargazers
 forks=フォーク
@ -367,8 +370,9 @@ migrate.clone_address=クローンアドレス
 migrate.clone_address_desc=これは、HTTP/HTTPS/GIT URL またはローカル サーバー パスを設定できます。
 migrate.permission_denied=ローカル リポジトリをインポートすることはできません。
 migrate.invalid_local_path=ローカルパスが無効です。存在しないかディレクトリではありません。
-migrate.failed=Migration failed: %v
+migrate.failed=移行に失敗しました: %v

+mirror_from=mirror from
 forked_from=フォーク元
 fork_from_self=すでにあなたの所有しているリポジトリはフォークできません
 copy_link=コピー
@ -388,7 +392,7 @@ create_new_repo_command=コマンドラインで新しいリポジトリを作
 push_exist_repo=コマンド ・ ラインから既存のリポジトリをプッシュ
 repo_is_empty=このリポジトリは空です、後で戻って来て下さい!

-code=Code
+code=コード
 branch=ブランチ
 tree=ツリー
 filter_branch_and_tag=ブランチまたはタグをフィルタリング
@ -457,7 +461,7 @@ issues.next=次ページ
 issues.open_title=オープン
 issues.closed_title=クローズ
 issues.num_comments=%d コメント
-issues.commented_at=`commented <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commented_at=`コメント <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.no_content=まだコンテンツがありません
 issues.close_issue=閉じる
 issues.close_comment_issue=コメントと閉じる
@ -506,9 +510,9 @@ pulls.merged=マージされた
 pulls.has_merged=このプルプルリクエストは正常にマージされました!
 pulls.data_broken=Data of this pull request has been broken due to deletion of fork information.
 pulls.is_checking=The conflict checking is still in progress, please refresh page in few moments.
-pulls.can_auto_merge_desc=You can perform auto-merge operation on this pull request.
-pulls.cannot_auto_merge_desc=You can't perform auto-merge operation because there are conflicts between commits.
-pulls.cannot_auto_merge_helper=それを解決するためにコマンド ライン ツールを使用してください。
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=プルリクエストをマージします。
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`

@ -541,7 +545,7 @@ 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=最初のページを作成する。
 wiki.page=ページ
-wiki.filter_page=Filter page
+wiki.filter_page=フィルターページ
 wiki.new_page=新しいページを作成
 wiki.default_commit_message=このアップデートについてメモを書く(オプション)
 wiki.save_page=ページを保存
@ -561,11 +565,11 @@ settings.basic_settings=基本設定
 settings.site=公式サイト
 settings.update_settings=設定の更新
 settings.change_reponame_prompt=この変更はリンクがリポジトリに関連付ける方法に影響します。
-settings.advanced_settings=Advanced Settings
+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.use_external_issue_tracker=外部課題トラッキングシステムを使用
+settings.tracker_url_format=外部課題トラッキングツール URLのフォーマット
 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=危険地帯
@ -577,7 +581,7 @@ settings.delete_desc=リポジトリを削除すると元に戻せません。
 settings.transfer_notices_1=-新しい所有者が個人ユーザーの場合、あなたがアクセスできなくなります。
 settings.transfer_notices_2=- You will conserve access if new owner is an organization and if you're one of the owners.
 settings.transfer_form_title=操作を確認するために、以下の情報を入力してください。
-settings.delete_notices_1=- This operation <strong>CANNOT</strong> be undone.
+settings.delete_notices_1=-この操作は<strong>元に戻せません</strong> 。
 settings.delete_notices_2=- This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators.
 settings.delete_notices_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.
@ -640,7 +644,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=コンテント
@ -669,7 +673,7 @@ release.edit=編集
 release.ahead=このリリース以降 %s へ <strong>%d</strong> コミット
 release.source_code=ソース コード
 release.new_subheader=Publish releases to iterate product.
-release.edit_subheader=Detailed change log can help users understand what has been improved.
+release.edit_subheader=詳細な変更ログは、ユーザーに何が改善されたかの理解を助けることができます。
 release.tag_name=タグ名
 release.target=ターゲット
 release.tag_helper=既存のタグを選択するか、新しいタグを作成し発行します。
@ -721,7 +725,7 @@ settings.location=ロケーション
 settings.update_settings=設定の更新
 settings.update_setting_success=組織の設定が更新されました。
 settings.change_orgname_prompt=This change will affect how links relate to the organization.
-settings.update_avatar_success=Organization avatar setting has been updated successfully.
+settings.update_avatar_success=組織のアバター画像が正常に更新されました。
 settings.delete=組織を削除
 settings.delete_account=この組織を削除
 settings.delete_prompt=操作はこの組織を完全に削除し、復旧<strong>できない</strong>！
@ -796,7 +800,7 @@ dashboard.delete_inactivate_accounts=非アクティブのアカウントをす
 dashboard.delete_inactivate_accounts_success=すべての非アクティブアカウントは正常に削除されました。
 dashboard.delete_repo_archives=リポジトリのすべてのアーカイブを削除
 dashboard.delete_repo_archives_success=リポジトリのすべてのアーカイブが正常に削除されました。
-dashboard.delete_missing_repos=Delete all repository records that lost Git files
+dashboard.delete_missing_repos=Gitファイルが失われたリポジトリのすべてのレコードを削除
 dashboard.delete_missing_repos_success=All repository records that lost Git files have been deleted successfully.
 dashboard.git_gc_repos=リポジトリでのガベージコレクションを実行します。
 dashboard.git_gc_repos_success=すべてのリポジトリは正常にガベージ コレクションを行いました。
@ -843,7 +847,7 @@ users.admin=アドミン
 users.repos=リポジトリ
 users.created=作成されました
 users.send_register_notify=登録通知をユーザーに送信
-users.new_success=New account '%s' has been created successfully.
+users.new_success=新規アカウント '%s' が正常に作成されました。
 users.edit=編集
 users.auth_source=認証ソース
 users.local=ローカル
@ -995,13 +999,13 @@ 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.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=説明
@ -1018,7 +1022,7 @@ comment_issue=`問題 <a href="%s/issues/%s">%s#%[2]s</a> のコメント`
 merge_pull_request=`プルリクエスト <a href="%s/pulls/%s"> %s[2]s</a>をマージしました`
 transfer_repo=リポジトリ <code>%s</code> を <a href="%s">%s</a> へ転送しました
 push_tag=<a href="%[1]s">%[3]s</a> に タグ <a href="%[1]s/src/%[2]s">%[2]s</a> をプッシュしました
-compare_commits=これら %d のコミットの比較を閲覧する
+compare_commits=View comparison for these %d commits

 [tool]
 ago=前
--- a/conf/locale/locale_lv-LV.ini
+++ b/conf/locale/locale_lv-LV.ini
@ -28,6 +28,7 @@ organization=Organizācija
 mirror=Spogulis
 new_repo=Jauns repozitorijs
 new_migrate=Jauna migrācija
+new_mirror=New Mirror
 new_fork=Jauns atdalītais repozitorijs
 new_org=Jauna organizācija
 manage_org=Pārvaldīt organizācijas
@ -352,6 +353,8 @@ auto_init=Inicializēt šo repozitoriju ar izvēlētajiem failiem un sagatavi
 create_repo=Izveidot repozitoriju
 default_branch=Noklusējuma atzars
 mirror_interval=Spoguļošanas intervāls (stundās)
+mirror_address=Mirror Address
+mirror_address_desc=Please include necessary user credentials in the address.
 watchers=Novērotāji
 stargazers=Zvaigžņdevēji
 forks=Atdalītie repozitoriji
@ -369,6 +372,7 @@ migrate.permission_denied=Jums nav tiesību importēt lokālu repozitoriju.
 migrate.invalid_local_path=Nekorents lokālais ceļš, tas neeksistē vai nav direktorijs.
 migrate.failed=Migrācija neizdevās: %v

+mirror_from=mirror from
 forked_from=atdalīts no
 fork_from_self=Nav iespējams atdalīt repozitoriju, kuram esat īpašnieks!
 copy_link=Kopēt
@ -506,9 +510,9 @@ pulls.merged=Sapludināts
 pulls.has_merged=Šo izmaiņu pieprasījums tika veiksmīgi sapludināts!
 pulls.data_broken=Nepieejami izmaiņu pieprasījuma dati, jo dzēsta informācija no atdalītā repozitorija.
 pulls.is_checking=Notiek konfliktu pārbaude, mirkli uzgaidiet un atjaunojiet lapu.
-pulls.can_auto_merge_desc=Ir iespējams veikt automātisko sapludināšanas darbību šim izmaiņu pieprasījumam.
-pulls.cannot_auto_merge_desc=Nav iespējams veikt automātisko sapludināšanas darbību, jo starp revīzijām ir konflikti.
-pulls.cannot_auto_merge_helper=Lūdzu, izmantojiet komandrindas rīku, lai to atrisinātu.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Izmaiņu pieprasījuma sapludināšana
 pulls.open_unmerged_pull_exists=`Jūs nevarat veikt atkārtotas atvēršanas darbību, jo jau eksistē izmaiņu pieprasījums (#%d) no šī repozitorija ar tādu pašu sapludināšanas informāciju un gaida sapludināšanu.`

@ -1018,7 +1022,7 @@ comment_issue=`pievienoja komentāru problēmai <a href="%s/issues/%s">%s#%[2]s<
 merge_pull_request=`sapludināja izmaiņu pieprasījumu <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=mainīja repozitorija <code>%s</code> īpašnieku uz <a href="%s">%s</a>
 push_tag=pievienoja tagu <a href="%s/src/%s">%[2]s</a> repozitorijam <a href="%[1]s">%[3]s</a>
-compare_commits=Veikt salīdzināšanu starp šīm %d revīzijām
+compare_commits=View comparison for these %d commits

 [tool]
 ago=atpakaļ
--- a/conf/locale/locale_nl-NL.ini
+++ b/conf/locale/locale_nl-NL.ini
@ -28,6 +28,7 @@ organization=Organisatie
 mirror=Spiegel
 new_repo=Nieuwe repositorie
 new_migrate=Nieuwe migratie
+new_mirror=New Mirror
 new_fork=Nieuwe vork Repository
 new_org=Nieuwe organisatie
 manage_org=Beheer organisaties
@ -352,6 +353,8 @@ auto_init=Initialiseer deze repositorie met de geselecteerde bestanden en sjablo
 create_repo=Nieuwe Repositorie
 default_branch=Standaard branch
 mirror_interval=Mirror interval(uur)
+mirror_address=Mirror Address
+mirror_address_desc=Please include necessary user credentials in the address.
 watchers=Watchers
 stargazers=Stargazers
 forks=Forks
@ -369,6 +372,7 @@ migrate.permission_denied=You are not allowed to import local repositories.
 migrate.invalid_local_path=Ongeldig lokaal pad, het pad bestaat niet of het is geen map.
 migrate.failed=Migration failed: %v

+mirror_from=mirror from
 forked_from=geforked van
 fork_from_self=U kunt geen repository forken die u al beheert!
 copy_link=Kopieer
@ -506,9 +510,9 @@ pulls.merged=Merged
 pulls.has_merged=This pull request has been merged successfully!
 pulls.data_broken=Data of this pull request has been broken due to deletion of fork information.
 pulls.is_checking=The conflict checking is still in progress, please refresh page in few moments.
-pulls.can_auto_merge_desc=You can perform auto-merge operation on this pull request.
-pulls.cannot_auto_merge_desc=You can't perform auto-merge operation because there are conflicts between commits.
-pulls.cannot_auto_merge_helper=Please use command line tool to solve it.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Samenvoegen van pull verzoek
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`

@ -1018,7 +1022,7 @@ 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>`
 transfer_repo=repositorie verplaatst naar <code>%s</code> naar <a href="%s">%s</a>
 push_tag=geduwd label <a href="%s/src/%s"> %[2]s</a> naar <a href="%[1]s"> %[3]s</a>
-compare_commits=Weergave vergelijking voor deze %d commits
+compare_commits=View comparison for these %d commits

 [tool]
 ago=geleden
--- a/conf/locale/locale_pl-PL.ini
+++ b/conf/locale/locale_pl-PL.ini
@ -28,6 +28,7 @@ organization=Organizacja
 mirror=Mirror
 new_repo=Nowe repozytorium
 new_migrate=Nowa migracja
+new_mirror=New Mirror
 new_fork=Forkuj repozytorium
 new_org=Nowa organizacja
 manage_org=Zarządzaj organizacjami
@ -352,6 +353,8 @@ auto_init=Initialize this repository with selected files and template
 create_repo=Utwórz repozytorium
 default_branch=Domyślna gałąź
 mirror_interval=Odświeżanie mirrorów (godziny)
+mirror_address=Mirror Address
+mirror_address_desc=Please include necessary user credentials in the address.
 watchers=Watchers
 stargazers=Stargazers
 forks=Forks
@ -369,6 +372,7 @@ migrate.permission_denied=You are not allowed to import local repositories.
 migrate.invalid_local_path=Ścieżka jest niepoprawna. Nie istnieje lub nie jest katalogiem.
 migrate.failed=Migration failed: %v

+mirror_from=mirror from
 forked_from=sklonowany z
 fork_from_self=You cannot fork a repository you already own!
 copy_link=Kopiuj
@ -506,9 +510,9 @@ pulls.merged=Scalone
 pulls.has_merged=This pull request has been merged successfully!
 pulls.data_broken=Data of this pull request has been broken due to deletion of fork information.
 pulls.is_checking=The conflict checking is still in progress, please refresh page in few moments.
-pulls.can_auto_merge_desc=You can perform auto-merge operation on this pull request.
-pulls.cannot_auto_merge_desc=You can't perform auto-merge operation because there are conflicts between commits.
-pulls.cannot_auto_merge_helper=Please use command line tool to solve it.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Scal Pull Request
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`

@ -1018,7 +1022,7 @@ comment_issue=`skomentował problem <a href="%s/issues/%s">#%[2]s %[3]s</a>`
 merge_pull_request=scalił pull request <a href="%s/pulls/%s"> %s #%[2]s"</a>
 transfer_repo=przeniósł repozytorium <code>%s</code> do <a href="%s">%s</a>
 push_tag=opublikował tag <a href="%s/src/%s">%[2]s</a> w <a href="%[1]s">%[3]s</a>
-compare_commits=Zobacz porównanie tych %d commitów
+compare_commits=View comparison for these %d commits

 [tool]
 ago=temu
--- a/conf/locale/locale_pt-BR.ini
+++ b/conf/locale/locale_pt-BR.ini
@ -28,6 +28,7 @@ organization=Organização
 mirror=Espelho
 new_repo=Novo Repositório
 new_migrate=Nova Migração
+new_mirror=New Mirror
 new_fork=Novo Fork de Repositório
 new_org=Nova Organização
 manage_org=Gerenciar Organizações
@ -352,6 +353,8 @@ auto_init=Inicializar este repositório com os arquivos selecionados e modelo
 create_repo=Criar Repositório
 default_branch=Branch padrão
 mirror_interval=Intervalo de Espelho (hora)
+mirror_address=Endereço do espelho
+mirror_address_desc=Por favor, inclua as credenciais do usuário necessários no endereço.
 watchers=Observadores
 stargazers=Usuários que estrelaram
 forks=Forks
@ -369,6 +372,7 @@ migrate.permission_denied=Você não pode importar repositórios locais.
 migrate.invalid_local_path=Caminho local inválido, não existe ou não é um diretório.
 migrate.failed=Migração falhou: %v

+mirror_from=espelho de
 forked_from=forkado de
 fork_from_self=Você não pode criar fork de um repositório que já é seu!
 copy_link=Copiar
@ -388,7 +392,7 @@ create_new_repo_command=Criar um novo repositório na linha de comando
 push_exist_repo=Push um repositório existente na linha de comando
 repo_is_empty=Este repositório está vazio, por favor volte mais tarde!

-code=Code
+code=Código
 branch=Branch
 tree=Árvore
 filter_branch_and_tag=Filtrar branch ou tag
@ -506,9 +510,9 @@ 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=Você pode realizar uma auto-mescla neste pull request.
-pulls.cannot_auto_merge_desc=Você não pode realizar uma auto-mescla porque há conflitos entre os commits.
-pulls.cannot_auto_merge_helper=Por favor, utilize linha de comando para solucionar isto.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Merge Pull Request
 pulls.open_unmerged_pull_exists=' Você não pode executar a operação de reabrir porque já existe uma solicitação de pull aberta (#%d) do mesmo repositório com as mesmas informações de merge e está esperando pelo merge.'

@ -537,20 +541,20 @@ milestones.deletion_desc=Excluir este marco removerá a informação dele em tod
 milestones.deletion_success=Marco excluído com sucesso!

 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=Bem-vindo ao wiki!
+wiki.welcome_desc=Wiki é o lugar onde você gostaria de documentar o seu projeto em conjunto e torná-lo melhor.
+wiki.create_first_page=Criar a primeira página
+wiki.page=Página
+wiki.filter_page=Filtrar página
+wiki.new_page=Criar nova página
+wiki.default_commit_message=Escrever um comentário sobre esta atualização (opcional).
+wiki.save_page=Salvar página
+wiki.last_commit_info=%s editou esta página %s
+wiki.edit_page_button=Editar
+wiki.new_page_button=Nova página
+wiki.page_already_exists=já existe uma página de wiki com o mesmo nome.
+wiki.pages=Páginas
+wiki.last_updated=Última atualização %s

 settings=Configurações
 settings.options=Opções
@ -561,13 +565,13 @@ settings.basic_settings=Configurações Básicas
 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.advanced_settings=Configurações avançadas
+settings.wiki_desc=Habilitar o wiki para permitir que as pessoas escrevam documentos
+settings.issues_desc=Habilitar gerenciamento de "problemas" nativo
+settings.use_external_issue_tracker=Usar issue tracker externo
+settings.tracker_url_format=Formato de URL do issue tracker externo
+settings.tracker_url_format_desc=Você pode usar o espaço reservado <code>{user} {repo} {index}</code> para o nome do usuário, índice de nome e a questão do repositório.
+settings.pulls_desc=Habilitar pull requests para aceitar contribuições públicas
 settings.danger_zone=Zona de Perigo
 settings.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.
@ -582,7 +586,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.deletion_success=Repositório excluído com sucesso!
 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
@ -598,9 +602,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.test_delivery=Entrega de teste
+settings.webhook.test_delivery_desc=Enviar uma entrega de evento de push falso para testar suas configurações de webhook
+settings.webhook.test_delivery_success=O teste webhook foi adicionado para a fila de entrega. Pode demorar alguns segundos antes de ser exibido no histórico de entrega.
 settings.webhook.request=Solicitação
 settings.webhook.response=Resposta
 settings.webhook.headers=Cabeçalhos
@ -640,7 +644,7 @@ settings.slack_domain=Domínio
 settings.slack_channel=Canal
 settings.deploy_keys=Chaves de Deploy
 settings.add_deploy_key=Nova chave
-settings.deploy_key_desc=Deploy key only has read-only access. It is not same as personal account SSH keys.
+settings.deploy_key_desc=Chave de deploy só tem acesso somente leitura. Não é igual as chaves SSH de conta pessoal.
 settings.no_deploy_keys=Você ainda não adicionou chaves para implantação de software.
 settings.title=Título
 settings.deploy_key_content=Conteúdo da chave
@ -890,8 +894,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_username=Atributo nome de usuário
+auths.attribute_username_placeholder=Deixe vazio para usar o valor do campo de formulário de entrada de nome de usuário.
 auths.attribute_name=Atributo primeiro nome
 auths.attribute_surname=Atributo sobrenome
 auths.attribute_mail=Atributo e-mail
@ -995,18 +999,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.view_detail_header=Ver detalhe do anúncio
+notices.actions=Ações
+notices.select_all=Selecionar tudo
+notices.deselect_all=Desmarcar tudo
+notices.inverse_selection=Seleção inversa
+notices.delete_selected=Apagar seleção
+notices.delete_all=Excluir todos os avisos
 notices.type=Tipo
 notices.type_1=Repositório
 notices.desc=Descrição
 notices.op=Op.
-notices.delete_success=System notices have been deleted successfully.
+notices.delete_success=Avisos do sistema foram excluídos com sucesso.

 [action]
 create_repo=repositório criado <a href="%s"> %s</a>
@ -1018,7 +1022,7 @@ comment_issue='comentou sobre a questão <a href="%s/issues/%s">%s#%[2]s</a>'
 merge_pull_request=`mesclou o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=repositório transferido de <code>%s</code> para <a href="%s">%s</a>
 push_tag=Foi feito push na tag <a href="%s/src/%s">%[2]s</a> para <a href="%[1]s">%[3]s</a>
-compare_commits=Ver comparação desses %d commits
+compare_commits=View comparison for these %d commits

 [tool]
 ago=atrás
--- a/conf/locale/locale_ru-RU.ini
+++ b/conf/locale/locale_ru-RU.ini
@ -28,6 +28,7 @@ organization=Организация
 mirror=Зеркало
 new_repo=Новый репозиторий
 new_migrate=Новая Миграция
+new_mirror=New Mirror
 new_fork=Новый проект из репозитория
 new_org=Новая Организация
 manage_org=Управление Организацией
@ -38,7 +39,7 @@ your_profile=Ваш профиль
 your_settings=Ваши настройки

 news_feed=Лента новостей
-pull_requests=Пулл-реквесты
+pull_requests=Pull Requests
 issues=Вопросы

 cancel=Отмена
@ -312,7 +313,7 @@ unbind=Отвязать
 unbind_success=Социальная учетная запись отвязана.

 manage_access_token=Управление Токенами Персонального Доступа
-generate_new_token=Создать новый токен
+generate_new_token=Создать новый token
 tokens_desc=Созданные вами токены могут использоваться для доступа к Gogs API.
 new_token_desc=Пока что каждый токен будет иметь полный доступ к вашей учетной записи.
 token_name=Имя маркера
@ -352,6 +353,8 @@ auto_init=Инициализировать этот репозиторий вы
 create_repo=Создать репозиторий
 default_branch=Ветка по умолчанию
 mirror_interval=Интервал зеркалирования (час)
+mirror_address=Mirror Address
+mirror_address_desc=Please include necessary user credentials in the address.
 watchers=Наблюдатели
 stargazers=Звездочеты
 forks=Форки
@ -369,6 +372,7 @@ migrate.permission_denied=У вас нет прав на импорт локал
 migrate.invalid_local_path=Недопустимый локальный путь. Возможно он не существует или является не папкой.
 migrate.failed=Миграция не удалась: %v

+mirror_from=mirror from
 forked_from=форк от
 fork_from_self=Вы не можете форкнуть репозитарий, так как Вы уже его владелец!
 copy_link=Скопировать
@ -388,7 +392,7 @@ create_new_repo_command=Создать новый репозиторий из к
 push_exist_repo=Отправить существующий репозиторий из командной строки
 repo_is_empty=Этот репозиторий пуст, пожалуйста, возвращайтесь позже!

-code=Code
+code=Код
 branch=Ветка
 tree=Дерево
 filter_branch_and_tag=Фильтр по ветке или тегу
@ -506,9 +510,9 @@ pulls.merged=Слито
 pulls.has_merged=Слияние этого пулл-реквеста успешно завершено!
 pulls.data_broken=Содержимое этого пулл-реквеста было нарушено, вследствии удаления или клонирования информации.
 pulls.is_checking=Продолжается проверка конфликтов, пожалуйста обновите страницу несколько позже.
-pulls.can_auto_merge_desc=Вы можете провести операцию автоматического слияния для этого пулл-реквеста.
-pulls.cannot_auto_merge_desc=Вы не можете произвести операцию автоматического слияния, потому как существуют конфликты между коммитами.
-pulls.cannot_auto_merge_helper=Используйте командную строку для решения этого.
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
 pulls.merge_pull_request=Слить пулл-реквест
 pulls.open_unmerged_pull_exists=`Вы не можете произвести операцию переоткрытия, потому что уже существует пулл-реквест (#%d) из этого же репозитория, с такими же параметрами слияния, который ожидает слияния.`

@ -561,13 +565,13 @@ settings.basic_settings=Основные параметры
 settings.site=Официальный сайт
 settings.update_settings=Обновить настройки
 settings.change_reponame_prompt=Это изменение повлияет на отношения ссылок к этому репозиторию.
-settings.advanced_settings=Advanced Settings
+settings.advanced_settings=Расширенные настройки
 settings.wiki_desc=Включить Вики, чтобы позволить людям ипсать документы
 settings.issues_desc=Включить встроенную, легковесную систему отслеживания ошибок
 settings.use_external_issue_tracker=Использовать внешнюю систему отслеживания ошибок
 settings.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.tracker_url_format_desc=Вы можете использовать шаблон <code>{user} {repo} {index}</code> для имени пользователя, репозитория и номера обсуждения.
+settings.pulls_desc=Включить публичные пулл-реквесты
 settings.danger_zone=Опасная зона
 settings.transfer=Передать права собственности
 settings.transfer_desc=Передать репозиторий другому пользователю или организации где у вас есть права администратора.
@ -593,7 +597,7 @@ settings.add_collaborator_success=Был добавлен новый соавт
 settings.remove_collaborator_success=Соавтор был удален.
 settings.search_user_placeholder=Поиск пользователя...
 settings.user_is_org_member=Пользователь является членом организации,  члены которой не могут быть добавлены в качестве соавтора.
-settings.add_webhook=Добавить веб-хук
+settings.add_webhook=Добавить Webhook
 settings.hooks_desc=Webhooks позволяют внешним службам получать уведомления при возникновении определенных событий на Gogs. При возникновении указанных событий мы отправим запрос POST на каждый заданный вами URL. Узнать больше можно в нашем <a target="_blank" href="%s">Руководстве по Webhooks</a>.
 settings.webhook_deletion=Удалить веб-хук
 settings.webhook_deletion_desc=Удаление этого веб-хука приведет к удалению всей, связанной с ним, информации, включая историю. Хотите продолжить?
@ -608,9 +612,9 @@ settings.webhook.payload=Содержимое запроса
 settings.webhook.body=Тело ответа
 settings.githooks_desc=Git-хуки предоставляются Git самим по себе, вы можете изменять файлы поддерживаемых хуков из списка ниже чтобы выполнять внешние операции.
 settings.githook_edit_desc=Если хук не активен, будет подставлен пример содержимого. Пустое значение в этом поле приведет к отключению хука.
-settings.githook_name=Название веб-хукa
+settings.githook_name=Название Hook'a
 settings.githook_content=Перехватить содержание
-settings.update_githook=Обновить хук
+settings.update_githook=Обновить Hook
 settings.add_webhook_desc=Мы отправим запрос <code>POST</code> на указанный ниже URL с информацией о событиях. Можно также указать формат, в котором вы бы хотели получить данные (JSON, <code>x-www-form-urlencoded</code>, <em>и т.д.</em>). Дополнительную информацию можно найти в <a target="_blank" href="%s">Руководстве по Webhook</a>.
 settings.payload_url=URL обработчика
 settings.content_type=Тип содержимого
@ -618,7 +622,7 @@ settings.secret=Secret
 settings.slack_username=Имя пользователя
 settings.slack_icon_url=URL иконки
 settings.slack_color=Цвет
-settings.event_desc=На какие события этот веб-хук должен срабатывать?
+settings.event_desc=На какие события этот webhook должен срабатывать?
 settings.event_push_only=Просто  <code>push</code> событие.
 settings.event_send_everything=Мне нужно <strong>все</strong>.
 settings.event_choose=Позвольте мне выбрать то, что нужно.
@ -628,14 +632,14 @@ settings.event_push=Push
 settings.event_push_desc=Push в репозиторий
 settings.active=Активен
 settings.active_helper=Подробности о событии, вызвавшем срабатывание хука, также будут предоставлены.
-settings.add_hook_success=Был добавлен новый веб-хук.
-settings.update_webhook=Обновление веб-хука
-settings.update_hook_success=Веб-хук обновлен.
+settings.add_hook_success=Был добавлен новый webhook.
+settings.update_webhook=Обновление Webhook
+settings.update_hook_success=Webhook обновлен.
 settings.delete_webhook=Удалить автоматическое обновление
 settings.recent_deliveries=Недавние рассылки
 settings.hook_type=Тип перехватчика
 settings.add_slack_hook_desc=Добавить интеграцию с <a href="%s">Slack</a> в ваш репозиторий.
-settings.slack_token=Токен
+settings.slack_token=Token
 settings.slack_domain=Домен
 settings.slack_channel=Канал
 settings.deploy_keys=Ключи развертывания
@ -890,7 +894,7 @@ auths.bind_password=Привязать пароль
 auths.bind_password_helper=Внимание: Этот пароль сохранен в небезопасном виде. Не используйте высоко-привилегированную учетную запись.
 auths.user_base=База для поиска пользователя
 auths.user_dn=DN пользователя
-auths.attribute_username=Username attribute
+auths.attribute_username=Атрибут username
 auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
 auths.attribute_name=Имя аттрибута
 auths.attribute_surname=Фамилия аттрибута
@ -995,18 +999,18 @@ monitor.start=Момент начала
 monitor.execute_time=Время выполнения

 notices.system_notice_list=Система уведомлений
-notices.view_detail_header=View Notice Detail
+notices.view_detail_header=Подробности уведомления
 notices.actions=Действия
 notices.select_all=Выбрать всё
 notices.deselect_all=Убрать выделение со всего
 notices.inverse_selection=Инверсия выделения
 notices.delete_selected=Удалить выбранные
-notices.delete_all=Delete All Notices
+notices.delete_all=Удалить все уведомления
 notices.type=Тип
 notices.type_1=Репозиторий
 notices.desc=Описание
 notices.op=Op.
-notices.delete_success=System notices have been deleted successfully.
+notices.delete_success=Системное уведомление успешно удалено.

 [action]
 create_repo=создан репозиторий <a href="%s"> %s</a>
@ -1018,7 +1022,7 @@ comment_issue=`прокомментировал(а) вопрос <a href="%s/iss
 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>
-compare_commits=Просмотреть сравнение %d коммитов
+compare_commits=View comparison for these %d commits

 [tool]
 ago=назад
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@ -28,6 +28,7 @@ organization=组织
 mirror=镜像
 new_repo=创建新的仓库
 new_migrate=迁移外部仓库
+new_mirror=创建新的镜像
 new_fork=创建新的派生仓库
 new_org=创建新的组织
 manage_org=管理我的组织
@ -352,6 +353,8 @@ auto_init=使用选定的文件和模板初始化仓库
 create_repo=创建仓库
 default_branch=默认分支
 mirror_interval=镜像同步周期（小时）
+mirror_address=镜像地址
+mirror_address_desc=请在镜像地址中写入必要的用户凭据信息。
 watchers=关注者
 stargazers=称赞者
 forks=派生仓库
@ -369,6 +372,7 @@ migrate.permission_denied=您没有获得导入本地仓库的权限。
 migrate.invalid_local_path=无效的本地路径，不存在或不是一个目录！
 migrate.failed=迁移失败：%v

+mirror_from=镜像自地址
 forked_from=派生自
 fork_from_self=无法派生已经拥有的仓库！
 copy_link=复制链接
@ -506,9 +510,9 @@ pulls.merged=已合并
 pulls.has_merged=该合并请求已经成功合并！
 pulls.data_broken=该合并请求的数据由于派生仓库的相关信息被删除而被破坏。
 pulls.is_checking=该合并请求正在进行冲突检查，请稍后再刷新页面。
-pulls.can_auto_merge_desc=您可以实现该合并请求的自动合并操作。
-pulls.cannot_auto_merge_desc=因为代码提交存在冲突，您无法对该合并请求执行自动合并操作。
-pulls.cannot_auto_merge_helper=请使用命令行工具来解决冲突。
+pulls.can_auto_merge_desc=该合并请求可以进行自动合并操作。
+pulls.cannot_auto_merge_desc=该合并请求存在冲突，无法进行自动合并操作。
+pulls.cannot_auto_merge_helper=请手动拉取代码变更以解决冲突。
 pulls.merge_pull_request=合并请求
 pulls.open_unmerged_pull_exists=`由于已经存在来自相同仓库和合并信息的未合并请求（#%d），您无法执行重新开启操作。`

@ -1018,7 +1022,7 @@ 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>
-compare_commits=查看 %d 次提交的内容对比
+compare_commits=对比 %d 次代码提交

 [tool]
 ago=之前
--- a/conf/locale/locale_zh-HK.ini
+++ b/conf/locale/locale_zh-HK.ini
@ -28,6 +28,7 @@ organization=組織
 mirror=鏡像
 new_repo=創建新的倉庫
 new_migrate=遷移外部倉庫
+new_mirror=New Mirror
 new_fork=新的派生倉庫
 new_org=創建新的組織
 manage_org=管理我的組織
@ -53,8 +54,8 @@ code=程式碼
 [install]
 install=安裝頁面
 title=首次執行安裝程序
-docker_helper=If you're running Gogs inside Docker, please read <a target="_blank" href="%s">Guidelines</a> carefully before you change anything in this page!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3 or TiDB.
+docker_helper=如果您正在使用 Docker 容器運行 Gogs，請務必先仔細閱讀 <a target="_blank" href="%s">官方文檔</a> 後再對本頁面進行填寫。
+requite_db_desc=Gogs 要求安裝 MySQL、PostgreSQL、SQLite3 或 TiDB。
 db_title=數據庫設置
 db_type=數據庫類型
 host=數據庫主機
@ -64,11 +65,11 @@ db_name=數據庫名稱
 db_helper=如果您使用 MySQL，請使用 INNODB 引擎以及 utf8_general_ci 字符集。
 ssl_mode=SSL 模式
 path=數據庫文件路徑
-sqlite_helper=The file path of SQLite3 or TiDB database.
-err_empty_db_path=SQLite3 or TiDB database path cannot be empty.
-err_invalid_tidb_name=TiDB database name does not allow characters "." and "-".
-no_admin_and_disable_registration=You cannot disable registration without creating an admin account.
-err_empty_admin_password=Admin password cannot be empty.
+sqlite_helper=SQLite3 或 TiDB 的數據庫路徑。
+err_empty_db_path=SQLite3 或 TiDB 的數據庫路徑不能為空。
+err_invalid_tidb_name=TiDB 數據庫名稱不允許包含字符 "." 或 "-" 。
+no_admin_and_disable_registration=您不能夠在未創建管理員用戶的情況下禁止註冊。
+err_empty_admin_password=管理員密碼不能為空。

 general_title=應用基本設置
 app_name=應用名稱
@ -102,8 +103,8 @@ disable_gravatar=禁用 Gravatar 服務
 disable_gravatar_popup=禁用 Gravatar 和自定義源，僅使用由用戶上傳或默認的頭像。
 disable_registration=禁止用戶自主註冊
 disable_registration_popup=禁止用戶自主註冊功能，只有管理員可以添加帳號。
-enable_captcha=Enable Captcha
-enable_captcha_popup=Require validate captcha for user self-registration.
+enable_captcha=啟用驗證碼服務
+enable_captcha_popup=要求在用戶註冊時輸入驗證碼
 require_sign_in_view=啓用登錄訪問限制
 require_sign_in_view_popup=只有已登錄的用戶才能夠訪問頁面，否則將只能看到登錄或註冊頁面。
 admin_setting_desc=創建管理員帳號並不是必須的，因為 ID=1 的用戶將自動獲得管理員權限。
@ -111,7 +112,7 @@ admin_title=管理員帳號設置
 admin_name=管理員用戶名
 admin_password=管理員密碼
 confirm_password=確認密碼
-admin_email=Admin Email
+admin_email=管理員郵箱
 install_gogs=立即安裝
 test_git_failed=無法識別 'git' 命令：%v
 sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s 下載官方構建版，而不是 gobuild 版本。
@ -160,11 +161,11 @@ reset_password_helper=單擊此處重置密碼
 password_too_short=密碼長度不能少於 6 位！

 [mail]
-activate_account=Please activate your account
-activate_email=Verify your email address
-reset_password=Reset your password
-register_success=Registration successful, welcome
-register_notify=Welcome on board
+activate_account=請激活您的帳戶
+activate_email=請驗證您的郵箱地址
+reset_password=重置密碼
+register_success=註冊成功，歡迎使用
+register_notify=歡迎使用

 [modal]
 yes=確認操作
@ -192,7 +193,7 @@ min_size_error=長度最小為 %s 個字符。
 max_size_error=長度最大為 %s 個字符。
 email_error=不是一個有效的郵箱地址。
 url_error=不是一個有效的 URL。
-include_error=` must contain substring '%s'.`
+include_error=必須包含子字符串 '%s'。
 unknown_error=未知錯誤：
 captcha_incorrect=驗證碼未匹配。
 password_not_match=密碼與確認密碼未匹配。
@ -253,7 +254,7 @@ location=所在地區
 update_profile=更新信息
 update_profile_success=您的個人信息更新成功！
 change_username=用戶名將被修改
-change_username_prompt=This change will affect the way how links relate to your account.
+change_username_prompt=該操作將會影響到所有與您帳戶有關的鏈接
 continue=繼續操作
 cancel=取消操作

@ -268,7 +269,7 @@ update_avatar_success=您的頭像設置更新成功！
 change_password=修改密碼
 old_password=當前密碼
 new_password=新的密碼
-retype_new_password=Retype New Password
+retype_new_password=重新輸入新的密碼
 password_incorrect=當前密碼不正確！
 change_password_success=密碼修改成功！您現在可以使用新的密碼登錄。

@ -278,9 +279,9 @@ email_desc=您的主要邮箱地址将被用于通知提醒和其它操作。
 primary=主要
 primary_email=设为主要
 delete_email=刪除
-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!
+email_deletion=刪除郵箱
+email_deletion_desc=刪除該郵箱地址將會移除所有相關的信息。是否繼續?
+email_deletion_success=成功刪除郵箱！
 add_new_email=添加新的電子郵件地址
 add_email=添加電子郵件
 add_email_confirmation_sent=一封待確認的電子郵件已發送到 '%s'，請在%d 小時內檢查您的收件箱，並完成確認過程。
@ -335,7 +336,7 @@ repo_name=倉庫名稱
 repo_name_helper=偉大的倉庫名稱一般都較短、令人深刻並且 <strong>獨一無二</strong> 的。
 visibility=可見度
 visiblity_helper=該倉庫為 <span class="ui red text">私有的</span>
-visiblity_helper_forced=Site admin has forced all new repositories to be <span class="ui red text">Private</span>
+visiblity_helper_forced=網站管理員已強制要求所有新建倉庫必須為 <span class="ui red text">私有的</span>
 visiblity_fork_helper=（修改該值將會影響到所有派生倉庫）
 clone_helper=不知道如何操作？訪問 <a target="_blank"href="%s"> 帮助説明</a> ！
 fork_repo=派生倉庫
@ -343,18 +344,20 @@ fork_from=派生自
 fork_visiblity_helper=派生倉庫無法修改可見性。
 repo_desc=倉庫描述
 repo_lang=倉庫語言
-repo_lang_helper=Select .gitignore files
+repo_lang_helper=請選擇 .gitignore 文件
 license=授權許可
 license_helper=請選擇授權許可文件
 readme=Readme
-readme_helper=Select a readme template
-auto_init=Initialize this repository with selected files and template
+readme_helper=請選擇readme模板
+auto_init=使用選定的文件和模板初始化倉庫
 create_repo=創建倉庫
 default_branch=默認分支
 mirror_interval=鏡像同步周期（小時）
-watchers=Watchers
-stargazers=Stargazers
-forks=Forks
+mirror_address=Mirror Address
+mirror_address_desc=Please include necessary user credentials in the address.
+watchers=關注者
+stargazers=稱讚者
+forks=派生倉庫

 form.name_reserved=倉庫名稱 '%s' 是被保留的。
 form.name_pattern_not_allowed=倉庫名稱不允許 '%s' 的格式。
@ -365,15 +368,16 @@ migrate_type_helper=該倉庫將是一個 <span class="text blue">鏡像</span>
 migrate_repo=遷移倉庫
 migrate.clone_address=複製地址
 migrate.clone_address_desc=該地址可以是 HTTP/HTTPS/GIT URL 或本地服務器路徑。
-migrate.permission_denied=You are not allowed to import local repositories.
+migrate.permission_denied=您並沒有導入本地倉庫的權限。
 migrate.invalid_local_path=無效的本地路徑，該路徑不存在或不是一個目錄！
-migrate.failed=Migration failed: %v
+migrate.failed=遷移失敗：%v

+mirror_from=mirror from
 forked_from=派生自
 fork_from_self=無法派生已經擁有的倉庫！
 copy_link=複製連結
-copy_link_success=Copied!
-copy_link_error=Press ⌘-C or Ctrl-C to copy
+copy_link_success=複製成功！
+copy_link_error=請按下 ⌘-C 或 Ctrl-C 複製
 copied=複製成功
 unwatch=取消關註
 watch=關註
@ -386,16 +390,16 @@ quick_guide=快速幫助
 clone_this_repo=複製當前倉庫
 create_new_repo_command=從命令行創建一個新的倉庫
 push_exist_repo=從命令行推送已經創建的倉庫
-repo_is_empty=This repository is empty, please come back later!
+repo_is_empty=這倉庫不包含任何內容，請稍後再訪問！

-code=Code
+code=代碼
 branch=分支
 tree=目錄樹
-filter_branch_and_tag=Filter branch or tag
+filter_branch_and_tag=過濾分支或標籤
 branches=分支列表
 tags=標籤列表
 issues=問題管理
-pulls=Pull Requests
+pulls=合併請求
 labels=標籤
 milestones=里程碑
 commits=提交歷史
@ -450,7 +454,7 @@ issues.filter_sort.recentupdate=最近更新
 issues.filter_sort.leastupdate=最少更新
 issues.filter_sort.mostcomment=最多評論
 issues.filter_sort.leastcomment=最少評論
-issues.opened_by=opened %[1]s by <a href="%[2]s">%[3]s</a>
+issues.opened_by=由 <a href="%[2]s">%[3]s</a> 與 %[1]s創建
 issues.opened_by_fake=由 %[2]s 於 %[1]s創建
 issues.previous=上一頁
 issues.next=下一頁
@ -466,7 +470,7 @@ issues.reopen_comment_issue=重新開啟及評論
 issues.create_comment=評論
 issues.closed_at=`於 <a id="%[1]s" href="#%[1]s">%[2]s</a> 關閉`
 issues.reopened_at=`於 <a id="%[1]s" href="#%[1]s">%[2]s</a> 重新開啟`
-issues.commit_ref_at=`referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at=`在代碼提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 中引用了該問題`
 issues.poster=發佈者
 issues.admin=管理員
 issues.owner=所有者
@ -486,31 +490,31 @@ issues.label_deletion=刪除標籤
 issues.label_deletion_desc=刪除該標籤將會移除所有問題中相關的訊息。是否繼續？
 issues.label_deletion_success=標籤刪除成功!

-pulls.new=New Pull Request
+pulls.new=創建合併請求
 pulls.compare_changes=對比文件變化
 pulls.compare_changes_desc=對比兩個分支間的文件變化及發起一個合併請求。
-pulls.compare_base=base
-pulls.compare_compare=compare
-pulls.filter_branch=Filter branch
+pulls.compare_base=基準分支
+pulls.compare_compare=對比文件變化
+pulls.filter_branch=過濾分支
 pulls.no_results=未找到結果
-pulls.nothing_to_compare=There is nothing to compare because base and head branches are even.
-pulls.has_pull_request=`There is already a pull request between these two targets: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
-pulls.create=Create Pull Request
-pulls.title_desc=wants to merge %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code>
-pulls.merged_title_desc=merged %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code> %[4]s
-pulls.tab_conversation=Conversation
-pulls.tab_commits=Commits
-pulls.tab_files=Files changed
-pulls.reopen_to_merge=Please reopen this pull request to perform merge operation.
-pulls.merged=Merged
-pulls.has_merged=This pull request has been merged successfully!
-pulls.data_broken=Data of this pull request has been broken due to deletion of fork information.
-pulls.is_checking=The conflict checking is still in progress, please refresh page in few moments.
-pulls.can_auto_merge_desc=You can perform auto-merge operation on this pull request.
-pulls.cannot_auto_merge_desc=You can't perform auto-merge operation because there are conflicts between commits.
-pulls.cannot_auto_merge_helper=Please use command line tool to solve it.
-pulls.merge_pull_request=Merge Pull Request
-pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
+pulls.nothing_to_compare=基準和對比分支代碼已經同步，無需進行對比。
+pulls.has_pull_request=`已經存在目標分支的合併請求：<a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
+pulls.create=創建合併請求
+pulls.title_desc=請求將 %[1]d 次代碼提交從 <code>%[2]s</code> 合併至 <code>%[3]s</code>
+pulls.merged_title_desc=於 %[4]s 將 %[1]d 次代碼提交從 <code>%[2]s</code>合併至 <code>%[3]s</code>
+pulls.tab_conversation=對話內容
+pulls.tab_commits=代碼提交
+pulls.tab_files=文件變動
+pulls.reopen_to_merge=請重新開啟合併請求來完成合併操作。
+pulls.merged=已合併
+pulls.has_merged=該合併請求已經成功合併！
+pulls.data_broken=該合併請求的數據由於派生倉庫的相關信息被刪除而被破壞。
+pulls.is_checking=該合併請求正在進行衝突檢查，請稍後再刷新頁面。
+pulls.can_auto_merge_desc=This pull request can be merged automatically.
+pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
+pulls.merge_pull_request=合併請求
+pulls.open_unmerged_pull_exists=`由於已經存在來自相同倉庫和合併信息的未合併請求（#%d），您無法執行重新開啟操作。`

 milestones.new=新的里程碑
 milestones.open_tab=%d 開啟中
@ -537,20 +541,20 @@ 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.welcome=歡迎使用 Wiki！
+wiki.welcome_desc=Wiki 是用於共同協作文檔的地方，清晰的文檔可以幫助其他人深入了解您的項目。
+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 頁面已經存在。
+wiki.pages=所有頁面
+wiki.last_updated=最後更新於 %s

 settings=倉庫設置
 settings.options=基本設置
@ -560,29 +564,29 @@ settings.githooks=管理 Git 鉤子
 settings.basic_settings=基本設置
 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.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=新的倉庫擁有者已經存在同名倉庫！
 settings.delete=刪除本倉庫
 settings.delete_desc=刪除倉庫操作不可逆轉，請三思而後行。
-settings.transfer_notices_1=- You will lose access if new owner is a individual user.
-settings.transfer_notices_2=- You will conserve access if new owner is an organization and if you're one of the owners.
-settings.transfer_form_title=Please enter following information to confirm your operation:
-settings.delete_notices_1=- This operation <strong>CANNOT</strong> be undone.
-settings.delete_notices_2=- This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators.
-settings.delete_notices_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.transfer_notices_1=- 如果您將倉庫轉移給個人用戶，您將會丟失操作權限。
+settings.transfer_notices_2=- 如果您將倉庫轉移給您是所有者的組織，您的操作權限將被保留。
+settings.transfer_form_title=請輸入以下信息以確認您的操作:
+settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滾。
+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=確認轉移倉庫
@ -591,21 +595,21 @@ settings.confirm_delete=確認刪除倉庫
 settings.add_collaborator=增加新的協作者
 settings.add_collaborator_success=成功添加新的協作者！
 settings.remove_collaborator_success=被操作的協作者已經被收回權限！
-settings.search_user_placeholder=Search user...
+settings.search_user_placeholder=搜索用戶...
 settings.user_is_org_member=被操作的用戶是組織成員，因此無法添加為協作者！
 settings.add_webhook=添加 Web 鉤子
 settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文檔</a> 獲取更多信息。
-settings.webhook_deletion=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
-settings.webhook.payload=Payload
-settings.webhook.body=Body
+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=標題
+settings.webhook.payload=推送內容
+settings.webhook.body=響應內容
 settings.githooks_desc=Git 鉤子是由 Git 本身提供的功能，以下為 Gogs 所支持的鉤子列表。
 settings.githook_edit_desc=如果鉤子未啟動，則會顯示樣例文件中的內容。如果想要刪除某個鉤子，則提交空白文本即可。
 settings.githook_name=鉤子名稱
@ -615,17 +619,17 @@ settings.add_webhook_desc=我們會通過 <code>POST</code> 請求將訂閱事
 settings.payload_url=推送地址
 settings.content_type=數據格式
 settings.secret=密鑰文本
-settings.slack_username=Username
-settings.slack_icon_url=Icon URL
-settings.slack_color=Color
+settings.slack_username=服務名稱
+settings.slack_icon_url=圖標 URL
+settings.slack_color=顏色代碼
 settings.event_desc=請設置您希望觸發 Web 鉤子的事件：
 settings.event_push_only=只推送 <code>push</code> 事件。
-settings.event_send_everything=I need <strong>everything</strong>.
-settings.event_choose=Let me choose what I need.
-settings.event_create=Create
-settings.event_create_desc=Branch, or tag created
-settings.event_push=Push
-settings.event_push_desc=Git push to a repository
+settings.event_send_everything=推送 <strong>所有</strong> 事件
+settings.event_choose=讓我選擇我的需要
+settings.event_create=創建
+settings.event_create_desc=創建分支或標籤
+settings.event_push=推送
+settings.event_push_desc=Git 倉庫推送
 settings.active=是否激活
 settings.active_helper=當指定事件發生時我們將會觸發此 Web 鉤子。
 settings.add_hook_success=Web 鉤子添加成功！
@ -640,7 +644,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=部署密鑰僅具有隻讀權限，它在功能上和個人用戶的公開密鑰有本質區別。
 settings.no_deploy_keys=您還沒有添加任何部署密鑰。
 settings.title=標題
 settings.deploy_key_content=密鑰文本
@ -668,32 +672,32 @@ release.stable=穩定
 release.edit=編輯
 release.ahead=在該版本發佈之後已有 <strong>%d</strong> 次代碼提交到 %s 分支
 release.source_code=源代碼
-release.new_subheader=Publish releases to iterate product.
-release.edit_subheader=Detailed change log can help users understand what has been improved.
+release.new_subheader=發布版本對產品進行迭代。
+release.edit_subheader=詳細的變更日誌可以幫助用戶更好地了解產品做了哪些改進。
 release.tag_name=標籤名稱
 release.target=目標分支
 release.tag_helper=選擇或創建一個已存在的標籤
-release.title=Title
-release.content=Content
+release.title=標題
+release.content=內容
 release.write=內容編輯
 release.preview=效果預覽
 release.loading=正在加載...
 release.prerelease_desc=這是一個預發佈版本
 release.prerelease_helper=我們會告知用戶不建議將本發佈投入生產環境使用。
-release.cancel=Cancel
+release.cancel=取消
 release.publish=發佈版本
 release.save_draft=保在草稿
 release.edit_release=編輯發佈信息
-release.delete_release=Delete This Release
-release.deletion=Release Deletion
-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.delete_release=刪除此次發布
+release.deletion=刪除版本發布操作
+release.deletion_desc=刪除該版本發布將會移除相應的 Git 標籤。是否繼續？
+release.deletion_success=版本發布刪除成功！
 release.tag_name_already_exist=已經存在使用相同標籤的發佈版本。
-release.downloads=Downloads
+release.downloads=下載附件

 [org]
 org_name_holder=組織名稱
-org_full_name_holder=Organization Full Name
+org_full_name_holder=組織全名
 org_name_helper=偉大的組織都有一個簡短而寓意深刻的名字。
 create_org=創建組織
 repo_updated=最後更新於
@ -720,8 +724,8 @@ settings.website=官方網站
 settings.location=所在地區
 settings.update_settings=更新組織設置
 settings.update_setting_success=組織設置更新成功！
-settings.change_orgname_prompt=This change will affect how links relate to the organization.
-settings.update_avatar_success=Organization avatar setting has been updated successfully.
+settings.change_orgname_prompt=該操作將會影響到所有與該組織有關的鏈接
+settings.update_avatar_success=組織頭像更新成功！
 settings.delete=刪除組織
 settings.delete_account=刪除當前組織
 settings.delete_prompt=刪除操作會永久清除該組織的信息，並且 <strong>不可恢復</strong>！
@ -730,17 +734,17 @@ settings.delete_org_title=組織刪除操作
 settings.delete_org_desc=該組織將被永久性刪除，您確定要繼續操作嗎？
 settings.hooks_desc=在此處添加的 Web 鉤子將會應用到該組織下的 <strong>所有倉庫</strong>。

-members.membership_visibility=Membership Visibility:
+members.membership_visibility=成員可見性：
 members.public=公開成員
 members.public_helper=設為私有
 members.private=私有成員
 members.private_helper=設為公開
-members.member_role=Member Role:
+members.member_role=成員角色：
 members.owner=管理員
 members.member=普通成員
 members.remove=移除成員
 members.leave=離開組織
-members.invite_desc=Add a new member to %s:
+members.invite_desc=邀請新的用戶加入 %s：
 members.invite_now=立即邀請

 teams.join=加入團隊
@ -765,7 +769,7 @@ teams.read_permission_desc=該團隊擁有對所屬倉庫的 <strong>讀取</str
 teams.write_permission_desc=該團隊擁有對所屬倉庫的 <strong>讀取</strong> 和 <strong>寫入</strong> 的權限。
 teams.admin_permission_desc=該團隊擁有一定的 <strong>管理</strong> 權限，團隊成員可以讀取、複製、推送以及添加其它倉庫協作者。
 teams.repositories=團隊倉庫
-teams.search_repo_placeholder=Search repository...
+teams.search_repo_placeholder=搜索倉庫...
 teams.add_team_repository=添加團隊倉庫
 teams.remove_repo=移除倉庫
 teams.add_nonexistent_repo=您嘗試添加到團隊的倉庫不存在，請先創建倉庫！
@ -779,9 +783,9 @@ authentication=授權認證管理
 config=應用配置管理
 notices=系統提示管理
 monitor=應用監控面版
-first_page=First
-last_page=Last
-total=Total: %d
+first_page=首頁
+last_page=末頁
+total=總計：%d

 dashboard.statistic=應用統計數據
 dashboard.operations=管理員操作
@ -796,8 +800,8 @@ dashboard.delete_inactivate_accounts=刪除所有未激活帳戶
 dashboard.delete_inactivate_accounts_success=所有未激活帳號清除成功！
 dashboard.delete_repo_archives=刪除所有倉庫存檔
 dashboard.delete_repo_archives_success=所有倉庫存檔清除成功！
-dashboard.delete_missing_repos=Delete all repository records that lost Git files
-dashboard.delete_missing_repos_success=All repository records that lost Git files have been deleted successfully.
+dashboard.delete_missing_repos=刪除所有丟失 Git 文件的倉庫記錄
+dashboard.delete_missing_repos_success=成功刪除所有丟失 Git 文件的倉庫記錄！
 dashboard.git_gc_repos=對倉庫進行垃圾回收
 dashboard.git_gc_repos_success=所有倉庫的垃圾回收已成功完成！
 dashboard.resync_all_sshkeys=重新生成 '.ssh/authorized_keys' 文件（警告：不是 Gogs 的密鑰也會被刪除）
@ -842,24 +846,24 @@ users.activated=已激活
 users.admin=管理員
 users.repos=倉庫數
 users.created=創建時間
-users.send_register_notify=Send Registration Notification To User
-users.new_success=New account '%s' has been created successfully.
+users.send_register_notify=向用戶發送註冊通知郵件
+users.new_success=新用戶 '%s' 創建成功！
 users.edit=編輯
-users.auth_source=Authentication Source
+users.auth_source=認證源
 users.local=本地
-users.auth_login_name=Authentication Login Name
-users.password_helper=Leave it empty to remain unchanged.
+users.auth_login_name=認證登錄名稱
+users.password_helper=留空使其保持不變。
 users.update_profile_success=該用戶信息更新成功！
 users.edit_account=編輯用戶信息
 users.is_activated=該用戶已被激活
 users.is_admin=該用戶具有管理員權限
 users.allow_git_hook=該帳戶具有創建 Git 鉤子的權限
-users.allow_import_local=This account has permissions to import local repositories
+users.allow_import_local=該用戶具有導入本地倉庫的權限
 users.update_profile=更新用戶信息
 users.delete_account=刪除該用戶
 users.still_own_repo=該帳戶仍然是某些倉庫的擁有者，您必須先轉移或刪除它們才能執行刪除帳戶操作！
 users.still_has_org=該帳戶仍舊是某些組織的成員，您必須先使其離開或刪除組織。
-users.deletion_success=Account has been deleted successfully!
+users.deletion_success=用戶刪除成功！

 orgs.org_manage_panel=組織管理面版
 orgs.name=組織名稱
@ -874,49 +878,49 @@ repos.watches=關註數
 repos.stars=讚好數
 repos.issues=問題數

-auths.auth_manage_panel=Authentication Manage Panel
-auths.new=Add New Source
+auths.auth_manage_panel=認證管理面板
+auths.new=添加新認證源
 auths.name=認證名稱
 auths.type=認證類型
 auths.enabled=已啟用
 auths.updated=最後更新時間
-auths.auth_type=Authentication Type
-auths.auth_name=Authentication Name
+auths.auth_type=認證類型
+auths.auth_name=認證名稱
 auths.domain=域名
 auths.host=主機地址
 auths.port=主機端口
 auths.bind_dn=綁定DN
 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.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_username=用戶名屬性
+auths.attribute_username_placeholder=留空表示使用用戶登錄時所使用的用戶名
 auths.attribute_name=名子屬性
 auths.attribute_surname=姓氏屬性
 auths.attribute_mail=電子郵箱屬性
 auths.filter=使用者篩選器
 auths.admin_filter=管理者篩選器
 auths.ms_ad_sa=Ms Ad SA
-auths.smtp_auth=SMTP Authentication Type
+auths.smtp_auth=SMTP 驗證類型
 auths.smtphost=SMTP 主機地址
 auths.smtpport=SMTP 主機端口
-auths.allowed_domains=Allowed Domains
-auths.allowed_domains_helper=Leave it empty to not restrict any domains. Multiple domains should be separated by comma ','.
+auths.allowed_domains=域名白名單
+auths.allowed_domains_helper=留空表示不對域名做任何限制。多個域名之間需要使用逗號 ',' 分隔。
 auths.enable_tls=啟用 TLS 加密
-auths.skip_tls_verify=Skip TLS Verify
+auths.skip_tls_verify=忽略 TLS 驗證
 auths.pam_service_name=PAM 服務名稱
 auths.enable_auto_register=允許授權用戶自動註冊
 auths.tips=幫助提示
-auths.edit=Edit Authentication Setting
+auths.edit=編輯認證設置
 auths.activated=該授權認證已經啟用
-auths.new_success=New authentication '%s' has been added successfully.
-auths.update_success=Authentication setting has been updated successfully.
-auths.update=Update Authentication Setting
-auths.delete=Delete This Authentication
-auths.delete_auth_title=Authentication Deletion
-auths.delete_auth_desc=This authentication is going to be deleted, do you want to continue?
-auths.deletion_success=Authentication has been deleted successfully!
+auths.new_success=新的認證源 "%s" 添加成功！
+auths.update_success=認證設置更新成功！
+auths.update=更新認證設置
+auths.delete=刪除該認證
+auths.delete_auth_title=刪除認證操作
+auths.delete_auth_desc=該認證將被刪除。是否繼續？
+auths.deletion_success=認證源刪除成功！

 config.server_config=服務器配置
 config.app_name=應用名稱
@ -940,7 +944,7 @@ config.db_user=數據庫用戶
 config.db_ssl_mode=SSL 模式
 config.db_ssl_mode_helper=（僅限 "postgres" 使用）
 config.db_path=數據庫路徑
-config.db_path_helper=(for "sqlite3" and "tidb")
+config.db_path_helper=（用於 "sqlite3" 和 "tidb"）
 config.service_config=服務配置
 config.register_email_confirm=註冊電子郵件確認
 config.disable_register=關閉註冊功能
@ -948,8 +952,8 @@ config.show_registration_button=顯示註冊按鈕
 config.require_sign_in_view=強制登錄瀏覽
 config.enable_cache_avatar=開啟緩存頭像
 config.mail_notify=郵件通知提醒
-config.disable_key_size_check=Disable Minimum Key Size Check
-config.enable_captcha=Enable Captcha
+config.disable_key_size_check=禁用密鑰最小長度檢查
+config.enable_captcha=啟用驗證碼服務
 config.active_code_lives=激活用戶連結有效期
 config.reset_password_code_lives=重置密碼連結有效期
 config.webhook_config=Web 鉤子配置
@ -995,30 +999,30 @@ 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.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=描述
 notices.op=操作
-notices.delete_success=System notices have been deleted successfully.
+notices.delete_success=系統提示刪除成功！

 [action]
 create_repo=創建了倉庫 <a href="%s">%s</a>
-rename_repo=renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]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>`
-create_pull_request=`created pull request <a href="%s/pulls/%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=`merged pull request <a href="%s/pulls/%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>
-compare_commits=查看 %d 次提交的內容對比
+compare_commits=View comparison for these %d commits

 [tool]
 ago=之前
--- a/gogs.go
+++ b/gogs.go
@ -18,7 +18,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )

-const APP_VER = "0.7.37.1209 Beta"
+const APP_VER = "0.7.38.1210 Beta"

 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
--- a/modules/bindata/bindata.go
+++ b/modules/bindata/bindata.go
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@ -343,8 +343,8 @@ func ValidateRepoMetas(ctx *middleware.Context, form auth.CreateIssueForm) ([]in
 	return labelIDs, milestoneID, assigneeID
 }

-func checkMentions(ctx *middleware.Context, issue *models.Issue) {
-	// Update mentions.
+func notifyWatchersAndMentions(ctx *middleware.Context, issue *models.Issue) {
+	// Update mentions
 	mentions := base.MentionPattern.FindAllString(issue.Content, -1)
 	if len(mentions) > 0 {
 		for i := range mentions {
@ -423,7 +423,7 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) {
 		return
 	}

-	checkMentions(ctx, issue)
+	notifyWatchersAndMentions(ctx, issue)
 	if ctx.Written() {
 		return
 	}
@ -871,7 +871,7 @@ func NewComment(ctx *middleware.Context, form auth.CreateCommentForm) {
 		return
 	}

-	checkMentions(ctx, &models.Issue{
+	notifyWatchersAndMentions(ctx, &models.Issue{
 		ID:      issue.ID,
 		Index:   issue.Index,
 		Name:    issue.Name,
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@ -634,6 +634,11 @@ func CompareAndPullRequestPost(ctx *middleware.Context, form auth.CreateIssueFor
 		return
 	}

+	notifyWatchersAndMentions(ctx, pull)
+	if ctx.Written() {
+		return
+	}
+
 	log.Trace("Pull request created: %d/%d", repo.ID, pull.ID)
 	ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pull.Index))
 }
--- a/templates/.VERSION
+++ b/templates/.VERSION
@ -1 +1 @@
-0.7.37.1209 Beta
+0.7.38.1210 Beta