diff options
Diffstat (limited to 'po4a/dgit_1.pot')
-rw-r--r-- | po4a/dgit_1.pot | 208 |
1 files changed, 111 insertions, 97 deletions
diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 2e5c389..3d6de78 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-07-21 01:37+0100\n" +"POT-Creation-Date: 2019-08-10 19:42+0100\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" @@ -956,7 +956,7 @@ msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:462 +#: ../dgit.1:496 ../git-debrebase.1.pod:476 #, no-wrap msgid "OPTIONS" msgstr "" @@ -2283,14 +2283,28 @@ msgid "" "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" +#. type: TP +#: ../dgit.1:1330 +#, no-wrap +msgid "B<--for-push>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1336 +msgid "" +"Override the dgit-distro.distro.readonly configuration setting, to specify " +"that we have read/write access and should use the corresponding git and " +"achive access approach even if the operation is a read-only one." +msgstr "" + #. type: =head1 -#: ../dgit.1:1330 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1336 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1336 +#: ../dgit.1:1342 msgid "" "dgit can be configured via the git config system. You may set keys with git-" "config (either in system-global or per-tree configuration), or provide B<-" @@ -2298,31 +2312,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1338 +#: ../dgit.1:1344 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1338 +#: ../dgit.1:1344 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1344 +#: ../dgit.1:1350 msgid "" "Specifies where to find the built files to be uploaded, when --build-" "products-dir is not specified. The default is the parent directory (B<..>)." msgstr "" #. type: =item -#: ../dgit.1:1344 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1350 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1349 +#: ../dgit.1:1355 msgid "" "Specifies the distro for a suite. dgit keys off the suite name (which " "appears in changelogs etc.), and uses that to determine the distro which is " @@ -2330,66 +2344,66 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1352 +#: ../dgit.1:1358 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1352 +#: ../dgit.1:1358 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1355 +#: ../dgit.1:1361 msgid "The default distro for an unknown suite." msgstr "" #. type: TP -#: ../dgit.1:1355 +#: ../dgit.1:1361 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1358 +#: ../dgit.1:1364 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1358 +#: ../dgit.1:1364 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1363 +#: ../dgit.1:1369 msgid "" "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1363 +#: ../dgit.1:1369 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1367 +#: ../dgit.1:1373 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1367 +#: ../dgit.1:1373 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1373 +#: ../dgit.1:1379 msgid "" "Like .clean-mode, but ignored if the value is unknown to this version of " "dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " @@ -2397,45 +2411,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1373 +#: ../dgit.1:1379 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1383 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1377 +#: ../dgit.1:1383 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1379 +#: ../dgit.1:1385 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1383 +#: ../dgit.1:1389 msgid "" "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is " "specified. The default is not to remove." msgstr "" #. type: TP -#: ../dgit.1:1383 +#: ../dgit.1:1389 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1390 +#: ../dgit.1:1396 msgid "" "Whether you have push access to the distro. For Debian, it is OK to use " "auto, which uses readonly mode if you are not pushing right now; but, " @@ -2444,52 +2458,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1390 +#: ../dgit.1:1396 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1394 +#: ../dgit.1:1400 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1394 +#: ../dgit.1:1400 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1396 +#: ../dgit.1:1402 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1399 +#: ../dgit.1:1405 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1399 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1405 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1402 +#: ../dgit.1:1408 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1402 +#: ../dgit.1:1408 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1407 +#: ../dgit.1:1413 msgid "" "Values to configure for user.name and user.email in new git trees. If not " "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, " @@ -2497,26 +2511,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1407 +#: ../dgit.1:1413 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1411 +#: ../dgit.1:1417 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1411 +#: ../dgit.1:1417 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1416 +#: ../dgit.1:1422 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2524,13 +2538,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1416 +#: ../dgit.1:1422 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1422 +#: ../dgit.1:1428 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2538,24 +2552,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1422 +#: ../dgit.1:1428 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1428 +#: ../dgit.1:1434 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1428 +#: ../dgit.1:1434 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1440 +#: ../dgit.1:1446 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2565,13 +2579,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1440 +#: ../dgit.1:1446 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1445 +#: ../dgit.1:1451 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2580,204 +2594,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1445 +#: ../dgit.1:1451 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1448 +#: ../dgit.1:1454 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1448 +#: ../dgit.1:1454 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1451 +#: ../dgit.1:1457 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1451 +#: ../dgit.1:1457 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1457 +#: ../dgit.1:1463 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1457 +#: ../dgit.1:1463 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1459 +#: ../dgit.1:1465 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1461 +#: ../dgit.1:1467 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1463 +#: ../dgit.1:1469 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1465 +#: ../dgit.1:1471 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1467 +#: ../dgit.1:1473 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1469 +#: ../dgit.1:1475 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1471 +#: ../dgit.1:1477 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1473 +#: ../dgit.1:1479 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1475 +#: ../dgit.1:1481 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1477 +#: ../dgit.1:1483 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1479 +#: ../dgit.1:1485 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1481 +#: ../dgit.1:1487 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1483 +#: ../dgit.1:1489 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1485 +#: ../dgit.1:1491 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1487 +#: ../dgit.1:1493 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1489 +#: ../dgit.1:1495 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1491 +#: ../dgit.1:1497 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1493 +#: ../dgit.1:1499 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1495 +#: ../dgit.1:1501 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1497 +#: ../dgit.1:1503 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1499 +#: ../dgit.1:1505 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1501 +#: ../dgit.1:1507 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1503 +#: ../dgit.1:1509 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1505 +#: ../dgit.1:1511 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1507 +#: ../dgit.1:1513 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1508 +#: ../dgit.1:1514 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1517 +#: ../dgit.1:1523 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2787,26 +2801,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1517 +#: ../dgit.1:1523 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1521 +#: ../dgit.1:1527 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1521 +#: ../dgit.1:1527 #, no-wrap -msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>" +msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>" msgstr "" #. type: Plain text -#: ../dgit.1:1526 +#: ../dgit.1:1532 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2814,13 +2828,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1526 +#: ../dgit.1:1532 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1533 +#: ../dgit.1:1539 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2828,7 +2842,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1539 +#: ../dgit.1:1545 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2836,7 +2850,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1544 +#: ../dgit.1:1550 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2845,7 +2859,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1549 +#: ../dgit.1:1555 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2853,25 +2867,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1555 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 -#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 -#: ../git-debpush.1.pod:223 +#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:254 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1558 +#: ../dgit.1:1564 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1559 +#: ../dgit.1:1565 msgid "https://browse.dgit.debian.org/" msgstr "" |