diff options
author | Danilo G. Baio <dbaio@FreeBSD.org> | 2024-01-17 23:37:23 +0000 |
---|---|---|
committer | Danilo G. Baio <dbaio@FreeBSD.org> | 2024-01-17 23:37:23 +0000 |
commit | 27989883faf7f51b7b86599533da9ec3e77cf5f8 (patch) | |
tree | 9fb4cb0f6f3d50c71d878c09526a4cdd3b118de6 /documentation/content/en/articles/committers-guide | |
parent | d97a0878e4527f29b23ad5ad385fcee8a3bba99c (diff) |
Diffstat (limited to 'documentation/content/en/articles/committers-guide')
-rw-r--r-- | documentation/content/en/articles/committers-guide/_index.po | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index eeaf15cb0f..bb85f6fe75 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-09-09 18:13-0300\n" +"POT-Creation-Date: 2024-01-17 20:35-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1396,9 +1396,10 @@ msgstr "" msgid "" "shows me moving the working tree to the `main` branch (a816...) and then " "updating from upstream (to 5ef0...). In this case, bad would be HEAD (or " -"5rf0bd68) and good would be a8163e165. As you can see from the output, " -"HEAD@{1} also often works, but isn't foolproof if you have done other things " -"to your Git tree after updating, but before you discover the need to bisect." +"5ef0bd68b515) and good would be a8163e165c5b. As you can see from the " +"output, HEAD@{1} also often works, but isn't foolproof if you have done " +"other things to your Git tree after updating, but before you discover the " +"need to bisect." msgstr "" #. type: delimited block = 4 @@ -1513,7 +1514,7 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:676 msgid "" -"Tag signatures can be verified with `git verity-tag <tag name>`, or `git tag " +"Tag signatures can be verified with `git verify-tag <tag name>`, or `git tag " "-v <tag name>`." msgstr "" @@ -1794,8 +1795,8 @@ msgstr "" msgid "" "Sometimes there are merge conflicts. That is OK. Do not panic. Instead, " "handle them the same as any other merge conflicts. To keep it simple, I " -"will just describe a common issue that may arise. A pointer to a more " -"complete treatment can be found at the end of this section." +"will just describe a common issue that may arise. A pointer to a complete " +"treatment can be found at the end of this section." msgstr "" #. type: Plain text @@ -6735,8 +6736,8 @@ msgid "" "leverage more CI environments by supporting this range, increasing " "convenience for users and giving them more tools to test with. By carefully " "constraining the range of versions supported to modern versions of these " -"compilers, the project avoids unduely increasing the testing matrix. Older " -"and obscure compilers, as well as older dialects of the langauges, have " +"compilers, the project avoids unduly increasing the testing matrix. Older " +"and obscure compilers, as well as older dialects of the languages, have " "extremely limited support that allow user programs to build with them, but " "without constraining the base system to being built with them. The exact " "balance continues to evolve to ensure the benefits of extra work remain " |