From nobody Tue Jun 20 00:10:47 2023 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlRqX0cRQz4fxWg for ; Tue, 20 Jun 2023 00:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlRqX0L8wz4BpC; Tue, 20 Jun 2023 00:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687219848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s4iGNtSEw8eY7ZUhmfS0jlLpuOq4AYa0+ISiwxnmIPI=; b=uOGTOoNws354fre0VJ4iToStZ1P/qG1TZg608MCrUNY22CvOBvtcnKFrcs9/7mA0p1OuZO xRxBpemK0bpbJlBKVURGzk0Xyo01TPxspm+ZYCXTdxzICK+CDVs/pKIa1NEQAWN7nR2sex yI8S8aSGjRiLMgjZA5QRP5D6igNKIkLRwgxY5+MCYmqRSZB6Vc6+lTvpraqpoZA8Auz5ih 4JR4Q+topVxsLldxCXsEm6sHIlnixZhzCE2yyulyuoTDeGLWEw8N9LXXMcdsEPn/CpESnp O5eFKlbu9yzLBM7kn5I9m5UjlyfOTuDpEfej/n4Th7Ee7NnfGUwN+kpZaz9I5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687219848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s4iGNtSEw8eY7ZUhmfS0jlLpuOq4AYa0+ISiwxnmIPI=; b=ty3FC6rU9bZqLU2Gyo8/IX/G5Yg6L3eFYt1rJLH5wfQw00VG8KiBCfVyuDWwK3QZ2kVxgL RSDLGftP6IueIOQMub16bPu6FJe0AWuSAnSI7AZlRomnGN15KN7I7dig/qR2gCNZEt/hQx I299W5/H7ETT870gPMcoFZMAi3JnVRi1+6JUQDnVnI8Ma2ocyaEqHmP5SO8BLIDm/Wdqdf P6IwNDGLF5uT5phUZ5zIm7S4A6/MtoSZ1dy6tg/ojEGA8hEbp+IfWUkQ9Up/SuqF5EiZ5s Oj3yLGRwYcqiJ7c+jql3yAx41NFX9DHLHzRMn2yGrmIAVOu+M++vrDoQMsZlmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687219848; a=rsa-sha256; cv=none; b=B3e1OgHv5kjH1gQsqhgDfq7p5MV2nDlq9V1MUYcfizL0ErGs5yVxw4SDL58h+chAFdCDDk NaHZ8K9DkNx57Xz0/d3NUZmIU/xGzanASMw281KmCxhQp5oJlzky2GOWGyXIi3YSPc5kb6 4VYTGa8od7RksdRjc/um4Acr+rjfSiCKsBE0mCusOlfFQYLPutB3TIMH/E04FB5rugECUk WK0hvM6oxaQ0C0Nbxv5PvCyHat81XQR0F4X/TlTkYnIyvAtcSQpxGu+MIDEZxt6SDcVLcc TpBD/1VcV5GoDh7Yo3FRbEdmRosA+xhvMZ4zk/G9Qy55P+9IaBrltnvdr72FjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QlRqW6TfhzdPd; Tue, 20 Jun 2023 00:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K0Al6h033999; Tue, 20 Jun 2023 00:10:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K0AlpS033998; Tue, 20 Jun 2023 00:10:47 GMT (envelope-from git) Date: Tue, 20 Jun 2023 00:10:47 GMT Message-Id: <202306200010.35K0AlpS033998@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: d2d37f4958 - main - doc: Update source files (en .po), for translations List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2d37f4958fb67a5780b9b990d28f7b204364fa4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=d2d37f4958fb67a5780b9b990d28f7b204364fa4 commit d2d37f4958fb67a5780b9b990d28f7b204364fa4 Author: Danilo G. Baio AuthorDate: 2023-06-20 00:10:01 +0000 Commit: Danilo G. Baio CommitDate: 2023-06-20 00:10:01 +0000 doc: Update source files (en .po), for translations --- .../content/en/articles/committers-guide/_index.po | 870 ++++++++-------- .../content/en/articles/linux-users/_index.po | 8 +- .../content/en/articles/pgpkeys/_index.po | 426 ++++---- .../developers-handbook/introduction/_index.po | 262 +---- documentation/content/en/books/faq/_index.po | 121 ++- .../en/books/fdp-primer/editor-config/_index.po | 4 +- .../en/books/fdp-primer/manual-pages/_index.po | 4 +- .../en/books/fdp-primer/po-translations/_index.po | 350 +++---- .../content/en/books/fdp-primer/see-also/_index.po | 4 +- .../en/books/fdp-primer/trademarks/_index.po | 4 +- .../content/en/books/fdp-primer/weblate/_index.po | 1073 ++++++++++++++++++++ .../en/books/fdp-primer/writing-style/_index.po | 4 +- .../content/en/books/handbook/security/_index.po | 8 +- .../en/books/porters-handbook/pkg-files/_index.po | 185 ++-- 14 files changed, 2059 insertions(+), 1264 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index e1d331ec20..19fe1141df 100644 --- a/documentation/content/en/articles/committers-guide/_index.po +++ b/documentation/content/en/articles/committers-guide/_index.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2023-05-21 14:43-0300\n" +"POT-Creation-Date: 2023-06-19 21:08-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5135,25 +5135,27 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2485 +#: documentation/content/en/articles/committers-guide/_index.adoc:2486 #, no-wrap -msgid "`Submitted by:`" +msgid "" +"`Submitted by:` +\n" +"(deprecated)" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2487 +#: documentation/content/en/articles/committers-guide/_index.adoc:2488 #, no-wrap msgid "This has been deprecated with git; submitted patches should have the author set by using `git commit --author` with a full name and valid email." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2488 +#: documentation/content/en/articles/committers-guide/_index.adoc:2489 #, no-wrap msgid "`Reviewed by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2503 +#: documentation/content/en/articles/committers-guide/_index.adoc:2504 #, no-wrap msgid "" "The name and e-mail address of the person or people that reviewed the change; for developers, just the username on the FreeBSD cluster. If a patch was submitted to a mailing list for review, and the review was favorable, then just include the list name. If the reviewer is not a member of the project, provide the name, email, and if ports an external role like maintainer:\n" @@ -5172,25 +5174,25 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2504 +#: documentation/content/en/articles/committers-guide/_index.adoc:2505 #, no-wrap msgid "`Tested by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2506 +#: documentation/content/en/articles/committers-guide/_index.adoc:2507 #, no-wrap msgid "The name and e-mail address of the person or people that tested the change; for developers, just the username on the FreeBSD cluster." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2507 +#: documentation/content/en/articles/committers-guide/_index.adoc:2508 #, no-wrap msgid "`Approved by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2532 +#: documentation/content/en/articles/committers-guide/_index.adoc:2533 #, no-wrap msgid "" "The name and e-mail address of the person or people that approved the change; for developers, just the username on the FreeBSD cluster.\n" @@ -5218,121 +5220,121 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2533 +#: documentation/content/en/articles/committers-guide/_index.adoc:2534 #, no-wrap msgid "`Obtained from:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2535 +#: documentation/content/en/articles/committers-guide/_index.adoc:2536 #, no-wrap msgid "The name of the project (if any) from which the code was obtained. Do not use this line for the name of an individual person." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2536 +#: documentation/content/en/articles/committers-guide/_index.adoc:2537 #, no-wrap msgid "`Fixes:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2538 +#: documentation/content/en/articles/committers-guide/_index.adoc:2539 #, no-wrap msgid "The Git short hash and the title line of a commit that is fixed by this change as returned by `git log -n 1 --oneline GIT-COMMIT-HASH`." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2539 +#: documentation/content/en/articles/committers-guide/_index.adoc:2540 #, no-wrap msgid "`MFC after:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2541 +#: documentation/content/en/articles/committers-guide/_index.adoc:2542 #, no-wrap msgid "To receive an e-mail reminder to MFC at a later date, specify the number of days, weeks, or months after which an MFC is planned." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2542 +#: documentation/content/en/articles/committers-guide/_index.adoc:2543 #, no-wrap msgid "`MFC to:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2544 +#: documentation/content/en/articles/committers-guide/_index.adoc:2545 #, no-wrap msgid "If the commit should be merged to a subset of stable branches, specify the branch names." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2545 +#: documentation/content/en/articles/committers-guide/_index.adoc:2546 #, no-wrap msgid "`MFH:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2547 +#: documentation/content/en/articles/committers-guide/_index.adoc:2548 #, no-wrap msgid "If the commit is to be merged into a ports quarterly branch name, specify the quarterly branch. For example `2021Q2`." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2548 +#: documentation/content/en/articles/committers-guide/_index.adoc:2549 #, no-wrap msgid "`Relnotes:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2550 +#: documentation/content/en/articles/committers-guide/_index.adoc:2551 #, no-wrap msgid "If the change is a candidate for inclusion in the release notes for the next release from the branch, set to `yes`." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2551 +#: documentation/content/en/articles/committers-guide/_index.adoc:2552 #, no-wrap msgid "`Security:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2553 +#: documentation/content/en/articles/committers-guide/_index.adoc:2554 #, no-wrap msgid "If the change is related to a security vulnerability or security exposure, include one or more references or a description of the issue. If possible, include a VuXML URL or a CVE ID." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2554 +#: documentation/content/en/articles/committers-guide/_index.adoc:2555 #, no-wrap msgid "`Event:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2556 +#: documentation/content/en/articles/committers-guide/_index.adoc:2557 #, no-wrap msgid "The description for the event where this commit was made. If this is a recurring event, add the year or even the month to it. For example, this could be `FooBSDcon 2019`. The idea behind this line is to put recognition to conferences, gatherings, and other types of meetups and to show that these are useful to have. Please do not use the `Sponsored by:` line for this as that is meant for organizations sponsoring certain features or developers working on them." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2557 +#: documentation/content/en/articles/committers-guide/_index.adoc:2558 #, no-wrap msgid "`Sponsored by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2559 +#: documentation/content/en/articles/committers-guide/_index.adoc:2560 #, no-wrap msgid "Sponsoring organizations for this change, if any. Separate multiple organizations with commas. If only a portion of the work was sponsored, or different amounts of sponsorship were provided to different authors, please give appropriate credit in parentheses after each sponsor name. For example, `Example.com (alice, code refactoring), Wormulon (bob), Momcorp (cindy)` shows that Alice was sponsored by Example.com to do code refactoring, while Wormulon sponsored Bob's work and Momcorp sponsored Cindy's work. Other authors were either not sponsored or chose not to list sponsorship." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2560 +#: documentation/content/en/articles/committers-guide/_index.adoc:2561 #, no-wrap msgid "`Pull Request:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2564 +#: documentation/content/en/articles/committers-guide/_index.adoc:2565 #, no-wrap msgid "" "This change was submitted as a pull request or merge request against one of FreeBSD's public read-only Git repositories.\n" @@ -5341,73 +5343,73 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2565 +#: documentation/content/en/articles/committers-guide/_index.adoc:2566 #, no-wrap msgid "`Signed-off-by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2567 +#: documentation/content/en/articles/committers-guide/_index.adoc:2568 #, no-wrap msgid "ID certifies compliance with https://developercertificate.org/" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2568 +#: documentation/content/en/articles/committers-guide/_index.adoc:2569 #, no-wrap msgid "`Differential Revision:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2570 +#: documentation/content/en/articles/committers-guide/_index.adoc:2571 #, no-wrap msgid "The full URL of the Phabricator review. This line __must be the last line__. For example: `https://reviews.freebsd.org/D1708`." msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2572 +#: documentation/content/en/articles/committers-guide/_index.adoc:2573 #, no-wrap msgid "Commit Log for a Commit Based on a PR" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2578 +#: documentation/content/en/articles/committers-guide/_index.adoc:2579 msgid "" "The commit is based on a patch from a PR submitted by John Smith. The " "commit message \"PR\" field is filled." msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2582 -#: documentation/content/en/articles/committers-guide/_index.adoc:2600 -#: documentation/content/en/articles/committers-guide/_index.adoc:2615 -#: documentation/content/en/articles/committers-guide/_index.adoc:2631 -#: documentation/content/en/articles/committers-guide/_index.adoc:2646 +#: documentation/content/en/articles/committers-guide/_index.adoc:2583 +#: documentation/content/en/articles/committers-guide/_index.adoc:2601 +#: documentation/content/en/articles/committers-guide/_index.adoc:2616 +#: documentation/content/en/articles/committers-guide/_index.adoc:2632 +#: documentation/content/en/articles/committers-guide/_index.adoc:2647 #, no-wrap msgid "...\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2584 +#: documentation/content/en/articles/committers-guide/_index.adoc:2585 #, no-wrap msgid "PR:\t\t12345\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2587 +#: documentation/content/en/articles/committers-guide/_index.adoc:2588 msgid "" "The committer sets the author of the patch with `git commit --author \"John " "Smith \"`." msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2590 +#: documentation/content/en/articles/committers-guide/_index.adoc:2591 #, no-wrap msgid "Commit Log for a Commit Needing Review" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2596 +#: documentation/content/en/articles/committers-guide/_index.adoc:2597 msgid "" "The virtual memory system is being changed. After posting patches to the " "appropriate mailing list (in this case, `freebsd-arch`) and the changes have " @@ -5415,73 +5417,73 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2602 +#: documentation/content/en/articles/committers-guide/_index.adoc:2603 #, no-wrap msgid "Reviewed by:\t-arch\n" msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2606 +#: documentation/content/en/articles/committers-guide/_index.adoc:2607 #, no-wrap msgid "Commit Log for a Commit Needing Approval" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2611 +#: documentation/content/en/articles/committers-guide/_index.adoc:2612 msgid "" "Commit a port, after working with the listed MAINTAINER, who said to go " "ahead and commit." msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2617 +#: documentation/content/en/articles/committers-guide/_index.adoc:2618 #, no-wrap msgid "Approved by:\tabc (maintainer)\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2620 +#: documentation/content/en/articles/committers-guide/_index.adoc:2621 msgid "Where _abc_ is the account name of the person who approved." msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2622 +#: documentation/content/en/articles/committers-guide/_index.adoc:2623 #, no-wrap msgid "Commit Log for a Commit Bringing in Code from OpenBSD" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2627 +#: documentation/content/en/articles/committers-guide/_index.adoc:2628 msgid "Committing some code based on work done in the OpenBSD project." msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2633 +#: documentation/content/en/articles/committers-guide/_index.adoc:2634 #, no-wrap msgid "Obtained from:\tOpenBSD\n" msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2637 +#: documentation/content/en/articles/committers-guide/_index.adoc:2638 #, no-wrap msgid "Commit Log for a Change to FreeBSD-CURRENT with a Planned Commit to FreeBSD-STABLE to Follow at a Later Date." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2642 +#: documentation/content/en/articles/committers-guide/_index.adoc:2643 msgid "" "Committing some code which will be merged from FreeBSD-CURRENT into the " "FreeBSD-STABLE branch after two weeks." msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2648 +#: documentation/content/en/articles/committers-guide/_index.adoc:2649 #, no-wrap msgid "MFC after:\t2 weeks\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2651 +#: documentation/content/en/articles/committers-guide/_index.adoc:2652 msgid "" "Where _2_ is the number of days, weeks, or months after which an MFC is " "planned. The _weeks_ option may be `day`, `days`, `week`, `weeks`, `month`, " @@ -5489,12 +5491,12 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2654 +#: documentation/content/en/articles/committers-guide/_index.adoc:2655 msgid "It is often necessary to combine these." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2658 +#: documentation/content/en/articles/committers-guide/_index.adoc:2659 msgid "" "Consider the situation where a user has submitted a PR containing code from " "the NetBSD project. Looking at the PR, the developer sees it is not an area " @@ -5504,19 +5506,19 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2660 +#: documentation/content/en/articles/committers-guide/_index.adoc:2661 msgid "" "The extra information to include in the commit would look something like" msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2661 +#: documentation/content/en/articles/committers-guide/_index.adoc:2662 #, no-wrap msgid "Example Combined Commit Log" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2672 +#: documentation/content/en/articles/committers-guide/_index.adoc:2673 #, no-wrap msgid "" "PR:\t\t54321\n" @@ -5527,13 +5529,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2677 +#: documentation/content/en/articles/committers-guide/_index.adoc:2678 #, no-wrap msgid "Preferred License for New Files" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2683 +#: documentation/content/en/articles/committers-guide/_index.adoc:2684 msgid "" "The FreeBSD Project's full license policy can be found at link:https://www." "FreeBSD.org/internal/software-license/[https://www.FreeBSD.org/internal/" @@ -5543,14 +5545,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2685 +#: documentation/content/en/articles/committers-guide/_index.adoc:2686 msgid "" "The FreeBSD Project suggests and uses this text as the preferred license " "scheme:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2716 +#: documentation/content/en/articles/committers-guide/_index.adoc:2717 #, no-wrap msgid "" "/*-\n" @@ -5584,7 +5586,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2722 +#: documentation/content/en/articles/committers-guide/_index.adoc:2723 msgid "" "The FreeBSD project strongly discourages the so-called \"advertising " "clause\" in new code. Due to the large number of contributors to the " @@ -5595,7 +5597,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2726 +#: documentation/content/en/articles/committers-guide/_index.adoc:2727 msgid "" "The FreeBSD project discourages completely new licenses and variations on " "the standard licenses. New licenses require the approval of {core-email} to " @@ -5606,7 +5608,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2730 +#: documentation/content/en/articles/committers-guide/_index.adoc:2731 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 " @@ -5617,7 +5619,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2733 +#: documentation/content/en/articles/committers-guide/_index.adoc:2734 msgid "" "Developers are reminded that in open source, getting \"open\" right is just " "as important as getting \"source\" right, as improper handling of " @@ -5626,13 +5628,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2735 +#: documentation/content/en/articles/committers-guide/_index.adoc:2736 #, no-wrap msgid "Keeping Track of Licenses Granted to the FreeBSD Project" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2740 +#: documentation/content/en/articles/committers-guide/_index.adoc:2741 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 " @@ -5643,7 +5645,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2745 +#: documentation/content/en/articles/committers-guide/_index.adoc:2746 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 " @@ -5653,13 +5655,13 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2747 +#: documentation/content/en/articles/committers-guide/_index.adoc:2748 msgid "" "Contact details for people or organizations granting the special license." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2748 +#: documentation/content/en/articles/committers-guide/_index.adoc:2749 msgid "" "What files, directories etc. in the repositories are covered by the license " "grant including the revision numbers where any specially licensed material " @@ -5667,7 +5669,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2749 +#: documentation/content/en/articles/committers-guide/_index.adoc:2750 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 " @@ -5675,24 +5677,24 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2750 +#: documentation/content/en/articles/committers-guide/_index.adoc:2751 msgid "The license text." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2751 +#: documentation/content/en/articles/committers-guide/_index.adoc:2752 msgid "" "A note of any restrictions, limitations or exceptions that apply " "specifically to FreeBSD's usage of the licensed material." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2752 +#: documentation/content/en/articles/committers-guide/_index.adoc:2753 msgid "Any other relevant information." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2755 +#: documentation/content/en/articles/committers-guide/_index.adoc:2756 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 " @@ -5702,7 +5704,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2758 +#: documentation/content/en/articles/committers-guide/_index.adoc:2759 msgid "" "The license archive should contain only details of license grants; this is " "not the place for any discussions around licensing or other subjects. " @@ -5711,13 +5713,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2760 +#: documentation/content/en/articles/committers-guide/_index.adoc:2761 #, no-wrap msgid "SPDX Tags in the tree" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2771 +#: documentation/content/en/articles/committers-guide/_index.adoc:2772 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 " @@ -5736,20 +5738,20 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2773 +#: documentation/content/en/articles/committers-guide/_index.adoc:2774 msgid "" "As of March 2021, approximately 25,000 out of 90,000 files in the tree have " "been marked." msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2774 +#: documentation/content/en/articles/committers-guide/_index.adoc:2775 #, no-wrap msgid "Developer Relations" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2780 +#: documentation/content/en/articles/committers-guide/_index.adoc:2781 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 " @@ -5762,7 +5764,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2784 +#: documentation/content/en/articles/committers-guide/_index.adoc:2785 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 " @@ -5773,27 +5775,27 @@ msgid "" msgstr "" #. type: delimited block - 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2788 +#: documentation/content/en/articles/committers-guide/_index.adoc:2789 #, no-wrap msgid "% git -C /path/to/repo shortlog -sne --since=\"2 years\" -- relative/path/to/file\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2791 +#: documentation/content/en/articles/committers-guide/_index.adoc:2792 msgid "" "If queries go unanswered or the committer otherwise indicates a lack of " "interest in the area affected, go ahead and commit it." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2796 +#: documentation/content/en/articles/committers-guide/_index.adoc:2797 msgid "" "Avoid sending private emails to maintainers. Other people might be " "interested in the conversation, not just the final output." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2802 +#: documentation/content/en/articles/committers-guide/_index.adoc:2803 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 " @@ -5804,7 +5806,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2806 +#: documentation/content/en/articles/committers-guide/_index.adoc:2807 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 " @@ -5814,7 +5816,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2809 +#: documentation/content/en/articles/committers-guide/_index.adoc:2810 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 " @@ -5822,7 +5824,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2815 +#: documentation/content/en/articles/committers-guide/_index.adoc:2816 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 " @@ -5831,7 +5833,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2819 +#: documentation/content/en/articles/committers-guide/_index.adoc:2820 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 " @@ -5839,20 +5841,20 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2821 +#: documentation/content/en/articles/committers-guide/_index.adoc:2822 #, no-wrap msgid "If in Doubt..." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2825 +#: documentation/content/en/articles/committers-guide/_index.adoc:2826 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." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2829 +#: documentation/content/en/articles/committers-guide/_index.adoc:2830 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 " @@ -5860,32 +5862,32 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2831 +#: documentation/content/en/articles/committers-guide/_index.adoc:2832 msgid "For project specific or administrative questions ask, in order:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2833 +#: documentation/content/en/articles/committers-guide/_index.adoc:2834 msgid "Your mentor or former mentor." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2834 +#: documentation/content/en/articles/committers-guide/_index.adoc:2835 msgid "An experienced committer on IRC, email, etc." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2835 +#: documentation/content/en/articles/committers-guide/_index.adoc:2836 msgid "Any team with a \"hat\", as they can give you a definitive answer." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2836 +#: documentation/content/en/articles/committers-guide/_index.adoc:2837 msgid "If still not sure, ask on {developers-name}." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2838 +#: documentation/content/en/articles/committers-guide/_index.adoc:2839 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 " @@ -5893,13 +5895,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2840 +#: documentation/content/en/articles/committers-guide/_index.adoc:2841 #, no-wrap msgid "Bugzilla" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2845 +#: documentation/content/en/articles/committers-guide/_index.adoc:2846 msgid "" "The FreeBSD Project utilizes Bugzilla for tracking bugs and change " "requests. Be sure that if you commit a fix or suggestion found in the PR " @@ -5908,26 +5910,26 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2847 +#: documentation/content/en/articles/committers-guide/_index.adoc:2848 msgid "" "Committers with non-``FreeBSD.org`` Bugzilla accounts can have the old " "account merged with the `FreeBSD.org` account by following these steps:" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2851 +#: documentation/content/en/articles/committers-guide/_index.adoc:2852 msgid "Log in using your old account." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2852 +#: documentation/content/en/articles/committers-guide/_index.adoc:2853 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." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2853 +#: documentation/content/en/articles/committers-guide/_index.adoc:2854 msgid "" "Log in using `FreeBSD.org` account and post comment to newly opened bug to " "confirm ownership. See <> for more details on how to generate " @@ -5935,35 +5937,35 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2854 +#: documentation/content/en/articles/committers-guide/_index.adoc:2855 msgid "" "If there are more than two accounts to merge, post comments from each of " "them." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2857 +#: documentation/content/en/articles/committers-guide/_index.adoc:2858 msgid "You can find out more about Bugzilla at:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2859 +#: documentation/content/en/articles/committers-guide/_index.adoc:2860 msgid "extref:{pr-guidelines}[FreeBSD Problem Report Handling Guidelines]" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2860 +#: documentation/content/en/articles/committers-guide/_index.adoc:2861 msgid "link:https://www.FreeBSD.org/support/[https://www.FreeBSD.org/support]" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2862 +#: documentation/content/en/articles/committers-guide/_index.adoc:2863 #, no-wrap msgid "Phabricator" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2866 +#: documentation/content/en/articles/committers-guide/_index.adoc:2867 msgid "" "The FreeBSD Project utilizes https://reviews.freebsd.org[Phabricator] for " "code review requests. See the https://wiki.freebsd.org/" @@ -5971,19 +5973,19 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2868 +#: documentation/content/en/articles/committers-guide/_index.adoc:2869 msgid "" "Committers with non-``FreeBSD.org`` Phabricator accounts can have the old " "account renamed to the ``FreeBSD.org`` account by following these steps:" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2872 +#: documentation/content/en/articles/committers-guide/_index.adoc:2873 msgid "Change your Phabricator account email to your `FreeBSD.org` email." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2873 +#: documentation/content/en/articles/committers-guide/_index.adoc:2874 msgid "" "Open new bug on our bug tracker using your `FreeBSD.org` account, see " "<> for more information. Choose `Services` as the Product, and " @@ -5993,19 +5995,19 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2878 +#: documentation/content/en/articles/committers-guide/_index.adoc:2879 msgid "" "Phabricator accounts cannot be merged, please do not open a new account." msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2881 +#: documentation/content/en/articles/committers-guide/_index.adoc:2882 #, no-wrap msgid "Who's Who" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2884 +#: documentation/content/en/articles/committers-guide/_index.adoc:2885 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. " @@ -6013,13 +6015,13 @@ msgid "" msgstr "" #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:2885 +#: documentation/content/en/articles/committers-guide/_index.adoc:2886 #, no-wrap msgid "`{doceng}`" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2891 +#: documentation/content/en/articles/committers-guide/_index.adoc:2892 msgid "" "doceng is the group responsible for the documentation build infrastructure, " "approving new documentation committers, and ensuring that the FreeBSD " @@ -6033,13 +6035,13 @@ msgid "" msgstr "" #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:2892 +#: documentation/content/en/articles/committers-guide/_index.adoc:2893 #, no-wrap msgid "`{re-members}`" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2897 +#: documentation/content/en/articles/committers-guide/_index.adoc:2898 msgid "" "These are the members of the `{re}`. This team is responsible for setting " "release deadlines and controlling the release process. During code freezes, " @@ -6050,20 +6052,20 @@ msgid "" msgstr "" #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:2898 +#: documentation/content/en/articles/committers-guide/_index.adoc:2899 #, no-wrap msgid "`{so}`" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2900 +#: documentation/content/en/articles/committers-guide/_index.adoc:2901 msgid "" "`{so-name}` is the link:https://www.FreeBSD.org/security/[FreeBSD Security " "Officer] and oversees the `{security-officer}`." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2905 +#: documentation/content/en/articles/committers-guide/_index.adoc:2906 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 " *** 7410 LINES SKIPPED ***