git: e612452e3c - main - update translation of articles/ a-f to Russian
Vladlen Popolitov <[email protected]> Sun, 17 May 2026 18:22:37 +0000
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by vladlen: URL: https://cgit.FreeBSD.org/doc/commit/?id=e612452e3c4f502cadc0da7d9b87b7352118b512 commit e612452e3c4f502cadc0da7d9b87b7352118b512 Author: Vladlen Popolitov <[email protected]> AuthorDate: 2026-05-17 18:22:23 +0000 Commit: Vladlen Popolitov <[email protected]> CommitDate: 2026-05-17 18:22:23 +0000 update translation of articles/ a-f to Russian Reviewed by: andy Differential Revision: https://reviews.freebsd.org/Ð56939 --- .../ru/articles/building-products/_index.adoc | 2 +- .../ru/articles/building-products/_index.po | 4 +- .../ru/articles/committers-guide/_index.adoc | 32 +- .../content/ru/articles/committers-guide/_index.po | 936 +++++++++++---------- .../content/ru/articles/contributing/_index.adoc | 2 +- .../content/ru/articles/contributing/_index.po | 9 +- documentation/content/ru/articles/cups/_index.adoc | 2 +- documentation/content/ru/articles/cups/_index.po | 4 +- .../content/ru/articles/explaining-bsd/_index.adoc | 6 +- .../content/ru/articles/explaining-bsd/_index.po | 82 +- .../ru/articles/filtering-bridges/_index.adoc | 2 +- .../ru/articles/filtering-bridges/_index.po | 4 +- .../content/ru/articles/fonts/_index.adoc | 6 +- documentation/content/ru/articles/fonts/_index.po | 8 +- .../ru/articles/freebsd-questions/_index.adoc | 2 +- .../ru/articles/freebsd-questions/_index.po | 4 +- .../content/ru/articles/freebsd-releng/_index.adoc | 2 +- .../content/ru/articles/freebsd-releng/_index.po | 6 +- .../freebsd-status-report-process/_index.adoc | 5 +- .../freebsd-status-report-process/_index.po | 68 +- .../ru/articles/freebsd-update-server/_index.adoc | 4 +- .../ru/articles/freebsd-update-server/_index.po | 56 +- 22 files changed, 617 insertions(+), 629 deletions(-) diff --git a/documentation/content/ru/articles/building-products/_index.adoc b/documentation/content/ru/articles/building-products/_index.adoc index d974d5ed7f..588036fc12 100644 --- a/documentation/content/ru/articles/building-products/_index.adoc +++ b/documentation/content/ru/articles/building-products/_index.adoc @@ -298,7 +298,7 @@ crossref:building-products[fig-svn-blame, ÐнноÑиÑованнÑй лиÑÑ Ð Ð°ÑпÑоÑÑÑаниÑе инÑоÑмаÑÐ¸Ñ Ð¾ ваÑем ÑÑаÑÑии:: ÐÑ Ð½Ðµ обÑÐ·Ð°Ð½Ñ Ð°ÑиÑиÑоваÑÑ ÑÐ²Ð¾Ñ Ð¸ÑполÑзование FreeBSD, но ÑÑо Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ ÐºÐ°Ðº ваÑÐµÐ¼Ñ Ð´ÐµÐ»Ñ, Ñак и пÑоекÑÑ. + -ÐозволÑÑ ÑообÑеÑÑÐ²Ñ FreeBSD ÑзнаÑÑ, ÑÑо ваÑа ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ Ð¸ÑполÑзÑÐµÑ FreeBSD, Ð²Ñ Ð¿Ð¾Ð²ÑÑаеÑе ÑанÑÑ Ð¿ÑивлеÑÑ Ð²ÑÑококвалиÑиÑиÑованнÑÑ ÑпеÑиалиÑÑов. ÐолÑÑой ÑпиÑок поддеÑжки FreeBSD Ñакже ознаÑÐ°ÐµÑ Ð±Ð¾Ð»ÑÑее внимание ÑÑеди ÑазÑабоÑÑиков. ÐÑо, в ÑÐ²Ð¾Ñ Ð¾ÑеÑедÑ, ÑÐ¾Ð·Ð´Ð°ÐµÑ Ð±Ð¾Ð»ÐµÐµ ÑÑÑойÑивÑÑ Ð¾ÑÐ½Ð¾Ð²Ñ Ð´Ð»Ñ Ð²Ð°Ñего бÑдÑÑего. +ÐозволÑÑ ÑообÑеÑÑÐ²Ñ FreeBSD ÑзнаÑÑ, ÑÑо ваÑа ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ Ð¸ÑполÑзÑÐµÑ FreeBSD, Ð²Ñ Ð¿Ð¾Ð²ÑÑаеÑе ÑанÑÑ Ð¿ÑивлеÑÑ Ð²ÑÑококвалиÑиÑиÑованнÑÑ ÑпеÑиалиÑÑов. ÐолÑÑой ÑпиÑок поддеÑжки FreeBSD Ñакже ознаÑÐ°ÐµÑ Ð±Ð¾Ð»ÑÑее внимание ÑÑеди ÑазÑабоÑÑиков. ÐÑо, в ÑÐ²Ð¾Ñ Ð¾ÑеÑедÑ, ÑоздаÑÑ Ð±Ð¾Ð»ÐµÐµ ÑÑÑойÑивÑÑ Ð¾ÑÐ½Ð¾Ð²Ñ Ð´Ð»Ñ Ð²Ð°Ñего бÑдÑÑего. ÐоддеÑжиÑе ÑазÑабоÑÑиков FreeBSD:: Ðногда ÑамÑй пÑÑмой ÑпоÑоб полÑÑиÑÑ Ð½ÑжнÑÑ ÑÑнкÑионалÑноÑÑÑ Ð² FreeBSD â ÑÑо поддеÑжаÑÑ ÑазÑабоÑÑика, коÑоÑÑй Ñже занимаеÑÑÑ ÑвÑзанной пÑоблемой. ÐомоÑÑ Ð¼Ð¾Ð¶ÐµÑ Ð²Ð°ÑÑиÑоваÑÑÑÑ Ð¾Ñ Ð¿Ð¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð¾ пÑÑмой ÑинанÑовой поддеÑжки. РнекоÑоÑÑÑ ÑÑÑÐ°Ð½Ð°Ñ Ð¿Ð¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑоекÑÑ FreeBSD имеÑÑ Ð½Ð°Ð»Ð¾Ð³Ð¾Ð²Ñе лÑгоÑÑ. У пÑоекÑа еÑÑÑ ÑпеÑиалÑнÑй link:https://www.FreeBSD.org/donations/[пÑедÑÑавиÑÐµÐ»Ñ Ð¿Ð¾ пожеÑÑвованиÑм], коÑоÑÑй Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÐµÑ Ð´Ð¾Ð½Ð¾Ñам. Также пÑÐ¾ÐµÐºÑ Ð¿Ð¾Ð´Ð´ÐµÑ Ð¶Ð¸Ð²Ð°ÐµÑ Ð²ÐµÐ±-ÑÑÑаниÑÑ, где ÑазÑабоÑÑики link:https://www.FreeBSD.org/donations/wantlist/[ÑказÑваÑÑ Ñвои поÑÑебноÑÑи]. + diff --git a/documentation/content/ru/articles/building-products/_index.po b/documentation/content/ru/articles/building-products/_index.po index f7f485fff7..1913a83c98 100644 --- a/documentation/content/ru/articles/building-products/_index.po +++ b/documentation/content/ru/articles/building-products/_index.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" "POT-Creation-Date: 2024-12-29 08:30-0500\n" -"PO-Revision-Date: 2026-03-08 09:11+0000\n" +"PO-Revision-Date: 2026-04-05 04:45+0000\n" "Last-Translator: Vladlen Popolitov <[email protected]>\n" "Language-Team: Russian <https://translate-dev.freebsd.org/projects/" "documentation/articlesbuilding-products_index/ru/>\n" @@ -1320,7 +1320,7 @@ msgstr "" "ÐозволÑÑ ÑообÑеÑÑÐ²Ñ FreeBSD ÑзнаÑÑ, ÑÑо ваÑа ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ Ð¸ÑполÑзÑÐµÑ FreeBSD, Ð²Ñ " "повÑÑаеÑе ÑанÑÑ Ð¿ÑивлеÑÑ Ð²ÑÑококвалиÑиÑиÑованнÑÑ ÑпеÑиалиÑÑов. ÐолÑÑой " "ÑпиÑок поддеÑжки FreeBSD Ñакже ознаÑÐ°ÐµÑ Ð±Ð¾Ð»ÑÑее внимание ÑÑеди " -"ÑазÑабоÑÑиков. ÐÑо, в ÑÐ²Ð¾Ñ Ð¾ÑеÑедÑ, ÑÐ¾Ð·Ð´Ð°ÐµÑ Ð±Ð¾Ð»ÐµÐµ ÑÑÑойÑивÑÑ Ð¾ÑÐ½Ð¾Ð²Ñ Ð´Ð»Ñ " +"ÑазÑабоÑÑиков. ÐÑо, в ÑÐ²Ð¾Ñ Ð¾ÑеÑедÑ, ÑоздаÑÑ Ð±Ð¾Ð»ÐµÐµ ÑÑÑойÑивÑÑ Ð¾ÑÐ½Ð¾Ð²Ñ Ð´Ð»Ñ " "ваÑего бÑдÑÑего." #. type: Labeled list diff --git a/documentation/content/ru/articles/committers-guide/_index.adoc b/documentation/content/ru/articles/committers-guide/_index.adoc index aa78193da1..8555455bdb 100644 --- a/documentation/content/ru/articles/committers-guide/_index.adoc +++ b/documentation/content/ru/articles/committers-guide/_index.adoc @@ -836,7 +836,7 @@ MFC в веÑки, ÑÑебÑÑÑие одобÑениÑ, ÑÑебÑÑÑ Ð½ÐµÐ¼ ==== MFC â импоÑÑ Ð¾Ñ Ð²ÐµÐ½Ð´Ð¾Ñа -ÐмпоÑÑÑ Ð¾Ñ Ð²ÐµÐ½Ð´Ð¾Ñов â ÑÑо единÑÑвенное в деÑеве, ÑÑо ÑÐ¾Ð·Ð´Ð°ÐµÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð² веÑке `main`. ÐоммиÑÑ ÑлиÑÐ½Ð¸Ñ Ð²ÑбоÑоÑнÑм пеÑеноÑом (cherry-pick) в stable/XX пÑедÑÑавлÑÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑÑ ÑложноÑÑÑ, поÑколÑÐºÑ Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñа ÑлиÑÐ½Ð¸Ñ Ð´Ð²Ð° ÑодиÑелÑ. Ðак пÑавило, вам понадобиÑÑÑ ÑазниÑа Ñ Ð¿ÐµÑвÑм ÑодиÑелем, Ñак как ÑÑо ÑазниÑа Ñ `main` (Ñ Ð¾ÑÑ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¸ иÑклÑÑениÑ). +ÐмпоÑÑÑ Ð¾Ñ Ð²ÐµÐ½Ð´Ð¾Ñов â ÑÑо единÑÑвенное в деÑеве, ÑÑо ÑоздаÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð² веÑке `main`. ÐоммиÑÑ ÑлиÑÐ½Ð¸Ñ Ð²ÑбоÑоÑнÑм пеÑеноÑом (cherry-pick) в stable/XX пÑедÑÑавлÑÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑÑ ÑложноÑÑÑ, поÑколÑÐºÑ Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñа ÑлиÑÐ½Ð¸Ñ Ð´Ð²Ð° ÑодиÑелÑ. Ðак пÑавило, вам понадобиÑÑÑ ÑазниÑа Ñ Ð¿ÐµÑвÑм ÑодиÑелем, Ñак как ÑÑо ÑазниÑа Ñ `main` (Ñ Ð¾ÑÑ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¸ иÑклÑÑениÑ). [source, shell] .... @@ -1671,7 +1671,7 @@ freebsd ssh://[email protected]/src.git (push) ÐеÑвÑм Ñагом ÑвлÑеÑÑÑ Ñоздание ÑоÑка https://github.com/freebsd/freebsd-src[FreeBSD] на GitHub, ÑледÑÑ ÑÑим https://docs.github.com/en/github/getting-started-with-github/fork-a-repo[инÑÑÑÑкÑиÑм]. ÐазнаÑением ÑоÑка должен бÑÑÑ Ð²Ð°Ñ ÑобÑÑвеннÑй, лиÑнÑй аккаÑÐ½Ñ Ð½Ð° GitHub (в моÑм ÑлÑÑае gvnn3). -ТепеÑÑ Ð´Ð¾Ð±Ð°Ð²ÑÑе ÑдаленнÑй ÑепозиÑоÑий в ваÑей локалÑной ÑиÑÑеме, коÑоÑÑй ÑказÑÐ²Ð°ÐµÑ Ð½Ð° Ð²Ð°Ñ ÑоÑк: +ТепеÑÑ Ð´Ð¾Ð±Ð°Ð²ÑÑе ÑдалÑннÑй ÑепозиÑоÑий в ваÑей локалÑной ÑиÑÑеме, коÑоÑÑй ÑказÑÐ²Ð°ÐµÑ Ð½Ð° Ð²Ð°Ñ ÑоÑк: [source, shell] .... % git remote add github [email protected]:gvnn3/freebsd-src.git @@ -1884,7 +1884,7 @@ Author: github-user <[email protected]> ÐÑли ваÑа ÑиÑÑема ÑлекÑÑонной поÑÑÑ Ð¸ÑполÑзÑÐµÑ SPF Ñо ÑÑÑогими пÑавилами, вам ÑледÑÐµÑ Ð¸ÑклÑÑиÑÑ `mx2.FreeBSD.org` из пÑовеÑок SPF. ====== + -Ðз-за вÑÑокой нагÑÑзки, коÑоÑÑÑ Ð¾Ð±ÑабоÑка Ñпама ÑÐ¾Ð·Ð´Ð°ÐµÑ Ð½Ð° ÑенÑÑалÑнÑÑ Ð¿Ð¾ÑÑовÑÑ ÑеÑвеÑÐ°Ñ , обÑабаÑÑваÑÑÐ¸Ñ Ð¿Ð¾ÑÑовÑе ÑаÑÑÑлки, ÑÑонÑенд-ÑеÑÐ²ÐµÑ Ð²ÑполнÑÐµÑ Ð±Ð°Ð·Ð¾Ð²Ñе пÑовеÑки и Ð¼Ð¾Ð¶ÐµÑ Ð¾ÑбÑаÑÑваÑÑ Ð½ÐµÐºÐ¾ÑоÑÑе ÑообÑÐµÐ½Ð¸Ñ Ð½Ð° Ð¸Ñ Ð¾Ñнове. РнаÑÑоÑÑее вÑÐµÐ¼Ñ ÐµÐ´Ð¸Ð½ÑÑвенной акÑивной пÑовеÑкой ÑвлÑеÑÑÑ Ð½Ð°Ð»Ð¸Ñие коÑÑекÑной DNS-инÑоÑмаÑии Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑаÑÑегоÑÑ Ñ Ð¾ÑÑа, но ÑÑо Ð¼Ð¾Ð¶ÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑÑÑ. ÐекоÑоÑÑе полÑзоваÑели ÑвÑзÑваÑÑ ÑÑи пÑовеÑки Ñ Ð»Ð¾Ð¶Ð½Ñм оÑбÑаÑÑваР½Ð¸ÐµÐ¼ легиÑимной поÑÑÑ. ÐÐ»Ñ Ð¾ÑклÑÑÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÑ Ð¿ÑовеÑок Ð´Ð»Ñ Ð²Ð°Ñей поÑÑÑ ÑоздайÑе Ñайл Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ [.filename]#~/.spam _lover# на `freefall.FreeBSD.org`. +Ðз-за вÑÑокой нагÑÑзки, коÑоÑÑÑ Ð¾Ð±ÑабоÑка Ñпама ÑоздаÑÑ Ð½Ð° ÑенÑÑалÑнÑÑ Ð¿Ð¾ÑÑовÑÑ ÑеÑвеÑÐ°Ñ , обÑабаÑÑваÑÑÐ¸Ñ Ð¿Ð¾ÑÑовÑе ÑаÑÑÑлки, ÑÑонÑенд-ÑеÑÐ²ÐµÑ Ð²ÑполнÑÐµÑ Ð±Ð°Ð·Ð¾Ð²Ñе пÑовеÑки и Ð¼Ð¾Ð¶ÐµÑ Ð¾ÑбÑаÑÑваÑÑ Ð½ÐµÐºÐ¾ÑоÑÑе ÑообÑÐµÐ½Ð¸Ñ Ð½Ð° Ð¸Ñ Ð¾Ñнове. РнаÑÑоÑÑее вÑÐµÐ¼Ñ ÐµÐ´Ð¸Ð½ÑÑвенной акÑивной пÑовеÑкой ÑвлÑеÑÑÑ Ð½Ð°Ð»Ð¸Ñие коÑÑекÑной DNS-инÑоÑмаÑии Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑаÑÑегоÑÑ Ñ Ð¾ÑÑа, но ÑÑо Ð¼Ð¾Ð¶ÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑÑÑ. ÐекоÑоÑÑе полÑзоваÑели ÑвÑзÑваÑÑ ÑÑи пÑовеÑки Ñ Ð»Ð¾Ð¶Ð½Ñм оÑбÑаÑÑваР½Ð¸ÐµÐ¼ легиÑимной поÑÑÑ. ÐÐ»Ñ Ð¾ÑклÑÑÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÑ Ð¿ÑовеÑок Ð´Ð»Ñ Ð²Ð°Ñей поÑÑÑ ÑоздайÑе Ñайл Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ [.filename]#~/.spam _lover# на `freefall.FreeBSD.org`. + [NOTE] ====== @@ -2197,7 +2197,7 @@ [email protected]:smtp.freebsd.org::587 (не ÑекомендÑеÑÑÑ) |ÐÐ¼Ñ Ð°Ð²ÑоÑа, коÑоÑÑй оÑпÑавил изменение без пÑедоÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð³Ð¾ коÑÑекÑного паÑÑа, оÑобенно без коÑÑекÑного адÑеÑа ÑлекÑÑонной поÑÑÑ. ÐÑпÑавленнÑе паÑÑи Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¸Ð¼ÐµÑÑ Ñказанного авÑоÑа Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ `git commit --author` Ñ Ð¿Ð¾Ð»Ð½Ñм именем и коÑÑекÑнÑм адÑеÑом ÑлекÑÑонной поÑÑÑ. -Ðо пеÑÐµÑ Ð¾Ð´Ð° на git, когда поÑвилаÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑазделÑÑÑ Ð¿Ð¾Ð»Ñ Ð°Ð²ÑоÑа и коммиÑеÑа, ÑÑо иÑполÑзовалоÑÑ Ð´Ð»Ñ Ð¿ÑиÑланнÑÑ Ð¿Ð°ÑÑей. +Ðо пеÑÐµÑ Ð¾Ð´Ð° на git, когда поÑвилаÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑазделÑÑÑ Ð¿Ð¾Ð»Ñ Ð°Ð²ÑоÑа и коммиÑÑеÑа, ÑÑо иÑполÑзовалоÑÑ Ð´Ð»Ñ Ð¿ÑиÑланнÑÑ Ð¿Ð°ÑÑей. |`Reviewed by:` | @@ -2413,32 +2413,10 @@ Relnotes: yes [.programlisting] .... /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) [year] [your name] * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause * - * [id for your version control system, if any] */ .... diff --git a/documentation/content/ru/articles/committers-guide/_index.po b/documentation/content/ru/articles/committers-guide/_index.po index 32c665734f..cda5ef1e36 100644 --- a/documentation/content/ru/articles/committers-guide/_index.po +++ b/documentation/content/ru/articles/committers-guide/_index.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2026-02-22 15:58+0000\n" -"PO-Revision-Date: 2026-03-13 04:45+0000\n" +"POT-Creation-Date: 2026-05-09 23:29+0100\n" +"PO-Revision-Date: 2026-05-11 04:45+0000\n" "Last-Translator: Vladlen Popolitov <[email protected]>\n" "Language-Team: Russian <https://translate-dev.freebsd.org/projects/" "documentation/articlescommitters-guide_index/ru/>\n" @@ -2659,7 +2659,7 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:950 msgid "" -"If you forget to to add the `Approved by:` line, you can do a `git commit --" +"If you forget to add the `Approved by:` line, you can do a `git commit --" "amend` to edit the commit message before you push the change." msgstr "" "ÐÑли Ð²Ñ Ð·Ð°Ð±Ñли добавиÑÑ ÑÑÑÐ¾ÐºÑ `Approved by:`, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе вÑполниÑÑ `git " @@ -2745,7 +2745,7 @@ msgid "" "Generally, you'll want the first parent's diff since that's the diff to " "`main` (though there may be some exceptions)." msgstr "" -"ÐмпоÑÑÑ Ð¾Ñ Ð²ÐµÐ½Ð´Ð¾Ñов â ÑÑо единÑÑвенное в деÑеве, ÑÑо ÑÐ¾Ð·Ð´Ð°ÐµÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ ÑлиÑÐ½Ð¸Ñ " +"ÐмпоÑÑÑ Ð¾Ñ Ð²ÐµÐ½Ð´Ð¾Ñов â ÑÑо единÑÑвенное в деÑеве, ÑÑо ÑоздаÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ ÑлиÑÐ½Ð¸Ñ " "в веÑке `main`. ÐоммиÑÑ ÑлиÑÐ½Ð¸Ñ Ð²ÑбоÑоÑнÑм пеÑеноÑом (cherry-pick) в stable/" "XX пÑедÑÑавлÑÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑÑ ÑложноÑÑÑ, поÑколÑÐºÑ Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñа ÑлиÑÐ½Ð¸Ñ Ð´Ð²Ð° " "ÑодиÑелÑ. Ðак пÑавило, вам понадобиÑÑÑ ÑазниÑа Ñ Ð¿ÐµÑвÑм ÑодиÑелем, Ñак как " @@ -5517,7 +5517,7 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:1988 msgid "Now add a remote on your local system that points to your fork:" msgstr "" -"ТепеÑÑ Ð´Ð¾Ð±Ð°Ð²ÑÑе ÑдаленнÑй ÑепозиÑоÑий в ваÑей локалÑной ÑиÑÑеме, коÑоÑÑй " +"ТепеÑÑ Ð´Ð¾Ð±Ð°Ð²ÑÑе ÑдалÑннÑй ÑепозиÑоÑий в ваÑей локалÑной ÑиÑÑеме, коÑоÑÑй " "ÑказÑÐ²Ð°ÐµÑ Ð½Ð° Ð²Ð°Ñ ÑоÑк:" #. type: delimited block . 4 @@ -6336,7 +6336,7 @@ msgid "" "email. To have these checks turned off for your email, create a file named [." "filename]#~/.spam_lover# on `freefall.FreeBSD.org`." msgstr "" -"Ðз-за вÑÑокой нагÑÑзки, коÑоÑÑÑ Ð¾Ð±ÑабоÑка Ñпама ÑÐ¾Ð·Ð´Ð°ÐµÑ Ð½Ð° ÑенÑÑалÑнÑÑ " +"Ðз-за вÑÑокой нагÑÑзки, коÑоÑÑÑ Ð¾Ð±ÑабоÑка Ñпама ÑоздаÑÑ Ð½Ð° ÑенÑÑалÑнÑÑ " "поÑÑовÑÑ ÑеÑвеÑÐ°Ñ , обÑабаÑÑваÑÑÐ¸Ñ Ð¿Ð¾ÑÑовÑе ÑаÑÑÑлки, ÑÑонÑенд-ÑеÑÐ²ÐµÑ " "вÑполнÑÐµÑ Ð±Ð°Ð·Ð¾Ð²Ñе пÑовеÑки и Ð¼Ð¾Ð¶ÐµÑ Ð¾ÑбÑаÑÑваÑÑ Ð½ÐµÐºÐ¾ÑоÑÑе ÑообÑÐµÐ½Ð¸Ñ Ð½Ð° Ð¸Ñ " "оÑнове. РнаÑÑоÑÑее вÑÐµÐ¼Ñ ÐµÐ´Ð¸Ð½ÑÑвенной акÑивной пÑовеÑкой ÑвлÑеÑÑÑ Ð½Ð°Ð»Ð¸Ñие " @@ -7443,12 +7443,9 @@ msgid "" "Submitted patches should have the author set by using `git commit --author` with a full name and valid email.\n" "Before the migration to git allowed separate author and committer fields, this was used for contributed patches." msgstr "" -"ÐÐ¼Ñ Ð°Ð²ÑоÑа, коÑоÑÑй оÑпÑавил изменение без пÑедоÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð³Ð¾ " -"коÑÑекÑного паÑÑа, оÑобенно без коÑÑекÑного адÑеÑа ÑлекÑÑонной поÑÑÑ.\n" -"ÐÑпÑавленнÑе паÑÑи Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¸Ð¼ÐµÑÑ Ñказанного авÑоÑа Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ `git " -"commit --author` Ñ Ð¿Ð¾Ð»Ð½Ñм именем и коÑÑекÑнÑм адÑеÑом ÑлекÑÑонной поÑÑÑ.\n" -"Ðо пеÑÐµÑ Ð¾Ð´Ð° на git, когда поÑвилаÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑазделÑÑÑ Ð¿Ð¾Ð»Ñ Ð°Ð²ÑоÑа и " -"коммиÑеÑа, ÑÑо иÑполÑзовалоÑÑ Ð´Ð»Ñ Ð¿ÑиÑланнÑÑ Ð¿Ð°ÑÑей." +"ÐÐ¼Ñ Ð°Ð²ÑоÑа, коÑоÑÑй оÑпÑавил изменение без пÑедоÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð³Ð¾ коÑÑекÑного паÑÑа, оÑобенно без коÑÑекÑного адÑеÑа ÑлекÑÑонной поÑÑÑ.\n" +"ÐÑпÑавленнÑе паÑÑи Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¸Ð¼ÐµÑÑ Ñказанного авÑоÑа Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ `git commit --author` Ñ Ð¿Ð¾Ð»Ð½Ñм именем и коÑÑекÑнÑм адÑеÑом ÑлекÑÑонной поÑÑÑ.\n" +"Ðо пеÑÐµÑ Ð¾Ð´Ð° на git, когда поÑвилаÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑазделÑÑÑ Ð¿Ð¾Ð»Ñ Ð°Ð²ÑоÑа и коммиÑÑеÑа, ÑÑо иÑполÑзовалоÑÑ Ð´Ð»Ñ Ð¿ÑиÑланнÑÑ Ð¿Ð°ÑÑей." #. type: Table #: documentation/content/en/articles/committers-guide/_index.adoc:2597 @@ -7599,11 +7596,8 @@ msgid "" "The Git short hash and the title line of a commit that is fixed by this change as returned by `git log -n1 --format='%h (\"%s\")' GIT-COMMIT-HASH`.\n" "We include the commit title so that the referenced commit can be located even in the case that a future VCS migration invalidates hash references." msgstr "" -"ÐоÑоÑкий Ñ ÑÑ Git и заголовок коммиÑа, коÑоÑÑй иÑпÑавлен ÑÑим изменением, как " -"возвÑаÑаеÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ `git log -n1 --format:'%h (\"%s\")' GIT-COMMIT-HASH`.\n" -"ÐÑ Ð²ÐºÐ»ÑÑаем заголовок коммиÑа, ÑÑÐ¾Ð±Ñ Ð¼Ð¾Ð¶Ð½Ð¾ бÑло найÑи ÑказаннÑй ÐºÐ¾Ð¼Ð¼Ð¸Ñ Ð´Ð°Ð¶Ðµ " -"в ÑлÑÑае, еÑли бÑдÑÑÐ°Ñ Ð¼Ð¸Ð³ÑаÑÐ¸Ñ ÑиÑÑÐµÐ¼Ñ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ñ Ð²ÐµÑÑий ÑÐ´ÐµÐ»Ð°ÐµÑ ÑÑÑлки по " -"Ñ ÑÑÑ Ð½ÐµÐ´ÐµÐ¹ÑÑвиÑелÑнÑми." +"ÐоÑоÑкий Ñ ÑÑ Git и заголовок коммиÑа, коÑоÑÑй иÑпÑавлен ÑÑим изменением, как возвÑаÑаеÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ `git log -n1 --format:'%h (\"%s\")' GIT-COMMIT-HASH`.\n" +"ÐÑ Ð²ÐºÐ»ÑÑаем заголовок коммиÑа, ÑÑÐ¾Ð±Ñ Ð¼Ð¾Ð¶Ð½Ð¾ бÑло найÑи ÑказаннÑй ÐºÐ¾Ð¼Ð¼Ð¸Ñ Ð´Ð°Ð¶Ðµ в ÑлÑÑае, еÑли бÑдÑÑÐ°Ñ Ð¼Ð¸Ð³ÑаÑÐ¸Ñ ÑиÑÑÐµÐ¼Ñ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ñ Ð²ÐµÑÑий ÑÐ´ÐµÐ»Ð°ÐµÑ ÑÑÑлки по Ñ ÑÑÑ Ð½ÐµÐ´ÐµÐ¹ÑÑвиÑелÑнÑми." #. type: Table #: documentation/content/en/articles/committers-guide/_index.adoc:2654 @@ -7745,10 +7739,8 @@ msgid "" "It should include the entire URL to the pull request, as these often act as code reviews for the code.\n" "For example: `https://github.com/freebsd/freebsd-src/pull/745`" msgstr "" -"ÐÑо изменение завеÑÑÐ°ÐµÑ ÑеÑÐ¸Ñ Ð¿Ð°ÑÑей, обÑÑждавÑÐ¸Ñ ÑÑ Ð¿Ð¾ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ Ð°Ð´ÑеÑÑ Ð² " -"pull request на GitHub, и закÑÑÐ²Ð°ÐµÑ Ð´Ð°Ð½Ð½Ñй запÑоÑ.\n" -"Ðно должно вклÑÑаÑÑ Ð¿Ð¾Ð»Ð½Ñй URL запÑоÑа на вклÑÑение изменений, Ñак как они " -"ÑаÑÑо вÑполнÑÑÑ ÑÐ¾Ð»Ñ ÑеÑензий кода.\n" +"ÐÑо изменение завеÑÑÐ°ÐµÑ ÑеÑÐ¸Ñ Ð¿Ð°ÑÑей, обÑÑждавÑÐ¸Ñ ÑÑ Ð¿Ð¾ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ Ð°Ð´ÑеÑÑ Ð² pull request на GitHub, и закÑÑÐ²Ð°ÐµÑ Ð´Ð°Ð½Ð½Ñй запÑоÑ.\n" +"Ðно должно вклÑÑаÑÑ Ð¿Ð¾Ð»Ð½Ñй URL запÑоÑа на вклÑÑение изменений, Ñак как они ÑаÑÑо вÑполнÑÑÑ ÑÐ¾Ð»Ñ ÑеÑензий кода.\n" "ÐапÑимеÑ: `https://github.com/freebsd/freebsd-src/pull/745`" #. type: Table @@ -8012,69 +8004,25 @@ msgstr "" "пÑедпоÑÑиÑелÑной ÑÑ ÐµÐ¼Ñ Ð»Ð¸ÑензиÑованиÑ:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2844 +#: documentation/content/en/articles/committers-guide/_index.adoc:2822 #, no-wrap msgid "" "/*\n" -" * SPDX-License-Identifier: BSD-2-Clause\n" -" *\n" " * Copyright (c) [year] [your name]\n" " *\n" -" * Redistribution and use in source and binary forms, with or without\n" -" * modification, are permitted provided that the following conditions\n" -" * are met:\n" -" * 1. Redistributions of source code must retain the above copyright\n" -" * notice, this list of conditions and the following disclaimer.\n" -" * 2. Redistributions in binary form must reproduce the above copyright\n" -" * notice, this list of conditions and the following disclaimer in the\n" -" * documentation and/or other materials provided with the distribution.\n" -" *\n" -" * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND\n" -" * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" -" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n" -" * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n" -" * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n" -" * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n" -" * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n" -" * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n" -" * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n" -" * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n" -" * SUCH DAMAGE.\n" +" * SPDX-License-Identifier: BSD-2-Clause\n" " *\n" -" * [id for your version control system, if any]\n" " */\n" msgstr "" "/*\n" -" * SPDX-License-Identifier: BSD-2-Clause\n" -" *\n" " * Copyright (c) [year] [your name]\n" " *\n" -" * Redistribution and use in source and binary forms, with or without\n" -" * modification, are permitted provided that the following conditions\n" -" * are met:\n" -" * 1. Redistributions of source code must retain the above copyright\n" -" * notice, this list of conditions and the following disclaimer.\n" -" * 2. Redistributions in binary form must reproduce the above copyright\n" -" * notice, this list of conditions and the following disclaimer in the\n" -" * documentation and/or other materials provided with the distribution.\n" -" *\n" -" * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND\n" -" * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" -" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n" -" * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n" -" * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n" -" * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n" -" * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n" -" * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n" -" * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n" -" * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n" -" * SUCH DAMAGE.\n" +" * SPDX-License-Identifier: BSD-2-Clause\n" " *\n" -" * [id for your version control system, if any]\n" " */\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2850 +#: documentation/content/en/articles/committers-guide/_index.adoc:2828 msgid "" "The FreeBSD project strongly discourages the so-called \"advertising clause" "\" in new code. Due to the large number of contributors to the FreeBSD " @@ -8091,7 +8039,7 @@ msgstr "" "ÑаÑÑмоÑÑиÑе возможноÑÑÑ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²ÑÑеÑказанной лиÑензии Ð´Ð»Ñ Ð²Ð°Ñего кода." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2854 +#: documentation/content/en/articles/committers-guide/_index.adoc:2832 msgid "" "The FreeBSD project discourages completely new licenses and variations on " "the standard licenses. New licenses require the approval of {core-email} to " @@ -8107,7 +8055,7 @@ msgstr "" "код, обÑÑно из-за непÑедвиденнÑÑ Ð¿Ð¾ÑледÑÑвий Ð¿Ð»Ð¾Ñ Ð¾ ÑÑоÑмÑлиÑованной лиÑензии." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2858 +#: documentation/content/en/articles/committers-guide/_index.adoc:2836 msgid "" "Project policy dictates that code under some non-BSD licenses must be placed " "only in specific sections of the repository, and in some cases, compilation " @@ -8124,7 +8072,7 @@ msgstr "" "GPL, APSL, CDDL и Ñ.п. не должно компилиÑоваÑÑÑÑ Ð² GENERIC." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2861 +#: documentation/content/en/articles/committers-guide/_index.adoc:2839 msgid "" "Developers are reminded that in open source, getting \"open\" right is just " "as important as getting \"source\" right, as improper handling of " @@ -8138,13 +8086,13 @@ msgstr "" "доводиÑÑ Ð´Ð¾ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ñновной командÑ." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2863 +#: documentation/content/en/articles/committers-guide/_index.adoc:2841 #, no-wrap msgid "Keeping Track of Licenses Granted to the FreeBSD Project" msgstr "ÐÑÑлеживание лиÑензий, пÑедоÑÑавленнÑÑ Ð¿ÑоекÑÑ FreeBSD" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2868 +#: documentation/content/en/articles/committers-guide/_index.adoc:2846 msgid "" "Various software or data exist in the repositories where the FreeBSD project " "has been granted a special license to be able to use them. A case in point " @@ -8161,7 +8109,7 @@ msgstr "" "он обÑÑно пÑименÑеÑ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2873 +#: documentation/content/en/articles/committers-guide/_index.adoc:2851 msgid "" "It is clearly sensible to keep a record of any such license grants. To that " "end, the {core-email} has decided to keep an archive of them. Whenever the " @@ -8176,14 +8124,14 @@ msgstr "" "пÑиÑÑлайÑе деÑали на {core-email}, вклÑÑаÑ:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2875 +#: documentation/content/en/articles/committers-guide/_index.adoc:2853 msgid "" "Contact details for people or organizations granting the special license." msgstr "" "ÐонÑакÑнÑе даннÑе Ð»Ð¸Ñ Ð¸Ð»Ð¸ оÑганизаÑий, пÑедоÑÑавлÑÑÑÐ¸Ñ ÑпеÑиалÑнÑÑ Ð»Ð¸ÑензиÑ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2876 +#: documentation/content/en/articles/committers-guide/_index.adoc:2854 msgid "" "What files, directories etc. in the repositories are covered by the license " "grant including the revision numbers where any specially licensed material " @@ -8194,7 +8142,7 @@ msgstr "" "оÑобÑми ÑÑловиÑми лиÑензиÑованиÑ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2877 +#: documentation/content/en/articles/committers-guide/_index.adoc:2855 msgid "" "The date the license comes into effect from. Unless otherwise agreed, this " "will be the date the license was issued by the authors of the software in " @@ -8204,12 +8152,12 @@ msgstr "" "вÑдаÑи лиÑензии авÑоÑами ÑооÑвеÑÑÑвÑÑÑего пÑогÑаммного обеÑпеÑениÑ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2878 +#: documentation/content/en/articles/committers-guide/_index.adoc:2856 msgid "The license text." msgstr "ТекÑÑ Ð»Ð¸Ñензии." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2879 +#: documentation/content/en/articles/committers-guide/_index.adoc:2857 msgid "" "A note of any restrictions, limitations or exceptions that apply " "specifically to FreeBSD's usage of the licensed material." @@ -8218,12 +8166,12 @@ msgstr "" "пÑименÑÑÑÑÑ ÐºÐ¾Ð½ÐºÑеÑно к иÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð»Ð¸ÑензионнÑÑ Ð¼Ð°ÑеÑиалов в FreeBSD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2880 +#: documentation/content/en/articles/committers-guide/_index.adoc:2858 msgid "Any other relevant information." msgstr "ÐÑÐ±Ð°Ñ Ð´ÑÑÐ³Ð°Ñ ÑооÑвеÑÑÑвÑÑÑÐ°Ñ Ð¸Ð½ÑоÑмаÑиÑ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2883 +#: documentation/content/en/articles/committers-guide/_index.adoc:2861 msgid "" "Once the {core-email} is satisfied that all the necessary details have been " "gathered and are correct, the secretary will send a PGP-signed " @@ -8237,7 +8185,7 @@ msgstr "" "ÑлÑжиÑÑ Ð½Ð°Ñим поÑÑоÑннÑм ÑвидеÑелÑÑÑвом о пÑедоÑÑавлении лиÑензии." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2886 +#: documentation/content/en/articles/committers-guide/_index.adoc:2864 msgid "" "The license archive should contain only details of license grants; this is " "not the place for any discussions around licensing or other subjects. " @@ -8249,13 +8197,13 @@ msgstr "" "даннÑм в аÑÑ Ð¸Ð²Ðµ лиÑензий бÑÐ´ÐµÑ Ð¿ÑедоÑÑавлÑÑÑÑÑ Ð¿Ð¾ запÑоÑÑ Ð² {core-email}." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2888 +#: documentation/content/en/articles/committers-guide/_index.adoc:2866 #, no-wrap msgid "SPDX Tags in the tree" msgstr "Теги SPDX в деÑеве" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2899 +#: documentation/content/en/articles/committers-guide/_index.adoc:2877 msgid "" "The project uses https://spdx.dev[SPDX] tags in our source base. At " "present, these tags are indented to help automated tools reconstruct license " @@ -8289,7 +8237,7 @@ msgstr "" "License-Identifier_." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2901 +#: documentation/content/en/articles/committers-guide/_index.adoc:2879 msgid "" "As of March 2021, approximately 25,000 out of 90,000 files in the tree have " "been marked." @@ -8298,13 +8246,13 @@ msgstr "" "бÑли помеÑенÑ." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2902 +#: documentation/content/en/articles/committers-guide/_index.adoc:2880 #, no-wrap msgid "Developer Relations" msgstr "ÐÑноÑÐµÐ½Ð¸Ñ Ñ ÑазÑабоÑÑиками" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2908 +#: documentation/content/en/articles/committers-guide/_index.adoc:2886 msgid "" "When working directly on your own code or on code which is already well " "established as your responsibility, then there is probably little need to " @@ -8327,7 +8275,7 @@ msgstr "" "filename]#Makefile#." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2912 +#: documentation/content/en/articles/committers-guide/_index.adoc:2890 msgid "" "To determine if an area of the tree is maintained, check the MAINTAINERS " "file at the root of the tree. If nobody is listed, scan the revision " @@ -8344,13 +8292,13 @@ msgstr "" "авÑоÑа, оÑÑоÑÑиÑованнÑÑ Ð¿Ð¾ ÑбÑÐ²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð»Ð¸ÑеÑÑва коммиÑов, иÑполÑзÑйÑе:" #. type: delimited block - 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2916 +#: documentation/content/en/articles/committers-guide/_index.adoc:2894 #, no-wrap msgid "% git -C /path/to/repo shortlog -sne --since=\"2 years\" -- relative/path/to/file\n" msgstr "% git -C /path/to/repo shortlog -sne --since=\"2 years\" -- relative/path/to/file\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2919 +#: documentation/content/en/articles/committers-guide/_index.adoc:2897 msgid "" "If queries go unanswered or the committer otherwise indicates a lack of " "interest in the area affected, go ahead and commit it." @@ -8359,7 +8307,7 @@ msgstr "" "оÑÑÑÑÑÑвие инÑеÑеÑа к заÑÑонÑÑой облаÑÑи, можно Ñмело вÑполнÑÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2924 +#: documentation/content/en/articles/committers-guide/_index.adoc:2902 msgid "" "Avoid sending private emails to maintainers. Other people might be " "interested in the conversation, not just the final output." @@ -8368,7 +8316,7 @@ msgstr "" "заинÑеÑеÑоваÑÑ Ð½Ðµ ÑолÑко иÑоговÑй ÑезÑлÑÑаÑ, но и обÑÑждение." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2930 +#: documentation/content/en/articles/committers-guide/_index.adoc:2908 msgid "" "If there is any doubt about a commit for any reason at all, have it reviewed " "before committing. Better to have it flamed then and there rather than when " @@ -8385,7 +8333,7 @@ msgstr "" "веÑнÑÑÑ Ð²ÑÑ Ð¾Ð±ÑаÑно." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2934 +#: documentation/content/en/articles/committers-guide/_index.adoc:2912 msgid "" "Do not impugn the intentions of others. If they see a different solution to " "a problem, or even a different problem, it is probably not because they are " @@ -8400,7 +8348,7 @@ msgstr "" "Ñ Ð¾ÑоÑо." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2937 +#: documentation/content/en/articles/committers-guide/_index.adoc:2915 msgid "" "Disagree honestly. Argue your position from its merits, be honest about any " "shortcomings it may have, and be open to seeing their solution, or even " @@ -8411,7 +8359,7 @@ msgstr "" "Ð¿Ð¾Ð½Ð¸Ð¼Ð°Ð½Ð¸Ñ Ð¸Ñ ÑеÑÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ даже Ð¸Ñ Ð²Ð¸Ð´ÐµÐ½Ð¸Ñ Ð¿ÑоблемÑ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2943 +#: documentation/content/en/articles/committers-guide/_index.adoc:2921 msgid "" "Accept correction. We are all fallible. When you have made a mistake, " "apologize and get on with life. Do not beat up yourself, and certainly do " @@ -8424,7 +8372,7 @@ msgstr "" "Ð¾Ð±Ð²Ð¸Ð½ÐµÐ½Ð¸Ñ â пÑоÑÑо иÑпÑавÑÑе пÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ð¸ двигайÑеÑÑ Ð´Ð°Ð»ÑÑе." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2947 +#: documentation/content/en/articles/committers-guide/_index.adoc:2925 msgid "" "Ask for help. Seek out (and give) peer reviews. One of the ways open " "source software is supposed to excel is in the number of eyeballs applied to " @@ -8435,13 +8383,13 @@ msgstr "" "колиÑеÑÑве пÑовеÑÑÑÑÐ¸Ñ ; но ÑÑо не ÑабоÑаеÑ, еÑли никÑо не пÑовеÑÑÐµÑ ÐºÐ¾Ð´." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2949 +#: documentation/content/en/articles/committers-guide/_index.adoc:2927 #, no-wrap msgid "If in Doubt..." msgstr "ÐÑли ÑомневаеÑеÑÑ..." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2953 +#: documentation/content/en/articles/committers-guide/_index.adoc:2931 msgid "" "When unsure about something, whether it be a technical issue or a project " "convention be sure to ask. If you stay silent you will never make progress." @@ -8451,7 +8399,7 @@ msgstr "" "пÑодвинеÑеÑÑ Ð²Ð¿ÐµÑÑд." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2957 +#: documentation/content/en/articles/committers-guide/_index.adoc:2935 msgid "" "If it relates to a technical issue ask on the public mailing lists. Avoid " "the temptation to email the individual person that knows the answer. This " @@ -8462,36 +8410,36 @@ msgstr "" "каждÑй ÑÐ¼Ð¾Ð¶ÐµÑ Ð¸Ð·Ð²Ð»ÐµÑÑ Ð¿Ð¾Ð»ÑÐ·Ñ Ð¸Ð· вопÑоÑа и оÑвеÑа." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2959 +#: documentation/content/en/articles/committers-guide/_index.adoc:2937 msgid "For project specific or administrative questions ask, in order:" msgstr "" "ÐÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑивнÑÑ Ð²Ð¾Ð¿ÑоÑов и вопÑоÑов, ÑвÑзаннÑÑ Ñ ÐºÐ¾Ð½ÐºÑеÑнÑм пÑоекÑом, " "обÑаÑайÑеÑÑ Ð² ÑледÑÑÑем поÑÑдке:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2961 +#: documentation/content/en/articles/committers-guide/_index.adoc:2939 msgid "Your mentor or former mentor." msgstr "ÐÐ°Ñ Ð½Ð°ÑÑавник или бÑвÑий наÑÑавник." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2962 +#: documentation/content/en/articles/committers-guide/_index.adoc:2940 msgid "An experienced committer on IRC, email, etc." msgstr "ÐпÑÑнÑй коммиÑÑÐµÑ â по IRC, ÑлекÑÑонной поÑÑе и Ñ.д." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2963 +#: documentation/content/en/articles/committers-guide/_index.adoc:2941 msgid "Any team with a \"hat\", as they can give you a definitive answer." msgstr "" "ÐÑÐ±Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ñ ÑолÑÑ (\"hat\"), Ñак как в ней вам могÑÑ Ð´Ð°ÑÑ Ð¾ÐºÐ¾Ð½ÑаÑелÑнÑй " "оÑвеÑ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2964 +#: documentation/content/en/articles/committers-guide/_index.adoc:2942 msgid "If still not sure, ask on {developers-name}." msgstr "ÐÑли вÑÑ ÐµÑÑ Ð½Ðµ ÑвеÑенÑ, ÑпÑоÑиÑе на {developers-name}." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2966 +#: documentation/content/en/articles/committers-guide/_index.adoc:2944 msgid "" "Once your question is answered, if no one pointed you to documentation that " "spelled out the answer to your question, document it, as others will have " @@ -8502,13 +8450,13 @@ msgstr "" "Ð²Ð¾Ð·Ð½Ð¸ÐºÐ½ÐµÑ ÑÐ¾Ñ Ð¶Ðµ вопÑоÑ." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2968 +#: documentation/content/en/articles/committers-guide/_index.adoc:2946 #, no-wrap msgid "Bugzilla" msgstr "Bugzilla" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2973 +#: documentation/content/en/articles/committers-guide/_index.adoc:2951 msgid "" "The FreeBSD Project utilizes Bugzilla for tracking bugs and change " "requests. If you commit a fix or suggestion found in the PR database, be " @@ -8521,7 +8469,7 @@ msgstr "" "вÑÐµÐ¼Ñ Ð·Ð°ÐºÑÑÑÑ Ð´ÑÑгие PR, ÑвÑзаннÑе Ñ Ð²Ð°Ñими коммиÑами." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2975 +#: documentation/content/en/articles/committers-guide/_index.adoc:2953 msgid "" "Committers with non-``FreeBSD.org`` Bugzilla accounts can have the old " "account merged with the `FreeBSD.org` account by following these steps:" @@ -8531,12 +8479,12 @@ msgstr "" "ÑледÑÑÑие Ñаги:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2979 +#: documentation/content/en/articles/committers-guide/_index.adoc:2957 msgid "Log in using your old account." msgstr "ÐойдиÑе, иÑполÑзÑÑ ÑÑаÑÑÑ ÑÑÑÑнÑÑ Ð·Ð°Ð¿Ð¸ÑÑ." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2980 +#: documentation/content/en/articles/committers-guide/_index.adoc:2958 msgid "" "Open new bug. Choose `Services` as the Product, and `Bug Tracker` as the " "Component. In bug description list accounts you wish to be merged." @@ -8546,7 +8494,7 @@ msgstr "" "обÑединиÑÑ." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2982 +#: documentation/content/en/articles/committers-guide/_index.adoc:2960 msgid "" "Log in using `FreeBSD.org` account and post comment to newly opened bug to " "confirm ownership. See crossref:committers-guide[kerberos-ldap, Kerberos and " @@ -8560,7 +8508,7 @@ msgstr "" "Kerberos и LDAP веб-паÑÐ¾Ð»Ñ Ð´Ð»Ñ ÐºÐ»Ð°ÑÑеÑа FreeBSD]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2983 +#: documentation/content/en/articles/committers-guide/_index.adoc:2961 msgid "" "If there are more than two accounts to merge, post comments from each of " "them." @@ -8569,30 +8517,30 @@ msgstr "" "Ð¾Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ из Ð½Ð¸Ñ ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2986 +#: documentation/content/en/articles/committers-guide/_index.adoc:2964 msgid "You can find out more about Bugzilla at:" msgstr "ÐÑ Ð¼Ð¾Ð¶ÐµÑе ÑзнаÑÑ Ð±Ð¾Ð»ÑÑе о Bugzilla на:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2988 +#: documentation/content/en/articles/committers-guide/_index.adoc:2966 msgid "extref:{pr-guidelines}[FreeBSD Problem Report Handling Guidelines]" msgstr "" "extref:{pr-guidelines}[РекомендаÑии по ÑабоÑе Ñ ÑообÑениÑми о пÑÐ¾Ð±Ð»ÐµÐ¼Ð°Ñ " "FreeBSD]" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2989 +#: documentation/content/en/articles/committers-guide/_index.adoc:2967 msgid "link:https://www.FreeBSD.org/support/[https://www.FreeBSD.org/support]" msgstr "link:https://www.FreeBSD.org/support/[https://www.FreeBSD.org/support]" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2991 +#: documentation/content/en/articles/committers-guide/_index.adoc:2969 #, no-wrap msgid "Phabricator" msgstr "Phabricator" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2995 +#: documentation/content/en/articles/committers-guide/_index.adoc:2973 msgid "" "The FreeBSD Project utilizes https://reviews.freebsd.org[Phabricator] for " "code review requests. See the https://wiki.freebsd.org/" @@ -8603,7 +8551,7 @@ msgstr "" "freebsd.org/Phabricator[ÑÑÑаниÑе Phabricator в вики]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2998 +#: documentation/content/en/articles/committers-guide/_index.adoc:2976 msgid "" "Please use the `git arc` command provided by `devel/freebsd-git-arc` " "(install the port or package, then type `git help arc` for documentation) to " @@ -8616,7 +8564,7 @@ msgstr "" "ÐÑо ÑпÑоÑÑÐ¸Ñ Ð´ÑÑгим пÑоÑеÑÑ ÑеÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¸ ÑеÑÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð°ÑÐ¸Ñ Ð¿Ð°ÑÑей." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3000 +#: documentation/content/en/articles/committers-guide/_index.adoc:2978 msgid "" "Committers with non-``FreeBSD.org`` Phabricator accounts can have the old " "account renamed to the ``FreeBSD.org`` account by following these steps:" @@ -8626,14 +8574,14 @@ msgstr "" "Ñаги:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3004 +#: documentation/content/en/articles/committers-guide/_index.adoc:2982 msgid "Change your Phabricator account email to your `FreeBSD.org` email." msgstr "" "ÐзмениÑе адÑÐµÑ ÑлекÑÑонной поÑÑÑ Ð²Ð°Ñей ÑÑÑÑной запиÑи Phabricator на Ð²Ð°Ñ " "`FreeBSD.org` email." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3006 +#: documentation/content/en/articles/committers-guide/_index.adoc:2984 msgid "" "Open new bug on our bug tracker using your `FreeBSD.org` account, see " "crossref:committers-guide[bugzilla, Bugzilla] for more information. Choose " @@ -8651,7 +8599,7 @@ msgstr "" "bob_example.com/`" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3011 +#: documentation/content/en/articles/committers-guide/_index.adoc:2989 msgid "" "Phabricator accounts cannot be merged, please do not open a new account." msgstr "" @@ -8659,13 +8607,13 @@ msgstr "" "ÑоздавайÑе новÑÑ ÑÑÑÑнÑÑ Ð·Ð°Ð¿Ð¸ÑÑ." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3014 +#: documentation/content/en/articles/committers-guide/_index.adoc:2992 #, no-wrap msgid "Who's Who" msgstr "ÐÑо еÑÑÑ ÐºÑо" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3017 +#: documentation/content/en/articles/committers-guide/_index.adoc:2995 msgid "" "Besides the repository meisters, there are other FreeBSD project members and " "teams whom you will probably get to know in your role as a committer. " @@ -8676,13 +8624,13 @@ msgstr "" "коммиÑÑеÑа. ÐÑаÑко и далеко не иÑÑеÑпÑваÑÑе, Ð²Ð¾Ñ Ð¾Ð½Ð¸:" #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:3018 +#: documentation/content/en/articles/committers-guide/_index.adoc:2996 #, no-wrap msgid "`{doceng}`" msgstr "`{doceng}`" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3024 +#: documentation/content/en/articles/committers-guide/_index.adoc:3002 msgid "" "doceng is the group responsible for the documentation build infrastructure, " "approving new documentation committers, and ensuring that the FreeBSD " @@ -8705,13 +8653,13 @@ msgstr "" "[ÐÑÐ¾ÐµÐºÑ Ð´Ð¾ÐºÑменÑаÑии FreeBSD: введение Ð´Ð»Ñ Ð½Ð¾Ð²ÑÑ ÑÑаÑÑников]." #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:3025 +#: documentation/content/en/articles/committers-guide/_index.adoc:3003 #, no-wrap msgid "`{re-members}`" msgstr "`{re-members}`" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3030 +#: documentation/content/en/articles/committers-guide/_index.adoc:3008 msgid "" "These are the members of the `{re}`. This team is responsible for setting " "release deadlines and controlling the release process. During code freezes, " @@ -8729,13 +8677,13 @@ msgstr "" "вопÑоÑ." #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:3031 +#: documentation/content/en/articles/committers-guide/_index.adoc:3009 #, no-wrap msgid "`{so}`" msgstr "`{so}`" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3033 +#: documentation/content/en/articles/committers-guide/_index.adoc:3011 msgid "" "`{so-name}` is the link:https://www.FreeBSD.org/security/[FreeBSD Security " "Officer] and oversees the `{security-officer}`." @@ -8744,7 +8692,7 @@ msgstr "" "безопаÑноÑÑÑ FreeBSD], коÑоÑÑй кÑÑиÑÑÐµÑ ÑабоÑÑ `{security-officer}`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3038 +#: documentation/content/en/articles/committers-guide/_index.adoc:3016 msgid "" "{committers-name}:: {dev-src-all}, {dev-ports-all} and {dev-doc-all} are the " "mailing lists that the version control system uses to send commit messages " @@ -8758,7 +8706,7 @@ msgstr "" "непоÑÑедÑÑвенно ÑвÑÐ·Ð°Ð½Ñ Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñом." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3043 +#: documentation/content/en/articles/committers-guide/_index.adoc:3021 msgid "" "{developers-name}:: All committers are subscribed to -developers. This list " "was created to be a forum for the committers \"community\" issues. Examples " @@ -8769,7 +8717,7 @@ msgstr "" "коммиÑÑеÑов. ÐÑимеÑÑ Ð²ÐºÐ»ÑÑаÑÑ Ð³Ð¾Ð»Ð¾ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Core, обÑÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð¸ Ñ.д." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3047 +#: documentation/content/en/articles/committers-guide/_index.adoc:3025 msgid "" "The {developers-name} is for the exclusive use of FreeBSD committers. To " "develop FreeBSD, committers must have the ability to openly discuss matters " @@ -8784,7 +8732,7 @@ msgstr "" "оÑкÑÑÑой пÑбликаÑии и могÑÑ Ð½Ð°Ð²ÑедиÑÑ FreeBSD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3051 +#: documentation/content/en/articles/committers-guide/_index.adoc:3029 msgid "" "All FreeBSD committers are expected not to not publish or forward messages " "from the {developers-name} outside the list membership without permission of " @@ -8799,7 +8747,7 @@ msgstr "" "поÑÑоÑÐ½Ð½Ð¾Ð¼Ñ Ð»Ð¸ÑÐµÐ½Ð¸Ñ Ð¿Ñивилегий на коммиÑ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3057 +#: documentation/content/en/articles/committers-guide/_index.adoc:3035 msgid "" "This list is _not_ intended as a place for code reviews or for any technical " "discussion. In fact using it as such hurts the FreeBSD Project as it gives " @@ -8821,13 +8769,13 @@ msgstr "" "Ð¾Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑпиÑка." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3058 +#: documentation/content/en/articles/committers-guide/_index.adoc:3036 #, no-wrap msgid "SSH Quick-Start Guide" msgstr "Ð ÑководÑÑво по бÑÑÑÑÐ¾Ð¼Ñ Ð½Ð°ÑÐ°Ð»Ñ ÑабоÑÑ Ñ SSH" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3063 +#: documentation/content/en/articles/committers-guide/_index.adoc:3041 msgid "" "If you do not wish to type your password in every time you use man:ssh[1], " "and you use keys to authenticate, man:ssh-agent[1] is there for your " @@ -8844,7 +8792,7 @@ msgstr "" "ÐодÑобноÑÑи Ñм. в man:ssh-agent[1]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3064 +#: documentation/content/en/articles/committers-guide/_index.adoc:3042 msgid "" "Generate a key pair using man:ssh-keygen[1]. The key pair will wind up in " "your [.filename]#$HOME/.ssh/# directory." @@ -8853,12 +8801,12 @@ msgstr "" "ваÑем каÑалоге [.filename]#$HOME/.ssh/#." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:3068 +#: documentation/content/en/articles/committers-guide/_index.adoc:3046 msgid "Only ECDSA, Ed25519 or RSA keys are supported." msgstr "ÐоддеÑживаÑÑÑÑ ÑолÑко клÑÑи ECDSA, Ed25519 или RSA." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3070 +#: documentation/content/en/articles/committers-guide/_index.adoc:3048 msgid "" "Send your public key ([.filename]#$HOME/.ssh/id_ecdsa.pub#, [.filename]#" "$HOME/.ssh/id_ed25519.pub#, or [.filename]#$HOME/.ssh/id_rsa.pub#) to the " @@ -8872,7 +8820,7 @@ msgstr "" "`freefall`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3075 +#: documentation/content/en/articles/committers-guide/_index.adoc:3053 msgid "" "Now man:ssh-add[1] can be used for authentication once per session. It " "prompts for the private key's pass phrase, and then stores it in the " @@ -8885,14 +8833,14 @@ msgstr "" "ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÐºÐ»ÑÑей, ÑÐ¾Ñ ÑанÑннÑÑ Ð² агенÑе." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3077 +#: documentation/content/en/articles/committers-guide/_index.adoc:3055 msgid "Test with a simple remote command: `ssh freefall.FreeBSD.org ls /usr`." msgstr "" "ÐÑовеÑка Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð¿ÑоÑÑой ÑдалÑнной командÑ: `ssh freefall.FreeBSD.org ls /" "usr`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3079 +#: documentation/content/en/articles/committers-guide/_index.adoc:3057 msgid "" "For more information, see package:security/openssh-portable[], man:ssh[1], " "man:ssh-add[1], man:ssh-agent[1], man:ssh-keygen[1], and man:scp[1]." @@ -8902,7 +8850,7 @@ msgstr "" "и man:scp[1]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3081 +#: documentation/content/en/articles/committers-guide/_index.adoc:3059 msgid "" "For information on adding, changing, or removing man:ssh[1] keys, see " "https://wiki.freebsd.org/clusteradm/ssh-keys[this article]." @@ -8911,13 +8859,13 @@ msgstr "" "https://wiki.freebsd.org/clusteradm/ssh-keys[ÑÑÑ ÑÑаÑÑÑ]." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3083 +#: documentation/content/en/articles/committers-guide/_index.adoc:3061 #, no-wrap msgid "Coverity(R) Availability for FreeBSD Committers" msgstr "ÐоÑÑÑпноÑÑÑ Coverity(R) Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸ÑÑеÑов FreeBSD" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3087 +#: documentation/content/en/articles/committers-guide/_index.adoc:3065 msgid "" "All FreeBSD developers can obtain access to Coverity analysis results of all " "FreeBSD Project software. All who are interested in obtaining access to the " @@ -8930,7 +8878,7 @@ msgstr "" "могÑÑ Ð·Ð°ÑегиÑÑÑиÑоваÑÑÑÑ Ð½Ð° http://scan.coverity.com/[Coverity Scan]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3090 +#: documentation/content/en/articles/committers-guide/_index.adoc:3068 msgid "" "The FreeBSD wiki includes a mini-guide for developers who are interested in " "working with the Coverity(R) analysis reports: https://wiki.freebsd.org/" @@ -8947,7 +8895,7 @@ msgstr "" "добавиÑÑ Ð²Ð°Ñ Ð² ÑооÑвеÑÑÑвÑÑÑий ÑпиÑок доÑÑÑпа к вики." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3092 +#: documentation/content/en/articles/committers-guide/_index.adoc:3070 msgid "" "Finally, all FreeBSD developers who are going to use Coverity(R) are always " "encouraged to ask for more details and usage information, by posting any " @@ -8958,13 +8906,13 @@ msgstr "" "иÑполÑзовании, задав лÑбÑе вопÑоÑÑ Ð² ÑпиÑке ÑаÑÑÑлки ÑазÑабоÑÑиков FreeBSD." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3094 +#: documentation/content/en/articles/committers-guide/_index.adoc:3072 #, no-wrap msgid "The FreeBSD Committers' Big List of Rules" msgstr "ÐолÑÑой ÑпиÑок пÑавил коммиÑÑеÑов FreeBSD" *** 3264 LINES SKIPPED ***