msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-04-23 09:54+0800\n"
+"POT-Creation-Date: 2017-05-05 09:35+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"
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280
+#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4917 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr ""
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr ""
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4949 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr ""
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4973 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr ""
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59
+#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545
+#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
#: parse-options.h:153
msgid "file"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:443
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr ""
-#: bisect.c:448
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:656
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:709
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:733
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: bisect.c:738
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:743
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: bisect.c:751
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:764
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:799
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:850
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:918
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:948
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:968
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:976
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:995
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:999
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299
+#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
#: builtin/merge.c:359 builtin/shortlog.c:176
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr ""
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:701
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:705
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:709
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:713
+#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:717
+#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:721
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:840
+#: config.c:859
msgid "out of range"
msgstr ""
-#: config.c:840
+#: config.c:859
msgid "invalid unit"
msgstr ""
-#: config.c:846
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:851
+#: config.c:870
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:854
+#: config.c:873
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:857
+#: config.c:876
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:860
+#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:863
+#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:866
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:953
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1048 config.c:1059
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1176
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1332
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1522
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:1572
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:1931
+#: config.c:1970
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:1952
+#: config.c:1991
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:1978
+#: config.c:2017
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:1989
+#: config.c:2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:1991
+#: config.c:2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2050
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2384 config.c:2609
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2502
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2504 builtin/remote.c:774
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr ""
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr ""
-#: fetch-pack.c:279
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr ""
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:331
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:417
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:423
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:425
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:428
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:430
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:433
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:472
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:486
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:519
+#: fetch-pack.c:521
msgid "giving up"
msgstr ""
-#: fetch-pack.c:529 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr ""
-#: fetch-pack.c:541
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:587
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:735
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:773
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:781
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:837
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:853
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:855
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:882
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:886
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:889
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr ""
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr ""
-#: fetch-pack.c:899
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr ""
-#: fetch-pack.c:903
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr ""
-#: fetch-pack.c:907
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: fetch-pack.c:911
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: fetch-pack.c:921
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr ""
-#: fetch-pack.c:928
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:934
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:938
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:940
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:963
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1125
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1147
+#: fetch-pack.c:1149
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1150
+#: fetch-pack.c:1152
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr ""
msgid "malformed object name '%s'"
msgstr ""
-#: path.c:805
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
msgid "unable to parse --pretty format"
msgstr ""
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:2232
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
#, c-format
-msgid "could not stat '%s"
+msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:2245
+#: read-cache.c:2388
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:2257
+#: read-cache.c:2400
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: refs.c:619 builtin/merge.c:844
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: refs/files-backend.c:2531
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:2534
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr ""
-#: refs/files-backend.c:2543
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr ""
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:294 sequencer.c:1675
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr ""
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr ""
-#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1071 sequencer.c:1820
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:1302
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:1310
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:1342
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:1349
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:1351
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:1356
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:1367
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:1369
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:1432
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: sequencer.c:1435
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:1492
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:1530
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:1531
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:1534
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:1548
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:1604 sequencer.c:2159
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:1606
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:1608 sequencer.c:1642
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:1628 builtin/grep.c:910
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:1630
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:1631
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:1637
+#: sequencer.c:1644
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:1648
+#: sequencer.c:1655
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:1785 sequencer.c:2058
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:1825 builtin/difftool.c:616
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:1841
+#: sequencer.c:1848
msgid "could not read index"
msgstr ""
-#: sequencer.c:1846
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:1852
+#: sequencer.c:1859
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:1858
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:1913 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr ""
-#: sequencer.c:1925
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:1927 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:2009
+#: sequencer.c:2016
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:2036
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:2066
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:2070
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:2077
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:2084
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:2168
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:2173
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:2182
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:2184
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:2186
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:2189
+#: sequencer.c:2211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:2199
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:2279
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:2283
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:2316
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr ""
msgid "submodule '%s' has dirty index"
msgstr ""
-#: submodule.c:1679
+#: submodule.c:1678
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:1691 submodule.c:1747
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:1695 builtin/submodule--helper.c:678
+#: submodule.c:1694 builtin/submodule--helper.c:678
#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: submodule.c:1698
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s'\n"
msgstr ""
-#: submodule.c:1782
+#: submodule.c:1781
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:1826
+#: submodule.c:1825
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:1846
+#: submodule.c:1845
msgid "BUG: returned path string doesn't match cwd?"
msgstr ""
-#: submodule.c:1865
+#: submodule.c:1864
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
msgid "could not open '%s' for writing"
msgstr ""
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
+#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
msgid "index file corrupt"
msgstr ""
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:989 builtin/clone.c:397
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1177
+#: builtin/am.c:1179
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1178
+#: builtin/am.c:1180
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr ""
-#: builtin/am.c:1390 builtin/log.c:1557
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1610
+#: builtin/am.c:1606
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1612
+#: builtin/am.c:1608
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1637
+#: builtin/am.c:1633
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1686 builtin/merge.c:631
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1759
+#: builtin/am.c:1755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/am.c:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgstr ""
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2137
+#: builtin/am.c:2136
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2247
+#: builtin/am.c:2246
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2261
+#: builtin/am.c:2260
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
+#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
+#: builtin/am.c:2292
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
msgid "n"
msgstr ""
-#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
+#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
msgid "format"
msgstr ""
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr ""
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2334
+#: builtin/am.c:2333
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2386
+#: builtin/am.c:2385
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
msgid "git archive: NACK %s"
msgstr ""
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr ""
#: builtin/checkout-index.c:174 builtin/column.c:30
#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:472
+#: builtin/worktree.c:477
msgid "string"
msgstr ""
msgstr ""
#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325
-#: builtin/worktree.c:327
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
+#: builtin/worktree.c:331
msgid "branch"
msgstr ""
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1164 builtin/worktree.c:329
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr ""
msgstr ""
#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348
+#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
#: builtin/name-rev.c:350 builtin/show-ref.c:176
msgid "pattern"
msgstr ""
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:884 builtin/receive-pack.c:1901
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr ""
msgstr ""
#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:222 builtin/worktree.c:249
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
msgstr ""
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:443
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr ""
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1588 builtin/gc.c:353
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr ""
msgid "git config [<options>]"
msgstr ""
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr ""
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr ""
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr ""
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr ""
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr ""
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr ""
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr ""
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr ""
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr ""
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr ""
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr ""
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr ""
-#: builtin/config.c:85
+#: builtin/config.c:86
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:611
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/config.c:623
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/gc.c:306
+#: builtin/gc.c:310
#, c-format
msgid "Can't stat %s"
msgstr ""
-#: builtin/gc.c:315
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"%s"
msgstr ""
-#: builtin/gc.c:354
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:356
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:357
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:358
+#: builtin/gc.c:362
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:375
+#: builtin/gc.c:379
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:403
+#: builtin/gc.c:407
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:405
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:406
+#: builtin/gc.c:410
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:427
+#: builtin/gc.c:431
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:471
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:512
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:514
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:516
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:518
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:520
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:522
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr ""
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:796
+#: builtin/receive-pack.c:795
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:816
+#: builtin/receive-pack.c:815
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1889
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1903
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr ""
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr ""
-#: builtin/replace.c:359
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:361
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:372
+#: builtin/replace.c:373
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-#: builtin/replace.c:405
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr ""
-#: builtin/replace.c:406
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/replace.c:412
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/replace.c:436
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:437
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:438
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:439
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:440
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:441
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:442
+#: builtin/replace.c:443
msgid "use this format"
msgstr ""
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:312
-msgid "tag: tagging "
-msgstr ""
-
-#: builtin/tag.c:320
-msgid "object of unknown type"
-msgstr ""
-
-#: builtin/tag.c:327
-msgid "commit object"
-msgstr ""
-
-#: builtin/tag.c:335
-msgid "tree object"
-msgstr ""
-
-#: builtin/tag.c:338
-msgid "blob object"
-msgstr ""
-
-#: builtin/tag.c:341
-msgid "other tag object"
-msgstr ""
-
#: builtin/tag.c:397
msgid "list tag names"
msgstr ""
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr ""
-#: builtin/worktree.c:324
+#: builtin/worktree.c:328
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:326
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:328
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:330
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:338
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr ""
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:473
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:485 builtin/worktree.c:518
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:487 builtin/worktree.c:520
+#: builtin/worktree.c:492 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:492
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:494
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:522
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr ""
"to read about a specific subcommand or concept."
msgstr ""
-#: http.c:355
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr ""
+
+#: http.c:357
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: http.c:364
+#: http.c:366
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:1755
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-rebase.sh:57
+#: git-rebase.sh:58
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
"\"."
msgstr ""
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
OSDN Git Service
