diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2021-02-26 22:09:42 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2021-02-26 22:09:42 +0800 |
commit | 712b0ed6ec8041ac1e7bbd4298189a31941354fe (patch) | |
tree | 2b1ab1a7048cb8c5e960861e582d922fa0224d67 /po/git.pot | |
parent | Git 2.31-rc0 (diff) | |
download | tgif-712b0ed6ec8041ac1e7bbd4298189a31941354fe.tar.xz |
l10n: git.pot: v2.31.0 round 1 (155 new, 89 removed)
Generate po/git.pot from v2.31.0-rc0 for git v2.31.0 l10n round 1.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'po/git.pot')
-rw-r--r-- | po/git.pot | 5891 |
1 files changed, 3114 insertions, 2777 deletions
diff --git a/po/git.pot b/po/git.pot index 6b5b503775..10c1ecd48d 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-12-21 07:10+0800\n" +"POT-Creation-Date: 2021-02-26 22:09+0800\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" @@ -23,9 +23,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 -#: builtin/rebase.c:1955 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 +#: builtin/rebase.c:1963 msgid "could not read index" msgstr "" @@ -53,7 +53,7 @@ msgstr "" msgid "could not stage '%s'" msgstr "" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 msgid "could not write index" msgstr "" @@ -211,7 +211,7 @@ msgstr "" #: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 #: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 +#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 @@ -707,7 +707,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:281 builtin/merge.c:1369 +#: advice.c:281 builtin/merge.c:1370 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -979,7 +979,8 @@ msgstr "" msgid "cannot checkout %s" msgstr "" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 pack-revindex.c:213 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "" @@ -1138,7 +1139,7 @@ msgstr "" msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4374 builtin/bisect--helper.c:524 +#: apply.c:4374 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "" @@ -1174,7 +1175,7 @@ msgstr[1] "" msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 #, c-format msgid "cannot open %s" msgstr "" @@ -1228,7 +1229,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" @@ -1296,7 +1297,7 @@ msgstr "" msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 msgid "paths are separated with NUL character" msgstr "" @@ -1306,7 +1307,7 @@ msgstr "" #: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 msgid "action" msgstr "" @@ -1334,9 +1335,9 @@ msgstr "" msgid "allow overlapping hunks" msgstr "" -#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" @@ -1422,14 +1423,14 @@ msgstr "" msgid "cannot read %s" msgstr "" -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1138 +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1139 #, c-format msgid "could not read '%s'" msgstr "" -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -1471,7 +1472,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:556 builtin/log.c:1765 +#: archive.c:556 builtin/log.c:1764 msgid "prefix" msgstr "" @@ -1479,11 +1480,11 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "" @@ -1634,12 +1635,12 @@ msgstr "" msgid "a %s revision is needed" msgstr "" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:987 builtin/merge.c:152 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "" @@ -1657,7 +1658,7 @@ msgstr "" #, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" #: bisect.c:1095 @@ -1689,11 +1690,11 @@ msgstr "" msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:267 +#: blame.c:2821 bundle.c:213 ref-filter.c:2202 remote.c:2041 sequencer.c:2146 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "" @@ -1856,7 +1857,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -1900,40 +1901,36 @@ msgstr "" msgid "pack-objects died" msgstr "" -#: bundle.c:379 -msgid "rev-list died" -msgstr "" - -#: bundle.c:428 +#: bundle.c:386 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:498 +#: bundle.c:490 #, c-format msgid "unsupported bundle version %d" msgstr "" -#: bundle.c:500 +#: bundle.c:492 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:530 +#: bundle.c:539 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:540 +#: bundle.c:549 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:565 +#: bundle.c:574 msgid "index-pack died" msgstr "" @@ -1942,253 +1939,273 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit-graph.c:188 midx.c:47 +#: commit-graph.c:198 midx.c:47 msgid "invalid hash version" msgstr "" -#: commit-graph.c:246 +#: commit-graph.c:219 +msgid "repository contains replace objects; skipping commit-graph" +msgstr "" + +#: commit-graph.c:228 +msgid "repository contains (deprecated) grafts; skipping commit-graph" +msgstr "" + +#: commit-graph.c:233 +msgid "repository is shallow; skipping commit-graph" +msgstr "" + +#: commit-graph.c:264 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:311 +#: commit-graph.c:329 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:318 +#: commit-graph.c:336 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:325 +#: commit-graph.c:343 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:342 +#: commit-graph.c:360 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "" -#: commit-graph.c:361 +#: commit-graph.c:379 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:433 +#: commit-graph.c:465 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:499 +#: commit-graph.c:531 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:509 +#: commit-graph.c:541 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:557 +#: commit-graph.c:589 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:581 +#: commit-graph.c:613 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:721 commit-graph.c:785 +#: commit-graph.c:794 commit-graph.c:831 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:742 +#: commit-graph.c:815 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:1036 builtin/am.c:1292 +#: commit-graph.c:848 +msgid "commit-graph requires overflow generation data but has none" +msgstr "" + +#: commit-graph.c:1121 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1252 builtin/pack-objects.c:2864 +#: commit-graph.c:1378 builtin/pack-objects.c:2872 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1283 +#: commit-graph.c:1409 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1300 +#: commit-graph.c:1426 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1320 +#: commit-graph.c:1446 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1339 +#: commit-graph.c:1465 +msgid "Computing commit graph topological levels" +msgstr "" + +#: commit-graph.c:1518 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1406 +#: commit-graph.c:1599 msgid "Computing commit changed paths Bloom filters" msgstr "" -#: commit-graph.c:1483 +#: commit-graph.c:1676 msgid "Collecting referenced commits" msgstr "" -#: commit-graph.c:1508 +#: commit-graph.c:1701 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1521 +#: commit-graph.c:1714 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1525 +#: commit-graph.c:1718 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1562 +#: commit-graph.c:1755 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1580 +#: commit-graph.c:1773 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1628 +#: commit-graph.c:1821 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1670 midx.c:819 +#: commit-graph.c:1863 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1683 +#: commit-graph.c:1876 msgid "unable to create temporary graph layer" msgstr "" -#: commit-graph.c:1688 +#: commit-graph.c:1881 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1758 +#: commit-graph.c:1966 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1803 +#: commit-graph.c:2011 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1819 +#: commit-graph.c:2027 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1839 +#: commit-graph.c:2047 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:1965 +#: commit-graph.c:2180 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:2009 +#: commit-graph.c:2224 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2115 +#: commit-graph.c:2331 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -#: commit-graph.c:2214 +#: commit-graph.c:2438 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2307 +#: commit-graph.c:2536 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2317 +#: commit-graph.c:2546 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2327 commit-graph.c:2342 +#: commit-graph.c:2556 commit-graph.c:2571 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2334 +#: commit-graph.c:2563 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2352 +#: commit-graph.c:2581 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2367 +#: commit-graph.c:2596 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2374 +#: commit-graph.c:2603 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2384 +#: commit-graph.c:2613 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2393 +#: commit-graph.c:2622 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2407 +#: commit-graph.c:2636 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2412 +#: commit-graph.c:2641 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2416 +#: commit-graph.c:2645 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2432 +#: commit-graph.c:2662 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" -#: commit-graph.c:2438 +#: commit-graph.c:2668 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 #: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" @@ -2211,27 +2228,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1172 +#: commit.c:1223 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1176 +#: commit.c:1227 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1179 +#: commit.c:1230 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1182 +#: commit.c:1233 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1436 +#: commit.c:1487 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2242,7 +2259,7 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2252,289 +2269,333 @@ msgid "" "This might be due to circular includes." msgstr "" -#: config.c:141 +#: config.c:142 #, c-format msgid "could not expand include path '%s'" msgstr "" -#: config.c:152 +#: config.c:153 msgid "relative config includes must come from files" msgstr "" -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:378 +#: config.c:396 +#, c-format +msgid "invalid config format: %s" +msgstr "" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "" + +#: config.c:442 #, c-format msgid "key does not contain a section: %s" msgstr "" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "" -#: config.c:408 sequencer.c:2580 +#: config.c:472 sequencer.c:2588 #, c-format msgid "invalid key: %s" msgstr "" -#: config.c:414 +#: config.c:478 #, c-format msgid "invalid key (newline): %s" msgstr "" -#: config.c:450 config.c:462 +#: config.c:511 +msgid "empty config key" +msgstr "" + +#: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" msgstr "" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" msgstr "" -#: config.c:836 +#: config.c:622 +#, c-format +msgid "bogus count in %s" +msgstr "" + +#: config.c:626 +#, c-format +msgid "too many entries in %s" +msgstr "" + +#: config.c:636 +#, c-format +msgid "missing config key %s" +msgstr "" + +#: config.c:644 +#, c-format +msgid "missing config value %s" +msgstr "" + +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:848 +#: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:852 +#: config.c:1011 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:1013 +#: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1016 +#: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1019 +#: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1022 +#: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1025 +#: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1028 +#: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1123 +#: config.c:1194 +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "" + +#: config.c:1289 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1132 +#: config.c:1298 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1223 +#: config.c:1391 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1237 config.c:1248 +#: config.c:1405 config.c:1416 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1340 +#: config.c:1508 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1373 +#: config.c:1541 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1445 +#: config.c:1613 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1471 +#: config.c:1639 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1472 +#: config.c:1640 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1533 builtin/pack-objects.c:3649 +#: config.c:1701 builtin/pack-objects.c:3666 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1655 +#: config.c:1823 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1658 +#: config.c:1826 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1675 +#: config.c:1843 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1705 +#: config.c:1873 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1759 +#: config.c:1927 msgid "unable to parse command-line config" msgstr "" -#: config.c:2122 +#: config.c:2290 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2296 +#: config.c:2464 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2341 +#: config.c:2509 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2387 +#: config.c:2555 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2389 +#: config.c:2557 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2473 +#: config.c:2641 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2505 +#: config.c:2673 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2534 +#: config.c:2702 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2786 config.c:3112 +#: config.c:2954 config.c:3280 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2797 +#: config.c:2965 #, c-format msgid "opening %s" msgstr "" -#: config.c:2834 builtin/config.c:361 +#: config.c:3002 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2859 +#: config.c:3027 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2872 config.c:3125 +#: config.c:3040 config.c:3293 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2883 +#: config.c:3051 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2892 config.c:3130 +#: config.c:3060 config.c:3298 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2977 config.c:3227 +#: config.c:3145 config.c:3395 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:3011 +#: config.c:3179 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3103 +#: config.c:3271 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3270 +#: config.c:3438 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2592,52 +2653,52 @@ msgstr "" msgid "protocol error: unexpected '%s'" msgstr "" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "" -#: connect.c:500 +#: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" msgstr "" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "" -#: connect.c:640 +#: connect.c:666 #, c-format msgid "protocol '%s' is not supported" msgstr "" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, c-format msgid "Looking up %s ... " msgstr "" -#: connect.c:735 +#: connect.c:761 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, c-format msgid "" "unable to connect to %s:\n" @@ -2645,61 +2706,65 @@ msgid "" msgstr "" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 msgid "done." msgstr "" -#: connect.c:798 +#: connect.c:824 #, c-format msgid "unable to look up %s (%s)" msgstr "" -#: connect.c:804 +#: connect.c:830 #, c-format msgid "unknown port %s" msgstr "" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:953 +#: connect.c:979 #, c-format msgid "cannot start proxy %s" msgstr "" -#: connect.c:1024 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1248 +#: connect.c:1276 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1408 +#: connect.c:1436 msgid "unable to fork" msgstr "" -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" @@ -2952,6 +3017,11 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" +#: diff-merges.c:70 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "" + #: diff-lib.c:534 msgid "--merge-base does not work with ranges" msgstr "" @@ -3028,527 +3098,539 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4625 +#: diff.c:4628 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4628 +#: diff.c:4631 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4707 +#: diff.c:4710 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4755 +#: diff.c:4758 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4792 +#: diff.c:4795 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4877 +#: diff.c:4880 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4901 +#: diff.c:4904 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4915 +#: diff.c:4918 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4965 diff.c:4971 +#: diff.c:4968 diff.c:4974 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4983 +#: diff.c:4986 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:5004 +#: diff.c:5007 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:5023 +#: diff.c:5026 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:5063 +#: diff.c:5066 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5099 diff.c:5119 +#: diff.c:5102 diff.c:5122 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5223 +#: diff.c:5226 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "" -#: diff.c:5272 +#: diff.c:5275 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5328 +#: diff.c:5331 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5351 +#: diff.c:5367 msgid "Diff output format options" msgstr "" |