diff options
Diffstat (limited to 'po4a/dgit_1.pot')
| -rw-r--r-- | po4a/dgit_1.pot | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 97cbcd7..052904f 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-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -738,7 +738,7 @@ msgstr "" msgid "" "Set up the working tree's B<.git/info/attributes> to disable all " "transforming attributes for all files. This is done by defining a macro " -"attribute B<dgit-defuse-attrs> and applying it to B<*>. For why, see " +"attribute, B<dgit-defuse-attrs,> and applying it to B<*>. For why, see " "B<GITATTRIBUTES> in B<dgit(7)>. Note that only attributes affecting the " "working tree are suppressed. git-archive may remain exciting." msgstr "" @@ -749,7 +749,7 @@ msgid "" "If there is an existing macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes, but it is insufficient, because it was made by an " "earlier version of dgit and git has since introduced new transforming " -"attributes, modifies the macro to disable the newer transformations." +"attributes, this modifies the macro to disable the newer transformations." msgstr "" #. type: Plain text @@ -863,7 +863,7 @@ msgid "" "prefixed with B<..> then if it already exists and dgit actually imports the " "dsc (rather than simply reading the git commit out of the Dgit field), dgit " "will make a pseudomerge so that the result is necessarily fast forward from " -"the existing branch. Otherwise, if branch already exists, dgit will stop " +"the existing branch. Otherwise, if I<branch> already exists, dgit will stop " "with an error message." msgstr "" @@ -1411,7 +1411,7 @@ msgid "" "override safety catches, including safety catches which relate to distro-" "specific policies. The use of --deliberately is declared and published in " "the signed tags generated for you by dgit, so that the archive software can " -"give effect to your intent, and for the benefit humans looking at the " +"give effect to your intent, and for the benefit of humans looking at the " "history. The meanings of I<something>s understood in the context of Debian " "are discussed below:" msgstr "" @@ -1557,9 +1557,9 @@ msgstr "" #. type: Plain text #: ../dgit.1:858 msgid "" -"Do not check whether up source format `3.0 (quilt)' metadata needs fixing " -"up. If you use this option and the metadata did in fact need fixing up, " -"dgit push will fail." +"Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " +"If you use this option and the metadata did in fact need fixing up, dgit " +"push will fail." msgstr "" #. type: TP @@ -1668,7 +1668,7 @@ msgstr "" #: ../dgit.1:938 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " -"looks for single .changes file in the parent directory whose filename " +"looks for a single .changes file in the parent directory whose filename " "suggests it is for the right package and version." msgstr "" @@ -2281,9 +2281,9 @@ msgstr "" #. type: Plain text #: ../dgit.1:1296 msgid "" -"Like .clean-mode, but ignored if the value does not make sense to this " -"version of dgit. Setting both .clean-mode and .clean-mode-newer is useful " -"to provide a single git config compatible with different dgit versions." +"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 " +"single git config compatible with different dgit versions." msgstr "" #. type: TP @@ -2390,7 +2390,7 @@ msgstr "" #: ../dgit.1:1332 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " -"Ignored for dgit setup-setup-useremail, which does it anyway." +"Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP @@ -2402,7 +2402,7 @@ msgstr "" #. type: Plain text #: ../dgit.1:1337 msgid "" -"Whether to setup a merge driver which uses dpkg-mergechangelogs for debian/" +"Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " "does it anyway." msgstr "" @@ -2439,23 +2439,23 @@ msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1360 +#: ../dgit.1:1361 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 --" -"add). The options for B<dgit.default.opts->I<cmd> B<dgit-distro." -">I<distro>B</push.opts->I<cmd> and are all used, followed by options from " -"dgit's command line." +"add). The options for B<dgit.default.opts->I<cmd> and B<dgit-distro." +">I<distro>B</push.opts->I<cmd> are all used, followed by options from dgit's " +"command line." msgstr "" #. type: SH -#: ../dgit.1:1360 +#: ../dgit.1:1361 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1365 +#: ../dgit.1:1366 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2464,204 +2464,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1365 +#: ../dgit.1:1366 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1368 +#: ../dgit.1:1369 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1368 +#: ../dgit.1:1369 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1371 +#: ../dgit.1:1372 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1371 +#: ../dgit.1:1372 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1378 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:1377 +#: ../dgit.1:1378 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1379 +#: ../dgit.1:1380 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1381 +#: ../dgit.1:1382 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1383 +#: ../dgit.1:1384 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1385 +#: ../dgit.1:1386 #, 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:1387 +#: ../dgit.1:1388 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1389 +#: ../dgit.1:1390 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1391 +#: ../dgit.1:1392 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1393 +#: ../dgit.1:1394 #, 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>" msgstr "" #. type: TP -#: ../dgit.1:1395 +#: ../dgit.1:1396 #, 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:1397 +#: ../dgit.1:1398 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1399 +#: ../dgit.1:1400 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1401 +#: ../dgit.1:1402 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1403 +#: ../dgit.1:1404 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>" msgstr "" #. type: TP -#: ../dgit.1:1405 +#: ../dgit.1:1406 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1407 +#: ../dgit.1:1408 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1409 +#: ../dgit.1:1410 #, 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:1411 +#: ../dgit.1:1412 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1413 +#: ../dgit.1:1414 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1415 +#: ../dgit.1:1416 #, 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:1417 +#: ../dgit.1:1418 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1419 +#: ../dgit.1:1420 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1421 +#: ../dgit.1:1422 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1423 +#: ../dgit.1:1424 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1425 +#: ../dgit.1:1426 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1427 +#: ../dgit.1:1428 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1428 +#: ../dgit.1:1429 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1437 +#: ../dgit.1:1438 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2671,26 +2671,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1437 +#: ../dgit.1:1438 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1441 +#: ../dgit.1:1442 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1441 +#: ../dgit.1:1442 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>" msgstr "" #. type: Plain text -#: ../dgit.1:1446 +#: ../dgit.1:1447 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2698,13 +2698,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1446 +#: ../dgit.1:1447 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1453 +#: ../dgit.1:1454 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 " @@ -2712,7 +2712,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1459 +#: ../dgit.1:1460 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 " @@ -2720,7 +2720,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1464 +#: ../dgit.1:1465 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 " @@ -2729,7 +2729,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1469 +#: ../dgit.1:1470 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-" @@ -2737,7 +2737,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../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:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -2748,13 +2748,13 @@ msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1478 +#: ../dgit.1:1479 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:1479 +#: ../dgit.1:1480 msgid "https://browse.dgit.debian.org/" msgstr "" |