From ebb51e09684e67faf1b9efe2441b86aff96a9729 Mon Sep 17 00:00:00 2001 From: ♪ I'm a bot, bot, bot ♪ <_update_docs_trans@sundries01.phx2.fedoraproject.org> Date: Mar 10 2022 22:02:32 +0000 Subject: automatic update of pot/po files --- diff --git a/pot/master/pages/Joining_the_Package_Maintainers.pot b/pot/master/pages/Joining_the_Package_Maintainers.pot index 8af4f2b..cbdf305 100644 --- a/pot/master/pages/Joining_the_Package_Maintainers.pot +++ b/pot/master/pages/Joining_the_Package_Maintainers.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-02-12 22:14+0000\n" +"POT-Creation-Date: 2022-03-10 21:56+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -391,7 +391,7 @@ msgid "One-off contributions" msgstr "" #. type: Plain text -#: ./pages/Joining_the_Package_Maintainers.adoc:212 +#: ./pages/Joining_the_Package_Maintainers.adoc:211 msgid "" "Changes to https://src.fedoraproject.org/browse/projects/[existing packages] " "can be suggested by submitting " @@ -399,7 +399,5 @@ msgid "" "must have a xref:create_a_fedora_account[Fedora account] to create a pull " "request. See " "xref:Package_Maintenance_Guide.adoc#using_fedpkg_anonymously[using fedpkg " -"anonymously] for instructions and " -"https://fedoraproject.org/wiki/Infrastructure/HTTPS-commits[Infrastructure/HTTPS-commits] " -"for more information." +"anonymously] for instructions." msgstr "" diff --git a/pot/master/pages/Package_Maintenance_Guide.pot b/pot/master/pages/Package_Maintenance_Guide.pot index c1d2247..f27b973 100644 --- a/pot/master/pages/Package_Maintenance_Guide.pot +++ b/pot/master/pages/Package_Maintenance_Guide.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-02-12 22:14+0000\n" +"POT-Creation-Date: 2022-03-10 21:56+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -815,7 +815,7 @@ msgid "" msgstr "" #. type: delimited block . -#: ./pages/Package_Maintenance_Guide.adoc:463 +#: ./pages/Package_Maintenance_Guide.adoc:466 #, no-wrap msgid "" "fedpkg clone --anonymous forks/my-username/rpms/somepackage\n" @@ -833,30 +833,33 @@ msgid "" "fedpkg diff\n" "fedpkg lint\n" "git checkout -b my-branch # create a branch to use in the pull request\n" -"fedpkg commit -p -c # commit and push in one go\n" +"git status\n" +"git add .\n" +"git commit\n" +"git push -u origin my-branch\n" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:468 +#: ./pages/Package_Maintenance_Guide.adoc:471 msgid "" "Afterwards, a pull request from `my-branch` to the main package repository " "can be created in the _src.fedoraproject.org_ web ui." msgstr "" #. type: Title == -#: ./pages/Package_Maintenance_Guide.adoc:470 +#: ./pages/Package_Maintenance_Guide.adoc:473 #, no-wrap msgid "Tips and tricks" msgstr "" #. type: Title === -#: ./pages/Package_Maintenance_Guide.adoc:473 +#: ./pages/Package_Maintenance_Guide.adoc:476 #, no-wrap msgid "Local branch names" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:479 +#: ./pages/Package_Maintenance_Guide.adoc:482 msgid "" "If you use git commands to branch and checkout directly, you can define " "whatever local branch names you want. If you use `fedpkg switch-branch`, it " @@ -864,13 +867,13 @@ msgid "" msgstr "" #. type: Title === -#: ./pages/Package_Maintenance_Guide.adoc:481 +#: ./pages/Package_Maintenance_Guide.adoc:484 #, no-wrap msgid "Current branch and state in shell prompt" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:487 +#: ./pages/Package_Maintenance_Guide.adoc:490 msgid "" "It is often helpful to know what branch you are working on at a glance. You " "can add this information to your bash prompt with the information " @@ -878,13 +881,13 @@ msgid "" msgstr "" #. type: Title === -#: ./pages/Package_Maintenance_Guide.adoc:489 +#: ./pages/Package_Maintenance_Guide.adoc:492 #, no-wrap msgid "Importing a .src.rpm to update" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:501 +#: ./pages/Package_Maintenance_Guide.adoc:504 msgid "" "The command usually used to initially populate a git package repository from " "a .src.rpm that has been through the " @@ -897,7 +900,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:505 +#: ./pages/Package_Maintenance_Guide.adoc:508 msgid "" "This approach makes it harder to verify that your changes are safe and do " "not overwrite changes made to the package by others. For this reason, its " @@ -905,13 +908,13 @@ msgid "" msgstr "" #. type: Title === -#: ./pages/Package_Maintenance_Guide.adoc:507 +#: ./pages/Package_Maintenance_Guide.adoc:510 #, no-wrap msgid "Making changes on an older branch without breaking the upgrade path" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:512 +#: ./pages/Package_Maintenance_Guide.adoc:515 msgid "" "Here is the scenario: You have built your package successfully on the " "`f{MAJOROSVER}` branch, but there is a problem keeping your package from " @@ -919,7 +922,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:519 +#: ./pages/Package_Maintenance_Guide.adoc:522 msgid "" "Solution: Make your changes in the branch and then add a digit to the very " "right of the release tag. There is no need to change the release in the " @@ -928,7 +931,7 @@ msgid "" msgstr "" #. type: delimited block . -#: ./pages/Package_Maintenance_Guide.adoc:524 +#: ./pages/Package_Maintenance_Guide.adoc:527 #, no-wrap msgid "" "Name: foo\n" @@ -937,7 +940,7 @@ msgid "" msgstr "" #. type: delimited block . -#: ./pages/Package_Maintenance_Guide.adoc:528 +#: ./pages/Package_Maintenance_Guide.adoc:531 #, no-wrap msgid "" "Name: foo\n" @@ -946,7 +949,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:532 +#: ./pages/Package_Maintenance_Guide.adoc:535 msgid "" "Then tag and build as usual. This approach was initially discussed " "https://www.redhat.com/archives/fedora-extras-list/2006-May/msg00083.html[in " @@ -954,13 +957,13 @@ msgid "" msgstr "" #. type: Title === -#: ./pages/Package_Maintenance_Guide.adoc:534 +#: ./pages/Package_Maintenance_Guide.adoc:537 #, no-wrap msgid "Removing a package build pending for Rawhide or Branched" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:547 +#: ./pages/Package_Maintenance_Guide.adoc:550 msgid "" "From time to time you may want to remove a package build you submitted to " "Rawhide or to Branched prior to the Alpha freeze (both cases where the build " @@ -973,7 +976,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:552 +#: ./pages/Package_Maintenance_Guide.adoc:555 msgid "" "This should only be done on the same day of the build, before it is included " "in a compose. If your build was already included in a compose you must not " @@ -982,20 +985,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:554 +#: ./pages/Package_Maintenance_Guide.adoc:557 msgid "" "You can remove the package by using " "https://fedoraproject.org/wiki/Koji[Koji]:" msgstr "" #. type: delimited block . -#: ./pages/Package_Maintenance_Guide.adoc:557 +#: ./pages/Package_Maintenance_Guide.adoc:560 #, no-wrap msgid "koji untag-pkg f35 foo-1.1.3-1.fc35\n" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:561 +#: ./pages/Package_Maintenance_Guide.adoc:564 msgid "" "where `foo-1.1.3-1.fc35` is replaced with the name of your package build. " "See `koji help` or xref:Using_the_Koji_Build_System.adoc[Using the Koji " @@ -1003,13 +1006,13 @@ msgid "" msgstr "" #. type: Title === -#: ./pages/Package_Maintenance_Guide.adoc:563 +#: ./pages/Package_Maintenance_Guide.adoc:566 #, no-wrap msgid "ssh fingerprint" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:568 +#: ./pages/Package_Maintenance_Guide.adoc:571 msgid "" "The recommended option is to include `VerifyHostKeyDNS yes` in your " "`~/.ssh/config` file. This will result in using DNS to check that the key " @@ -1017,7 +1020,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:575 +#: ./pages/Package_Maintenance_Guide.adoc:578 msgid "" "But you can also manually check against the list of keys at " "https://admin.fedoraproject.org[https://admin.fedoraproject.org]. The " @@ -1027,13 +1030,13 @@ msgid "" msgstr "" #. type: Title === -#: ./pages/Package_Maintenance_Guide.adoc:577 +#: ./pages/Package_Maintenance_Guide.adoc:580 #, no-wrap msgid "Problems connecting to the repository" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:586 +#: ./pages/Package_Maintenance_Guide.adoc:589 msgid "" "The `fedpkg` tool clones repositories using the ssh:// protocol, so this " "should not be a problem normally (as long as you have your ssh key). If you " @@ -1043,13 +1046,13 @@ msgid "" msgstr "" #. type: Title === -#: ./pages/Package_Maintenance_Guide.adoc:588 +#: ./pages/Package_Maintenance_Guide.adoc:591 #, no-wrap msgid "It builds here, why doesn't it build there?" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:602 +#: ./pages/Package_Maintenance_Guide.adoc:605 msgid "" "Is your package building locally — even with Mock, even as a scratch build! " "— but not when you run `fedpkg build`? Before you get too frustrated, " @@ -1064,32 +1067,32 @@ msgid "" msgstr "" #. type: Title == -#: ./pages/Package_Maintenance_Guide.adoc:603 +#: ./pages/Package_Maintenance_Guide.adoc:606 #, no-wrap msgid "References" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:606 +#: ./pages/Package_Maintenance_Guide.adoc:609 msgid "https://src.fedoraproject.org/" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:607 +#: ./pages/Package_Maintenance_Guide.adoc:610 msgid "https://fedoraproject.org/wiki/Infrastructure/Kerberos[Infrastructure/Kerberos]" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:608 +#: ./pages/Package_Maintenance_Guide.adoc:611 msgid "https://fedoraproject.org/wiki/Packaging_tricks?rd=PackageMaintainers/PackagingTricks[PackageMaintainers/PackagingTricks]" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:609 +#: ./pages/Package_Maintenance_Guide.adoc:612 msgid "https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle?rd=Policy_for_package_lifecycle[Fedora_Release_Life_Cycle]" msgstr "" #. type: Plain text -#: ./pages/Package_Maintenance_Guide.adoc:609 +#: ./pages/Package_Maintenance_Guide.adoc:612 msgid "https://fedoraproject.org/wiki/Infrastructure/VersionControl/dist-git[Infrastructure/VersionControl/dist-git]" msgstr ""