From e83ac55c30da29ee2f72d02cf06ee55ee1664b25 Mon Sep 17 00:00:00 2001
From: ♪ I'm a bot, bot, bot ♪ <_update_docs_trans@sundries01.phx2.fedoraproject.org>
Date: Jan 12 2024 22:28:27 +0000
Subject: automatic update of pot/po files


---

diff --git a/pot/master/pages/Package_Maintenance_Guide.pot b/pot/master/pages/Package_Maintenance_Guide.pot
index 0b062c6..ec794e2 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: 2023-06-02 22:16+0000\n"
+"POT-Creation-Date: 2024-01-12 22:18+0000\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"
@@ -574,37 +574,38 @@ msgid "A typical session may look like this:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:299
+#: ./pages/Package_Maintenance_Guide.adoc:301
 #, no-wrap
 msgid ""
 "fedpkg clone foo\n"
 "cd foo\n"
 "fedpkg sources\n"
 "fedpkg new-sources foo-0.0.2.tar.bz2\n"
-"gedit foo.spec       # change the required things in the specfile.\n"
-"                     # rpmdev-bumpspec is useful for simple version "
-"updates\n"
-"fedpkg mockbuild     # check that the changes you made are correct\n"
+"# Change the required things in the specfile.\n"
+"# 'rpmdev-bumpspec' is useful for simple version updates.\n"
+"gedit foo.spec\n"
+"# Check that the changes you made are correct.\n"
+"fedpkg mockbuild\n"
 "fedpkg diff\n"
 "fedpkg lint\n"
 "fedpkg commit -p -c  # commit and push in one go\n"
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Package_Maintenance_Guide.adoc:302
+#: ./pages/Package_Maintenance_Guide.adoc:304
 #, no-wrap
 msgid "Working with branches"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:306
+#: ./pages/Package_Maintenance_Guide.adoc:308
 msgid ""
 "Each Fedora release is represented by a branch in the git repository.  You "
 "can switch between them like this:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:312
+#: ./pages/Package_Maintenance_Guide.adoc:314
 #, no-wrap
 msgid ""
 "fedpkg switch-branch f{MAJOROSVER}\n"
@@ -613,7 +614,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:320
+#: ./pages/Package_Maintenance_Guide.adoc:322
 msgid ""
 "The `rawhide` branch is for "
 "https://fedoraproject.org/wiki/Releases/Rawhide[Rawhide].  You can maintain "
@@ -625,7 +626,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:332
+#: ./pages/Package_Maintenance_Guide.adoc:334
 #, no-wrap
 msgid ""
 "fedpkg clone bzrtools\n"
@@ -640,7 +641,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:343
+#: ./pages/Package_Maintenance_Guide.adoc:345
 msgid ""
 "This will _merge_ the changes from the `rawhide` branch to the "
 "`f{MAJOROSVER}` branch.  Git aficionados may note this is a somewhat unusual "
@@ -653,14 +654,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:347
+#: ./pages/Package_Maintenance_Guide.adoc:349
 msgid ""
 "Note that merges will only be sure to work cleanly so long as the branches "
 "have not previously diverged.  That is, if you do this:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:361
+#: ./pages/Package_Maintenance_Guide.adoc:363
 #, no-wrap
 msgid ""
 "fedpkg clone bzrtools\n"
@@ -677,12 +678,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:364
+#: ./pages/Package_Maintenance_Guide.adoc:366
 msgid "you may encounter a _merge conflict_."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:371
+#: ./pages/Package_Maintenance_Guide.adoc:373
 msgid ""
 "Remember that git is a _collaborative_ system, and used as such in Fedora "
 "package management.  It is often the case that you must consider changes "
@@ -691,13 +692,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:373
+#: ./pages/Package_Maintenance_Guide.adoc:375
 #, no-wrap
 msgid "Resolving merge conflicts"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:379
+#: ./pages/Package_Maintenance_Guide.adoc:381
 msgid ""
 "This is a large topic and somewhat beyond the scope of this guide, but we "
 "can give basic pointers.  There are other good references in the "
@@ -707,7 +708,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:390
+#: ./pages/Package_Maintenance_Guide.adoc:392
 msgid ""
 "When you merge and a conflict occurs, you can edit the files that have "
 "conflicts.  Remove the conflict markers in the files and merge the changes "
@@ -719,13 +720,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:392
+#: ./pages/Package_Maintenance_Guide.adoc:394
 #, no-wrap
 msgid "Using git mergetool to resolve conflicts"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:397
+#: ./pages/Package_Maintenance_Guide.adoc:399
 msgid ""
 "Git provides a graphical diff program to help resolve conflicts.  This can "
 "be handy for visualizing what changes have occurred and dealing with them as "
@@ -733,28 +734,29 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:408
+#: ./pages/Package_Maintenance_Guide.adoc:410
 #, no-wrap
 msgid ""
 "git config --global merge.tool meld\n"
 "fedpkg switch-branch f{{FedoraVersionNumber}}\n"
 "git merge rawhide\n"
-"# Conflicts occurred\n"
-"git mergetool            # Opens up a meld showing a three way diff of \n"
-"                         # the merge, working tree, and the last commit\n"
+"# Conflicts occurred.\n"
+"# Open a meld showing a three way diff of the merge, working tree, and the "
+"last commit.\n"
+"git mergetool\n"
 "# Resolved all the conflicts in the GUI\n"
 "git add CONFLICTEDFILES\n"
 "git commit\n"
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Package_Maintenance_Guide.adoc:411
+#: ./pages/Package_Maintenance_Guide.adoc:413
 #, no-wrap
 msgid "Multi-package updates"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:419
+#: ./pages/Package_Maintenance_Guide.adoc:421
 msgid ""
 "When a change to a package affects a large number of dependencies (e.g. all "
 "perl, python, ruby or ghc packages), requiring them to be rebuilt, it may be "
@@ -765,24 +767,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Package_Maintenance_Guide.adoc:421
+#: ./pages/Package_Maintenance_Guide.adoc:423
 #, no-wrap
 msgid "Using fedpkg anonymously"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:424
+#: ./pages/Package_Maintenance_Guide.adoc:426
 msgid "You can use fedpkg like this:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:427
+#: ./pages/Package_Maintenance_Guide.adoc:429
 #, no-wrap
 msgid "fedpkg clone --anonymous\n"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:434
+#: ./pages/Package_Maintenance_Guide.adoc:436
 msgid ""
 "to check out a package without requiring identification.  Obviously, you "
 "will not be able to push any changes to this repository, but it is useful "
@@ -791,7 +793,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:442
+#: ./pages/Package_Maintenance_Guide.adoc:444
 msgid ""
 "If the intention is to submit changes to a Fedora developer, the package "
 "repository can be forked and a pull request submitted.  Forking is done in "
@@ -802,24 +804,28 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:459
+#: ./pages/Package_Maintenance_Guide.adoc:468
 #, no-wrap
 msgid ""
 "fedpkg clone --anonymous forks/my-username/rpms/somepackage\n"
 "cd somepackage\n"
-"gedit somepackage.spec    # change the required things in the specfile.\n"
-"                          # rpmdev-bumpspec is useful for simple version "
-"updates\n"
-"spectool -g somepackage.spec # download the referenced sources to local "
-"machine\n"
-"                             # fedpkg new-sources cannot be performed "
-"anonymously, that is left\n"
-"                             # for the maintainer to do after the pull "
-"request has been merged\n"
-"fedpkg mockbuild          # check that the changes you made are correct\n"
+"# change the required things in the specfile.\n"
+"# 'rpmdev-bumpspec' is useful for simple version updates.\n"
+"gedit somepackage.spec\n"
+"# download the referenced sources to local machine\n"
+"spectool -g somepackage.spec\n"
+"# check that the changes you made are correct\n"
+"fedpkg mockbuild\n"
+"# Update sources file and .gitignore if sources have changed.\n"
+"# The --offline flag skips upload to the lookaside cache.\n"
+"# That is left for the maintainer to do after the pull request has been "
+"merged.\n"
+"# Multiple source files can be specified as required.\n"
+"fedpkg new-sources --offline somepackage-0.0.2.tar.gz\n"
 "fedpkg diff\n"
 "fedpkg lint\n"
-"git checkout -b my-branch # create a branch to use in the pull request\n"
+"# create a branch to use in the pull request\n"
+"git checkout -b my-branch\n"
 "git status\n"
 "git add .\n"
 "git commit\n"
@@ -827,26 +833,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:464
+#: ./pages/Package_Maintenance_Guide.adoc:473
 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:466
+#: ./pages/Package_Maintenance_Guide.adoc:475
 #, no-wrap
 msgid "Tips and tricks"
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:469
+#: ./pages/Package_Maintenance_Guide.adoc:478
 #, no-wrap
 msgid "Local branch names"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:475
+#: ./pages/Package_Maintenance_Guide.adoc:484
 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 "
@@ -854,13 +860,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:477
+#: ./pages/Package_Maintenance_Guide.adoc:486
 #, no-wrap
 msgid "Current branch and state in shell prompt"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:483
+#: ./pages/Package_Maintenance_Guide.adoc:492
 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 "
@@ -868,13 +874,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:485
+#: ./pages/Package_Maintenance_Guide.adoc:494
 #, no-wrap
 msgid "Importing a .src.rpm to update"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:497
+#: ./pages/Package_Maintenance_Guide.adoc:506
 msgid ""
 "The command usually used to initially populate a git package repository from "
 "a .src.rpm that has been through the "
@@ -887,7 +893,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:501
+#: ./pages/Package_Maintenance_Guide.adoc:510
 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 "
@@ -895,13 +901,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:503
+#: ./pages/Package_Maintenance_Guide.adoc:512
 #, no-wrap
 msgid "Making changes on an older branch without breaking the upgrade path"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:508
+#: ./pages/Package_Maintenance_Guide.adoc:517
 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 "
@@ -909,7 +915,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:515
+#: ./pages/Package_Maintenance_Guide.adoc:524
 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 "
@@ -918,7 +924,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:520
+#: ./pages/Package_Maintenance_Guide.adoc:529
 #, no-wrap
 msgid ""
 "Name:    foo\n"
@@ -927,7 +933,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:524
+#: ./pages/Package_Maintenance_Guide.adoc:533
 #, no-wrap
 msgid ""
 "Name:    foo\n"
@@ -936,7 +942,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:528
+#: ./pages/Package_Maintenance_Guide.adoc:537
 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 "
@@ -944,13 +950,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:530
+#: ./pages/Package_Maintenance_Guide.adoc:539
 #, no-wrap
 msgid "Removing a package build pending for Rawhide or Branched"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:543
+#: ./pages/Package_Maintenance_Guide.adoc:552
 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 "
@@ -962,7 +968,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:548
+#: ./pages/Package_Maintenance_Guide.adoc:557
 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 "
@@ -971,20 +977,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:550
+#: ./pages/Package_Maintenance_Guide.adoc:559
 msgid ""
 "You can remove the package by using "
 "https://fedoraproject.org/wiki/Koji[Koji]:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/Package_Maintenance_Guide.adoc:554
+#: ./pages/Package_Maintenance_Guide.adoc:563
 #, no-wrap
 msgid "koji untag-pkg f{NEXTOSVER} foo-1.1.3-1.fc{NEXTOSVER}\n"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:558
+#: ./pages/Package_Maintenance_Guide.adoc:567
 msgid ""
 "where `foo-1.1.3-1.fc{NEXTOSVER}` is replaced with the name of your package "
 "build.  See `koji help` or xref:Using_the_Koji_Build_System.adoc[Using the "
@@ -992,13 +998,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:560
+#: ./pages/Package_Maintenance_Guide.adoc:569
 #, no-wrap
 msgid "ssh fingerprint"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:565
+#: ./pages/Package_Maintenance_Guide.adoc:574
 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 "
@@ -1006,7 +1012,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:572
+#: ./pages/Package_Maintenance_Guide.adoc:581
 msgid ""
 "But you can also manually check against the list of keys at "
 "https://admin.fedoraproject.org[https://admin.fedoraproject.org].  The "
@@ -1016,13 +1022,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:574
+#: ./pages/Package_Maintenance_Guide.adoc:583
 #, no-wrap
 msgid "Problems connecting to the repository"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:583
+#: ./pages/Package_Maintenance_Guide.adoc:592
 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 "
@@ -1032,13 +1038,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Package_Maintenance_Guide.adoc:585
+#: ./pages/Package_Maintenance_Guide.adoc:594
 #, no-wrap
 msgid "It builds here, why doesn't it build there?"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:599
+#: ./pages/Package_Maintenance_Guide.adoc:608
 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, "
@@ -1053,32 +1059,32 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Package_Maintenance_Guide.adoc:600
+#: ./pages/Package_Maintenance_Guide.adoc:609
 #, no-wrap
 msgid "References"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:603
+#: ./pages/Package_Maintenance_Guide.adoc:612
 msgid "https://src.fedoraproject.org/"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:604
+#: ./pages/Package_Maintenance_Guide.adoc:613
 msgid "https://fedoraproject.org/wiki/Infrastructure/Kerberos[Infrastructure/Kerberos]"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:605
+#: ./pages/Package_Maintenance_Guide.adoc:614
 msgid "https://fedoraproject.org/wiki/Packaging_tricks?rd=PackageMaintainers/PackagingTricks[PackageMaintainers/PackagingTricks]"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Package_Maintenance_Guide.adoc:606
+#: ./pages/Package_Maintenance_Guide.adoc:615
 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:606
+#: ./pages/Package_Maintenance_Guide.adoc:615
 msgid "https://fedoraproject.org/wiki/Infrastructure/VersionControl/dist-git[Infrastructure/VersionControl/dist-git]"
 msgstr ""