msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-08-06 14:10+0800\n"
+"POT-Creation-Date: 2014-04-19 12:50+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"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:57
+#: advice.c:55
#, c-format
msgid "hint: %.*s\n"
msgstr ""
-#.
-#. * Message used both when 'git commit' fails and when
-#. * other commands doing a merge do.
-#.
-#: advice.c:87
+#: advice.c:85
msgid ""
"Fix them up in the work tree,\n"
"and then use 'git add/rm <file>' as\n"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:323
+#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr ""
+
+#: archive.c:328
msgid "fmt"
msgstr ""
-#: archive.c:323
+#: archive.c:328
msgid "archive format"
msgstr ""
-#: archive.c:324 builtin/log.c:1173
+#: archive.c:329 builtin/log.c:1193
msgid "prefix"
msgstr ""
-#: archive.c:325
+#: archive.c:330
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
-#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
-#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
-#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
+#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2258
+#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680
+#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77
+#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
+#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
msgid "file"
msgstr ""
-#: archive.c:327 builtin/archive.c:89
+#: archive.c:332 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:329
+#: archive.c:334
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:330
+#: archive.c:335
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:331
+#: archive.c:336
msgid "store only"
msgstr ""
-#: archive.c:332
+#: archive.c:337
msgid "compress faster"
msgstr ""
-#: archive.c:340
+#: archive.c:345
msgid "compress better"
msgstr ""
-#: archive.c:343
+#: archive.c:348
msgid "list supported archive formats"
msgstr ""
-#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
+#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
msgid "repo"
msgstr ""
-#: archive.c:346 builtin/archive.c:91
+#: archive.c:351 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
+#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
msgid "command"
msgstr ""
-#: archive.c:348 builtin/archive.c:93
+#: archive.c:353 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
msgid "Not setting branch %s as its own upstream."
msgstr ""
-#: branch.c:82
+#: branch.c:83
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr ""
-#: branch.c:87
+#: branch.c:88
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr ""
-#: branch.c:92
+#: branch.c:94
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
-#: branch.c:93
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr ""
-#: branch.c:97
+#: branch.c:99
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
-#: branch.c:98
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr ""
-#: branch.c:118
-#, c-format
-msgid "Tracking not set up: name too long: %s"
-msgstr ""
-
-#: branch.c:137
+#: branch.c:133
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:182
+#: branch.c:178
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:187
+#: branch.c:183
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:195
+#: branch.c:191
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:216
+#: branch.c:211
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:218
+#: branch.c:213
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:220
+#: branch.c:215
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:265
+#: branch.c:260
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:285
+#: branch.c:280
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:290
+#: branch.c:285
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:296
+#: branch.c:291
msgid "Failed to lock ref for update"
msgstr ""
-#: branch.c:314
+#: branch.c:309
msgid "Failed to write ref"
msgstr ""
-#: bundle.c:36
+#: bundle.c:33
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: bundle.c:63
+#: bundle.c:60
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:89 builtin/commit.c:697
+#: bundle.c:86 builtin/commit.c:706
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:140
+#: bundle.c:138
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
-#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
-#: builtin/shortlog.c:156
+#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332
+#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357
+#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr ""
-#: bundle.c:186
+#: bundle.c:184
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:193
+#: bundle.c:191
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:195
+#: bundle.c:193
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:294
+#: bundle.c:293
msgid "rev-list died"
msgstr ""
-#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
+#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:335
+#: bundle.c:334
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:380
+#: bundle.c:379
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:398
+#: bundle.c:395
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:416
+#: bundle.c:413
msgid "pack-objects died"
msgstr ""
-#: bundle.c:419
+#: bundle.c:416
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:441
+#: bundle.c:438
msgid "index-pack died"
msgstr ""
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:55
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
msgid "memory exhausted"
msgstr ""
-#: connected.c:60
+#: connected.c:70
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:80
+#: connected.c:90
#, c-format
msgid "failed write to rev-list: %s"
msgstr ""
-#: connected.c:88
+#: connected.c:98
#, c-format
msgid "failed to close rev-list's stdin: %s"
msgstr ""
msgstr[0] ""
msgstr[1] ""
+#. TRANSLATORS: "%s" is "<n> years"
#: date.c:149
#, c-format
msgid "%s, %lu month ago"
msgstr[0] ""
msgstr[1] ""
-#: diff.c:112
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr ""
+
+#: diffcore-rename.c:517
+msgid "Performing inexact rename detection"
+msgstr ""
+
+#: diff.c:113
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:117
+#: diff.c:118
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:210
+#: diff.c:213
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:260
+#: diff.c:263
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3487
+#: diff.c:3495
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3501
+#: diff.c:3509
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
msgid "failed writing detached signature to '%s': %s"
msgstr ""
-#: grep.c:1623
+#: grep.c:1698
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1640
+#: grep.c:1715
#, c-format
msgid "'%s': %s"
msgstr ""
-#: grep.c:1651
+#: grep.c:1726
#, c-format
msgid "'%s': short read %s"
msgstr ""
-#: help.c:210
+#: help.c:209
#, c-format
msgid "available git commands in '%s'"
msgstr ""
-#: help.c:217
+#: help.c:216
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:233
+#: help.c:232
msgid "The most commonly used git commands are:"
msgstr ""
-#: help.c:290
+#: help.c:289
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: help.c:347
+#: help.c:346
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:369
+#: help.c:368
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
-#: help.c:374
+#: help.c:373
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
-#: help.c:381
+#: help.c:380
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:385 help.c:444
+#: help.c:384 help.c:443
msgid ""
"\n"
"Did you mean this?"
msgstr[0] ""
msgstr[1] ""
-#: help.c:440
+#: help.c:439
#, c-format
msgid "%s: %s - %s"
msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
-#: builtin/clone.c:656
+#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558
+#: builtin/clone.c:661
msgid "unable to write new index file"
msgstr ""
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:206
+#: merge-recursive.c:208
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr ""
-#: merge-recursive.c:269
+#: merge-recursive.c:271
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:673
+#: merge-recursive.c:675
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:684
+#: merge-recursive.c:686
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#. something else exists
-#. .. but not some other error (who really cares what?)
-#: merge-recursive.c:698 merge-recursive.c:719
+#: merge-recursive.c:700 merge-recursive.c:721
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:709
+#: merge-recursive.c:711
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:749
+#: merge-recursive.c:751
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:751
+#: merge-recursive.c:753
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:774 builtin/clone.c:312
+#: merge-recursive.c:776 builtin/clone.c:317
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: merge-recursive.c:782
+#: merge-recursive.c:784
#, c-format
msgid "failed to symlink '%s'"
msgstr ""
-#: merge-recursive.c:785
+#: merge-recursive.c:787
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:923
+#: merge-recursive.c:925
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:927
+#: merge-recursive.c:929
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:943
+#: merge-recursive.c:945
msgid "unsupported object type in the tree"
msgstr ""
-#: merge-recursive.c:1022 merge-recursive.c:1036
+#: merge-recursive.c:1024 merge-recursive.c:1038
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1028 merge-recursive.c:1041
+#: merge-recursive.c:1030 merge-recursive.c:1043
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1082
+#: merge-recursive.c:1084
msgid "rename"
msgstr ""
-#: merge-recursive.c:1082
+#: merge-recursive.c:1084
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1138
+#: merge-recursive.c:1140
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1160
+#: merge-recursive.c:1162
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1165
+#: merge-recursive.c:1167
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1219
+#: merge-recursive.c:1221
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1249
+#: merge-recursive.c:1251
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1448
+#: merge-recursive.c:1450
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1458
+#: merge-recursive.c:1460
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1463 merge-recursive.c:1661
+#: merge-recursive.c:1465 merge-recursive.c:1663
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1514
+#: merge-recursive.c:1516
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1517
+#: merge-recursive.c:1519
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1565
+#: merge-recursive.c:1567
msgid "modify"
msgstr ""
-#: merge-recursive.c:1565
+#: merge-recursive.c:1567
msgid "modified"
msgstr ""
-#: merge-recursive.c:1575
+#: merge-recursive.c:1577
msgid "content"
msgstr ""
-#: merge-recursive.c:1582
+#: merge-recursive.c:1584
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1616
+#: merge-recursive.c:1618
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1630
+#: merge-recursive.c:1632
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1634 git-submodule.sh:1118
+#: merge-recursive.c:1636 git-submodule.sh:1149
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1635
+#: merge-recursive.c:1637
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1725
+#: merge-recursive.c:1727
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1750
+#: merge-recursive.c:1752
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1756
+#: merge-recursive.c:1758
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1761
+#: merge-recursive.c:1763
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1771
+#: merge-recursive.c:1773
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1788
+#: merge-recursive.c:1790
msgid "Fatal merge failure, shouldn't happen."
msgstr ""
-#: merge-recursive.c:1807
+#: merge-recursive.c:1809
msgid "Already up-to-date!"
msgstr ""
-#: merge-recursive.c:1816
+#: merge-recursive.c:1818
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:1846
+#: merge-recursive.c:1848
#, c-format
msgid "Unprocessed path??? %s"
msgstr ""
-#: merge-recursive.c:1891
+#: merge-recursive.c:1893
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:1904
+#: merge-recursive.c:1906
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:1941
+#: merge-recursive.c:1943
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:1998
+#: merge-recursive.c:2000
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2010 builtin/merge.c:672
+#: merge-recursive.c:2012 builtin/merge.c:668
msgid "Unable to write index."
msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:204
+#: object.c:229
#, c-format
msgid "unable to parse object: %s"
msgstr ""
-#: parse-options.c:489
+#: parse-options.c:532
msgid "..."
msgstr ""
-#: parse-options.c:507
+#: parse-options.c:550
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:511
+#: parse-options.c:554
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:514
+#: parse-options.c:557
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:548
+#: parse-options.c:591
msgid "-NUM"
msgstr ""
-#: pathspec.c:83
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+
+#: pathspec.c:143
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr ""
+
+#: pathspec.c:183
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr ""
+
+#: pathspec.c:187
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr ""
+
+#: pathspec.c:205
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr ""
+
+#: pathspec.c:230
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr ""
+
+#: pathspec.c:241
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr ""
+
+#: pathspec.c:291
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr ""
+
+#: pathspec.c:353
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+
+#: pathspec.c:433
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr ""
+
+#: pathspec.c:442
+msgid ""
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
+msgstr ""
+
+#: progress.c:224
+msgid "done"
+msgstr ""
+
+#: read-cache.c:1238
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1248
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: remote.c:758
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr ""
+
+#: remote.c:762
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: pathspec.c:99
+#: remote.c:766
#, c-format
-msgid "'%s' is beyond a symbolic link"
+msgid "%s tracks both %s and %s"
+msgstr ""
+
+#: remote.c:774
+msgid "Internal error"
msgstr ""
-#: remote.c:1788
+#: remote.c:1948
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr ""
+
+#: remote.c:1952
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr ""
+
+#: remote.c:1955
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr ""
+
+#: remote.c:1959
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1794
+#: remote.c:1965
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:1797
+#: remote.c:1968
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1805
+#: remote.c:1976
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:1808
+#: remote.c:1979
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1818
+#: remote.c:1989
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
msgid "dup2(%d,%d) failed"
msgstr ""
-#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903
-#: builtin/merge.c:1013 builtin/merge.c:1023
+#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899
+#: builtin/merge.c:1009 builtin/merge.c:1019
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793
-#: builtin/merge.c:1015 builtin/merge.c:1028
+#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789
+#: builtin/merge.c:1011 builtin/merge.c:1024
#, c-format
msgid "Could not write to '%s'"
msgstr ""
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:245 sequencer.c:869 sequencer.c:952
+#: sequencer.c:245 sequencer.c:879 sequencer.c:962
#, c-format
msgid "Could not write to %s"
msgstr ""
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:355
+#: sequencer.c:356
msgid "Could not resolve HEAD commit\n"
msgstr ""
-#: sequencer.c:377
+#: sequencer.c:378
msgid "Unable to update cache tree\n"
msgstr ""
-#: sequencer.c:422
+#: sequencer.c:430
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
-#: sequencer.c:427
+#: sequencer.c:435
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:493
+#: sequencer.c:501
msgid "Your index file is unmerged."
msgstr ""
-#: sequencer.c:512
+#: sequencer.c:520
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:520
+#: sequencer.c:528
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:524
+#: sequencer.c:532
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:537
+#: sequencer.c:545
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:541
+#: sequencer.c:549
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
-#: sequencer.c:627
+#: sequencer.c:635
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:628
+#: sequencer.c:636
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:664
+#: sequencer.c:672
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:672
+#: sequencer.c:680
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:677
+#: sequencer.c:685
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:735
+#: sequencer.c:743
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
-#: sequencer.c:757
+#: sequencer.c:765
#, c-format
msgid "Could not parse line %d."
msgstr ""
-#: sequencer.c:762
+#: sequencer.c:770
msgid "No commits parsed."
msgstr ""
-#: sequencer.c:775
+#: sequencer.c:783
#, c-format
msgid "Could not open %s"
msgstr ""
-#: sequencer.c:779
+#: sequencer.c:787
#, c-format
msgid "Could not read %s."
msgstr ""
-#: sequencer.c:786
+#: sequencer.c:794
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
-#: sequencer.c:814
+#: sequencer.c:824
#, c-format
msgid "Invalid key: %s"
msgstr ""
-#: sequencer.c:817
+#: sequencer.c:827
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: sequencer.c:829
+#: sequencer.c:839
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
-#: sequencer.c:850
+#: sequencer.c:860
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:851
+#: sequencer.c:861
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:855
+#: sequencer.c:865
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:871 sequencer.c:956
+#: sequencer.c:881 sequencer.c:966
#, c-format
msgid "Error wrapping up %s."
msgstr ""
-#: sequencer.c:890 sequencer.c:1024
+#: sequencer.c:900 sequencer.c:1036
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:892
+#: sequencer.c:902
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:894
+#: sequencer.c:904
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:916 builtin/apply.c:4061
+#: sequencer.c:926 builtin/apply.c:4061
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: sequencer.c:919
+#: sequencer.c:929
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:920
+#: sequencer.c:930
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:926
+#: sequencer.c:936
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:949
+#: sequencer.c:959
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:1092
+#: sequencer.c:1104
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:1095
+#: sequencer.c:1107
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:1129
+#: sequencer.c:1141
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:1130
+#: sequencer.c:1142
msgid "Can't cherry-pick into empty head"
msgstr ""
-#: sha1_name.c:440
+#: sha1_name.c:439
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: sha1_name.c:1097
+#: sha1_name.c:1072
msgid "HEAD does not point to a branch"
msgstr ""
-#: sha1_name.c:1100
+#: sha1_name.c:1075
#, c-format
msgid "No such branch: '%s'"
msgstr ""
-#: sha1_name.c:1102
+#: sha1_name.c:1077
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr ""
-#: sha1_name.c:1106
+#: sha1_name.c:1081
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: wrapper.c:408
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+
+#: submodule.c:68 submodule.c:102
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr ""
+
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ""
+
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr ""
+
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr ""
+
+#: submodule.c:1121 builtin/init-db.c:363
+#, c-format
+msgid "Could not create git link %s"
+msgstr ""
+
+#: submodule.c:1132
+#, c-format
+msgid "Could not set core.worktree in %s"
+msgstr ""
+
+#: unpack-trees.c:206
+msgid "Checking out files"
+msgstr ""
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr ""
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr ""
+
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr ""
+
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr ""
+
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr ""
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr ""
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr ""
+
+#: wrapper.c:422
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: wrapper.c:429
+#: wrapper.c:443
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:440
+#: wrapper.c:454
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr ""
-#: wrapper.c:441
+#: wrapper.c:455
msgid "no such user"
msgstr ""
-#: wt-status.c:141
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:168 wt-status.c:195
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:170 wt-status.c:197
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:174
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:176 wt-status.c:180
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:178
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:189
+#: wt-status.c:198
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:207
+#: wt-status.c:216
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:211
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:213
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:214
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:216
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:228
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:245
-msgid "bug"
-msgstr ""
-
-#: wt-status.c:250
+#: wt-status.c:252
msgid "both deleted:"
msgstr ""
-#: wt-status.c:251
+#: wt-status.c:254
msgid "added by us:"
msgstr ""
-#: wt-status.c:252
+#: wt-status.c:256
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:253
+#: wt-status.c:258
msgid "added by them:"
msgstr ""
-#: wt-status.c:254
+#: wt-status.c:260
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:255
+#: wt-status.c:262
msgid "both added:"
msgstr ""
-#: wt-status.c:256
+#: wt-status.c:264
msgid "both modified:"
msgstr ""
-#: wt-status.c:286
-msgid "new commits, "
+#: wt-status.c:266
+#, c-format
+msgid "bug: unhandled unmerged status %x"
msgstr ""
-#: wt-status.c:288
-msgid "modified content, "
+#: wt-status.c:274
+msgid "new file:"
msgstr ""
-#: wt-status.c:290
-msgid "untracked content, "
+#: wt-status.c:276
+msgid "copied:"
msgstr ""
-#: wt-status.c:307
-#, c-format
-msgid "new file: %s"
+#: wt-status.c:278
+msgid "deleted:"
msgstr ""
-#: wt-status.c:310
-#, c-format
-msgid "copied: %s -> %s"
+#: wt-status.c:280
+msgid "modified:"
msgstr ""
-#: wt-status.c:313
-#, c-format
-msgid "deleted: %s"
+#: wt-status.c:282
+msgid "renamed:"
msgstr ""
-#: wt-status.c:316
-#, c-format
-msgid "modified: %s"
+#: wt-status.c:284
+msgid "typechange:"
msgstr ""
-#: wt-status.c:319
-#, c-format
-msgid "renamed: %s -> %s"
+#: wt-status.c:286
+msgid "unknown:"
msgstr ""
-#: wt-status.c:322
-#, c-format
-msgid "typechange: %s"
+#: wt-status.c:288
+msgid "unmerged:"
msgstr ""
-#: wt-status.c:325
-#, c-format
-msgid "unknown: %s"
+#: wt-status.c:370
+msgid "new commits, "
msgstr ""
-#: wt-status.c:328
-#, c-format
-msgid "unmerged: %s"
+#: wt-status.c:372
+msgid "modified content, "
+msgstr ""
+
+#: wt-status.c:374
+msgid "untracked content, "
msgstr ""
-#: wt-status.c:331
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:803
+#: wt-status.c:765
+msgid "Submodules changed but not updated:"
+msgstr ""
+
+#: wt-status.c:767
+msgid "Submodule changes to be committed:"
+msgstr ""
+
+#: wt-status.c:846
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
+msgstr ""
+
+#: wt-status.c:937
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:806
+#: wt-status.c:940
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:809
+#: wt-status.c:943
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:812
+#: wt-status.c:946
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:822
+#: wt-status.c:956
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:825
+#: wt-status.c:959
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:829
+#: wt-status.c:963
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:831
+#: wt-status.c:965
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:833
+#: wt-status.c:967
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:893 wt-status.c:910
+#: wt-status.c:1027 wt-status.c:1044
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:898 wt-status.c:915
+#: wt-status.c:1032 wt-status.c:1049
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:901
+#: wt-status.c:1035
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:903
+#: wt-status.c:1037
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:905
+#: wt-status.c:1039
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:918
+#: wt-status.c:1052
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:922
+#: wt-status.c:1056
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:927
+#: wt-status.c:1061
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:930
+#: wt-status.c:1064
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:934
+#: wt-status.c:1068
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:939
+#: wt-status.c:1073
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:942
+#: wt-status.c:1076
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:944
+#: wt-status.c:1078
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:954
-msgid "You are currently cherry-picking."
+#: wt-status.c:1088
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:958
+#: wt-status.c:1093
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:961
+#: wt-status.c:1096
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:963
+#: wt-status.c:1098
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:972
+#: wt-status.c:1107
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:977
+#: wt-status.c:1112
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:980
+#: wt-status.c:1115
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:982
+#: wt-status.c:1117
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:993
+#: wt-status.c:1128
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:997
+#: wt-status.c:1132
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1000
+#: wt-status.c:1135
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1173
+#: wt-status.c:1310
msgid "On branch "
msgstr ""
-#: wt-status.c:1180
+#: wt-status.c:1317
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1187
+#: wt-status.c:1324
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1189
+#: wt-status.c:1326
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1192
+#: wt-status.c:1329
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1209
+#: wt-status.c:1346
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1223
+#: wt-status.c:1360
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1225
+#: wt-status.c:1362
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1229
+#: wt-status.c:1366
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1235
+#: wt-status.c:1372
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1237
+#: wt-status.c:1374
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1243
+#: wt-status.c:1380
msgid "No changes"
msgstr ""
-#: wt-status.c:1248
+#: wt-status.c:1385
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1251
+#: wt-status.c:1388
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1254
+#: wt-status.c:1391
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1257
+#: wt-status.c:1394
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1260
+#: wt-status.c:1397
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1263 wt-status.c:1268
+#: wt-status.c:1400 wt-status.c:1405
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1266
+#: wt-status.c:1403
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1270
+#: wt-status.c:1407
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: wt-status.c:1378
+#: wt-status.c:1516
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1384
+#: wt-status.c:1522
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1399
-msgid "behind "
-msgstr ""
-
-#: wt-status.c:1402 wt-status.c:1405
-msgid "ahead "
+#: wt-status.c:1554
+msgid "gone"
msgstr ""
-#: wt-status.c:1407
-msgid ", behind "
+#: wt-status.c:1556 wt-status.c:1564
+msgid "behind "
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:351
+#: compat/precompose_utf8.c:55 builtin/clone.c:356
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/add.c:20
+#: builtin/add.c:21
msgid "git add [options] [--] <pathspec>..."
msgstr ""
-#.
-#. * To be consistent with "git add -p" and most Git
-#. * commands, we should default to being tree-wide, but
-#. * this is not the original behavior and can't be
-#. * changed until users trained themselves not to type
-#. * "git add -u" or "git add -A". For now, we warn and
-#. * keep the old behavior. Later, the behavior can be changed
-#. * to tree-wide, keeping the warning for a while, and
-#. * eventually we can drop the warning.
-#.
-#: builtin/add.c:58
-#, c-format
-msgid ""
-"The behavior of 'git add %s (or %s)' with no path argument from a\n"
-"subdirectory of the tree will change in Git 2.0 and should not be used "
-"anymore.\n"
-"To add content for the whole tree, run:\n"
-"\n"
-" git add %s :/\n"
-" (or git add %s :/)\n"
-"\n"
-"To restrict the command to the current directory, run:\n"
-"\n"
-" git add %s .\n"
-" (or git add %s .)\n"
-"\n"
-"With the current Git version, the command is restricted to the current "
-"directory.\n"
-msgstr ""
-
-#: builtin/add.c:100
-#, c-format
-msgid ""
-"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
-"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
-"Paths like '%s' that are\n"
-"removed from your working tree are ignored with this version of Git.\n"
-"\n"
-"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
-" ignores paths you removed from your working tree.\n"
-"\n"
-"* 'git add --all <pathspec>' will let you also record the removals.\n"
-"\n"
-"Run 'git status' to check the paths you removed from your working tree.\n"
-msgstr ""
-
-#: builtin/add.c:144
+#: builtin/add.c:64
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:149 builtin/commit.c:252
+#: builtin/add.c:69 builtin/commit.c:261
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:163
+#: builtin/add.c:79
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:253
+#: builtin/add.c:133
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr ""
-
-#: builtin/add.c:339
+#: builtin/add.c:193
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:350
+#: builtin/add.c:204
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:354
+#: builtin/add.c:208
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:359
+#: builtin/add.c:213
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:361
+#: builtin/add.c:215
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:367
+#: builtin/add.c:221
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:377
+#: builtin/add.c:231
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
-#: builtin/rm.c:268
+#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70
+#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344
+#: builtin/rm.c:269
msgid "dry run"
msgstr ""
-#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
+#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19
+#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612
+#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113
msgid "be verbose"
msgstr ""
-#: builtin/add.c:397
+#: builtin/add.c:251
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
+#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:399
+#: builtin/add.c:253
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:400
+#: builtin/add.c:254
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:401
+#: builtin/add.c:255
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:402
+#: builtin/add.c:256
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:403
+#: builtin/add.c:257
msgid "add changes from all tracked and untracked files"
msgstr ""
-#. takes no arguments
-#: builtin/add.c:406
+#: builtin/add.c:260
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:408
+#: builtin/add.c:262
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:409
+#: builtin/add.c:263
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:410
+#: builtin/add.c:264
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:432
+#: builtin/add.c:286
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:433
+#: builtin/add.c:287
msgid "no files added"
msgstr ""
-#: builtin/add.c:439
+#: builtin/add.c:293
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:478
+#: builtin/add.c:330
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:496
+#: builtin/add.c:337
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:526
+#: builtin/add.c:358
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:527
+#: builtin/add.c:359
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
-#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
+#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920
+#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
+#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432
msgid "Unable to write new index file"
msgstr ""
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#. there has to be one hunk (forward hunk)
#: builtin/apply.c:1900
#, c-format
msgid "unrecognized binary patch at line %d"
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
+#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
msgid "internal error"
msgstr ""
-#. Say this even without --verbose
#: builtin/apply.c:4043
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
-#: builtin/fetch.c:63
+#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
+#: builtin/fetch.c:78
msgid "path"
msgstr ""
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
+#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455
msgid "paths are separated with NUL character"
msgstr ""
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/blame.c:26
+#: builtin/blame.c:27
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr ""
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:2276
+#: builtin/blame.c:2242
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2277
+#: builtin/blame.c:2243
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2278
+#: builtin/blame.c:2244
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2279
+#: builtin/blame.c:2245
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2280
+#: builtin/blame.c:2246
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2281
+#: builtin/blame.c:2247
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2282
+#: builtin/blame.c:2248
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2283
+#: builtin/blame.c:2249
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2284
+#: builtin/blame.c:2250
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2285
+#: builtin/blame.c:2251
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2286
+#: builtin/blame.c:2252
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2287
+#: builtin/blame.c:2253
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2288
+#: builtin/blame.c:2254
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2289
+#: builtin/blame.c:2255
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2290
+#: builtin/blame.c:2256
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2291
+#: builtin/blame.c:2257
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2292
+#: builtin/blame.c:2258
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2293
+#: builtin/blame.c:2259
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2294 builtin/blame.c:2295
+#: builtin/blame.c:2260 builtin/blame.c:2261
msgid "score"
msgstr ""
-#: builtin/blame.c:2294
+#: builtin/blame.c:2260
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2295
+#: builtin/blame.c:2261
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2296
+#: builtin/blame.c:2262
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2296
+#: builtin/blame.c:2262
msgid "Process only line range n,m, counting from 1"
msgstr ""
msgid "branch '%s' does not point at a commit"
msgstr ""
-#: builtin/branch.c:453
+#: builtin/branch.c:454
+#, c-format
+msgid "[%s: gone]"
+msgstr ""
+
+#: builtin/branch.c:459
+#, c-format
+msgid "[%s]"
+msgstr ""
+
+#: builtin/branch.c:464
#, c-format
msgid "[%s: behind %d]"
msgstr ""
-#: builtin/branch.c:455
+#: builtin/branch.c:466
#, c-format
msgid "[behind %d]"
msgstr ""
-#: builtin/branch.c:459
+#: builtin/branch.c:470
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/branch.c:461
+#: builtin/branch.c:472
#, c-format
msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:464
+#: builtin/branch.c:475
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:467
+#: builtin/branch.c:478
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:490
+#: builtin/branch.c:502
msgid " **** invalid ref ****"
msgstr ""
-#: builtin/branch.c:582
+#: builtin/branch.c:594
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/branch.c:585
+#: builtin/branch.c:597
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/branch.c:588
+#: builtin/branch.c:600
#, c-format
msgid "(detached from %s)"
msgstr ""
-#: builtin/branch.c:591
+#: builtin/branch.c:603
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:637
+#: builtin/branch.c:649
#, c-format
msgid "object '%s' does not point to a commit"
msgstr ""
-#: builtin/branch.c:669
+#: builtin/branch.c:681
msgid "some refs could not be read"
msgstr ""
-#: builtin/branch.c:682
+#: builtin/branch.c:694
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:692
+#: builtin/branch.c:704
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:707
+#: builtin/branch.c:719
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:711
+#: builtin/branch.c:723
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:715
+#: builtin/branch.c:727
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:722
+#: builtin/branch.c:734
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:737
+#: builtin/branch.c:749
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: builtin/branch.c:761
+#: builtin/branch.c:773
#, c-format
msgid "could not write branch description template: %s"
msgstr ""
-#: builtin/branch.c:791
+#: builtin/branch.c:803
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:793
+#: builtin/branch.c:805
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:794
+#: builtin/branch.c:806
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:795
+#: builtin/branch.c:807
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:797
+#: builtin/branch.c:809
msgid "change upstream info"
msgstr ""
-#: builtin/branch.c:801
+#: builtin/branch.c:813
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:802
+#: builtin/branch.c:814
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
-#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
-#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
+#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
+#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495
+#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527
+#: builtin/tag.c:533
msgid "commit"
msgstr ""
-#: builtin/branch.c:806 builtin/branch.c:812
+#: builtin/branch.c:818 builtin/branch.c:824
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:818
+#: builtin/branch.c:830
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:819
+#: builtin/branch.c:831
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:821
+#: builtin/branch.c:833
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:822
+#: builtin/branch.c:834
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:823
+#: builtin/branch.c:835
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:824
+#: builtin/branch.c:836
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:825
+#: builtin/branch.c:837
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:826
+#: builtin/branch.c:838
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:828
+#: builtin/branch.c:840
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:829
+#: builtin/branch.c:841
msgid "force creation (when already exists)"
msgstr ""
-#: builtin/branch.c:832
+#: builtin/branch.c:844
msgid "print only not merged branches"
msgstr ""
-#: builtin/branch.c:838
+#: builtin/branch.c:850
msgid "print only merged branches"
msgstr ""
-#: builtin/branch.c:842
+#: builtin/branch.c:854
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:855
+#: builtin/branch.c:867
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:860 builtin/clone.c:630
+#: builtin/branch.c:872 builtin/clone.c:635
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:883
+#: builtin/branch.c:896
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:889 builtin/branch.c:928
+#: builtin/branch.c:902 builtin/branch.c:941
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:904
+#: builtin/branch.c:917
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:909
+#: builtin/branch.c:922
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:916
+#: builtin/branch.c:929
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:919
+#: builtin/branch.c:932
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:934
+#: builtin/branch.c:947
msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/branch.c:939
+#: builtin/branch.c:952
msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/branch.c:943
+#: builtin/branch.c:956
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
+#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:950
+#: builtin/branch.c:963
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:962
+#: builtin/branch.c:975
msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/branch.c:966
+#: builtin/branch.c:979
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:972
+#: builtin/branch.c:985
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:987
+#: builtin/branch.c:999
msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/branch.c:993
+#: builtin/branch.c:1005
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:996
+#: builtin/branch.c:1008
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
-#: builtin/branch.c:1013
+#: builtin/branch.c:1025
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: builtin/branch.c:1014
+#: builtin/branch.c:1026
#, c-format
msgid " git branch -d %s\n"
msgstr ""
-#: builtin/branch.c:1015
+#: builtin/branch.c:1027
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:285
+#: builtin/cat-file.c:331
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr ""
-#: builtin/cat-file.c:286
+#: builtin/cat-file.c:332
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr ""
-#: builtin/cat-file.c:323
+#: builtin/cat-file.c:369
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:324
+#: builtin/cat-file.c:370
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:325
+#: builtin/cat-file.c:371
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:327
+#: builtin/cat-file.c:373
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:328
+#: builtin/cat-file.c:374
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:330
+#: builtin/cat-file.c:376
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:332
+#: builtin/cat-file.c:378
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:335
+#: builtin/cat-file.c:381
msgid "show info about objects fed from the standard input"
msgstr ""
msgstr ""
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "input paths are terminated by a null character"
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
+#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271
msgid "suppress progress reporting"
msgstr ""
msgid "show non-matching input paths"
msgstr ""
-#: builtin/check-ignore.c:143
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr ""
+
+#: builtin/check-ignore.c:154
msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/check-ignore.c:146
+#: builtin/check-ignore.c:157
msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/check-ignore.c:148
+#: builtin/check-ignore.c:159
msgid "no path specified"
msgstr ""
-#: builtin/check-ignore.c:152
+#: builtin/check-ignore.c:163
msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:165
msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:168
msgid "--non-matching is only valid with --verbose"
msgstr ""
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:117 builtin/checkout.c:150
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:119 builtin/checkout.c:152
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:135
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:179
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:196
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:213
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
-#: builtin/checkout.c:246
+#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
+#: builtin/checkout.c:241
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:249 builtin/checkout.c:252
+#: builtin/checkout.c:244 builtin/checkout.c:247
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:255
+#: builtin/checkout.c:250
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:266 builtin/checkout.c:458
+#: builtin/checkout.c:261 builtin/checkout.c:450
msgid "corrupt index file"
msgstr ""
-#: builtin/checkout.c:329 builtin/checkout.c:336
+#: builtin/checkout.c:321 builtin/checkout.c:328
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:480
+#: builtin/checkout.c:472
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:601
+#: builtin/checkout.c:593
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr ""
-#: builtin/checkout.c:639
+#: builtin/checkout.c:631
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:646
+#: builtin/checkout.c:638
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:649
+#: builtin/checkout.c:641
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:653
+#: builtin/checkout.c:645
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:655 builtin/checkout.c:997
+#: builtin/checkout.c:647 builtin/checkout.c:1032
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:657
+#: builtin/checkout.c:649
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:713
+#: builtin/checkout.c:705
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#. The singular version
-#: builtin/checkout.c:719
+#: builtin/checkout.c:711
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:737
+#: builtin/checkout.c:729
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"\n"
msgstr ""
-#: builtin/checkout.c:767
+#: builtin/checkout.c:759
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:771
+#: builtin/checkout.c:763
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:798 builtin/checkout.c:992
+#: builtin/checkout.c:790 builtin/checkout.c:1027
msgid "You are on a branch yet to be born"
msgstr ""
-#. case (1)
-#: builtin/checkout.c:928
+#: builtin/checkout.c:934
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr ""
+
+#: builtin/checkout.c:973
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#. case (1): want a tree
-#: builtin/checkout.c:967
+#: builtin/checkout.c:1002
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1041
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1009 builtin/checkout.c:1013
+#: builtin/checkout.c:1044 builtin/checkout.c:1048
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
-#: builtin/checkout.c:1028
+#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060
+#: builtin/checkout.c:1063
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1068
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
-#: builtin/remote.c:169 builtin/remote.c:171
+#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88
+#: builtin/remote.c:159 builtin/remote.c:161
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1091
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1093
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1094
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1095
msgid "detach the HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1096
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1063
-msgid "new branch"
+#: builtin/checkout.c:1098
+msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1098
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1099
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1101
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1103
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1104
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1070 builtin/merge.c:232
+#: builtin/checkout.c:1105 builtin/merge.c:225
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
+#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245
msgid "style"
msgstr ""
-#: builtin/checkout.c:1072
+#: builtin/checkout.c:1107
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1110
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1112
msgid "second guess 'git checkout no-such-branch'"
msgstr ""
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1135
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1152
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1159
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1196
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1203
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1208
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1212
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr ""
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr ""
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:293
+#: builtin/clean.c:295
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
" - (empty) select nothing"
msgstr ""
-#: builtin/clean.c:297
+#: builtin/clean.c:299
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
" - (empty) finish selecting"
msgstr ""
-#: builtin/clean.c:515
+#: builtin/clean.c:517
#, c-format
msgid "Huh (%s)?"
msgstr ""
-#: builtin/clean.c:658
+#: builtin/clean.c:660
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:695
+#: builtin/clean.c:697
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:716
+#: builtin/clean.c:718
msgid "Select items to delete"
msgstr ""
-#: builtin/clean.c:756
+#: builtin/clean.c:758
#, c-format
msgid "remove %s? "
msgstr ""
-#: builtin/clean.c:781
+#: builtin/clean.c:783
msgid "Bye."
msgstr ""
-#: builtin/clean.c:789
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:816
+#: builtin/clean.c:818
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:817
+#: builtin/clean.c:819
msgid "What now"
msgstr ""
-#: builtin/clean.c:825
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:842
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:874
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:876
+#: builtin/clean.c:877
msgid "force"
msgstr ""
-#: builtin/clean.c:877
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:879
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
-#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
+#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716
+#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185
msgid "pattern"
msgstr ""
-#: builtin/clean.c:881
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:882
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:884
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:902
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:906
+#: builtin/clean.c:907
msgid ""
-"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid ""
-"clean.requireForce defaults to true and neither -i, -n nor -f given; "
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
-#: builtin/push.c:462
+#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222
+#: builtin/push.c:504
msgid "force progress reporting"
msgstr ""
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
+#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:72
+#: builtin/clone.c:71
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:74
+#: builtin/clone.c:73
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:76
+#: builtin/clone.c:75
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:78
+#: builtin/clone.c:77
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:80 builtin/clone.c:82
+#: builtin/clone.c:79 builtin/clone.c:81
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:83 builtin/init-db.c:485
+#: builtin/clone.c:82 builtin/init-db.c:483
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:84 builtin/init-db.c:486
+#: builtin/clone.c:83 builtin/init-db.c:484
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:86
+#: builtin/clone.c:85
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:88
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:90
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:92
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661
msgid "depth"
msgstr ""
-#: builtin/clone.c:94
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:96
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:97 builtin/init-db.c:494
+#: builtin/clone.c:96 builtin/init-db.c:492
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:98 builtin/init-db.c:495
+#: builtin/clone.c:97 builtin/init-db.c:493
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:99
+#: builtin/clone.c:98
msgid "key=value"
msgstr ""
-#: builtin/clone.c:100
+#: builtin/clone.c:99
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:253
+#: builtin/clone.c:252
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/clone.c:316
+#: builtin/clone.c:256
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+
+#: builtin/clone.c:259
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+
+#: builtin/clone.c:321
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/clone.c:318 builtin/diff.c:77
+#: builtin/clone.c:323 builtin/diff.c:83
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: builtin/clone.c:320
+#: builtin/clone.c:325
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:334
+#: builtin/clone.c:339
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:356
+#: builtin/clone.c:361
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:360
+#: builtin/clone.c:365
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:383
+#: builtin/clone.c:388 builtin/clone.c:565
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:396
+#: builtin/clone.c:401
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:475
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:555
+#: builtin/clone.c:560
#, c-format
msgid "Checking connectivity... "
msgstr ""
-#: builtin/clone.c:558
+#: builtin/clone.c:563
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:560
-#, c-format
-msgid "done\n"
-msgstr ""
-
-#: builtin/clone.c:621
+#: builtin/clone.c:626
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:652
+#: builtin/clone.c:657
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:760
+#: builtin/clone.c:765
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:764
+#: builtin/clone.c:769
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:775
+#: builtin/clone.c:780
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:778
+#: builtin/clone.c:783
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:791
+#: builtin/clone.c:796
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:796
+#: builtin/clone.c:802
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:798
+#: builtin/clone.c:805
+msgid "source repository is shallow, ignoring --local"
+msgstr ""
+
+#: builtin/clone.c:810
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:808
+#: builtin/clone.c:814 builtin/fetch.c:1119
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr ""
+
+#: builtin/clone.c:824
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:818
+#: builtin/clone.c:834
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:831 builtin/clone.c:843
+#: builtin/clone.c:847 builtin/clone.c:859
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:834
+#: builtin/clone.c:850
#, c-format
msgid "could not create work tree dir '%s'."
msgstr ""
-#: builtin/clone.c:853
+#: builtin/clone.c:869
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:855
+#: builtin/clone.c:871
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:890
+#: builtin/clone.c:906
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:942
+#: builtin/clone.c:957 builtin/clone.c:965
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:949
+#: builtin/clone.c:968
msgid "You appear to have cloned an empty repository."
msgstr ""
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit.c:35
+#: builtin/commit.c:36
msgid "git commit [options] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:40
+#: builtin/commit.c:41
msgid "git status [options] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/commit.c:57
+#: builtin/commit.c:58
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-#: builtin/commit.c:62
+#: builtin/commit.c:63
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
"\n"
msgstr ""
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:279
+#: builtin/commit.c:288
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:321
+#: builtin/commit.c:330
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:327
+#: builtin/commit.c:336
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
+#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:412
+#: builtin/commit.c:421
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:414
+#: builtin/commit.c:423
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:424
+#: builtin/commit.c:433
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:444
+#: builtin/commit.c:453
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:535 builtin/commit.c:541
+#: builtin/commit.c:544 builtin/commit.c:550
#, c-format
msgid "invalid commit: %s"
msgstr ""
-#: builtin/commit.c:563
+#: builtin/commit.c:572
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:583
+#: builtin/commit.c:592
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
+#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:633 builtin/shortlog.c:271
+#: builtin/commit.c:641 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:635
+#: builtin/commit.c:643
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:639
+#: builtin/commit.c:647
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:645
+#: builtin/commit.c:654
msgid "commit has empty message"
msgstr ""
-#: builtin/commit.c:661
+#: builtin/commit.c:670
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:665
+#: builtin/commit.c:674
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:669
+#: builtin/commit.c:678
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/commit.c:730
+#: builtin/commit.c:749
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:741
+#: builtin/commit.c:764
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:746
+#: builtin/commit.c:769
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:758
+#: builtin/commit.c:782
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:763
+#: builtin/commit.c:789
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:776
+#: builtin/commit.c:802
#, c-format
msgid "%sAuthor: %s"
msgstr ""
-#: builtin/commit.c:783
+#: builtin/commit.c:809
#, c-format
msgid "%sCommitter: %s"
msgstr ""
-#: builtin/commit.c:803
+#: builtin/commit.c:829
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:845
+#: builtin/commit.c:872
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:860 builtin/tag.c:359
+#: builtin/commit.c:887 builtin/tag.c:391
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:957
+#: builtin/commit.c:989
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:972 builtin/commit.c:1208
+#: builtin/commit.c:1004 builtin/commit.c:1244
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1009
+#: builtin/commit.c:1041
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1039
+#: builtin/commit.c:1071
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1050
+#: builtin/commit.c:1080
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1053
+#: builtin/commit.c:1083
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1055
+#: builtin/commit.c:1085
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1058
+#: builtin/commit.c:1088
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1068
+#: builtin/commit.c:1098
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1070
+#: builtin/commit.c:1100
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1078
+#: builtin/commit.c:1108
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1095
+#: builtin/commit.c:1125
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1097
+#: builtin/commit.c:1127
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1099
+#: builtin/commit.c:1129
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1101
-msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+#: builtin/commit.c:1131
+msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1111 builtin/tag.c:575
+#: builtin/commit.c:1143 builtin/tag.c:639
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1116
+#: builtin/commit.c:1148
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1222 builtin/commit.c:1455
+#: builtin/commit.c:1258 builtin/commit.c:1516
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1224 builtin/commit.c:1457
+#: builtin/commit.c:1260 builtin/commit.c:1518
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
+#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1229 builtin/commit.c:1461
+#: builtin/commit.c:1265 builtin/commit.c:1522
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1232 builtin/commit.c:1464
+#: builtin/commit.c:1268 builtin/commit.c:1525
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
-#: builtin/fast-export.c:670 builtin/tag.c:459
+#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674
+#: builtin/fast-export.c:677 builtin/tag.c:514
msgid "mode"
msgstr ""
-#: builtin/commit.c:1235 builtin/commit.c:1467
+#: builtin/commit.c:1271 builtin/commit.c:1528
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1238
+#: builtin/commit.c:1274
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1239 parse-options.h:154
+#: builtin/commit.c:1275 parse-options.h:153
msgid "when"
msgstr ""
-#: builtin/commit.c:1240
+#: builtin/commit.c:1276
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1242
+#: builtin/commit.c:1278
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1313
+#: builtin/commit.c:1347
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1315
+#: builtin/commit.c:1349
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1356
+#: builtin/commit.c:1390
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1358
+#: builtin/commit.c:1392
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1425
+#: builtin/commit.c:1486
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1426
+#: builtin/commit.c:1487
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1428
+#: builtin/commit.c:1489
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1429 builtin/tag.c:457
+#: builtin/commit.c:1490 builtin/tag.c:512
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1430
+#: builtin/commit.c:1491
msgid "author"
msgstr ""
-#: builtin/commit.c:1430
+#: builtin/commit.c:1491
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1431 builtin/gc.c:178
+#: builtin/commit.c:1492 builtin/gc.c:272
msgid "date"
msgstr ""
-#: builtin/commit.c:1431
+#: builtin/commit.c:1492
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
-#: builtin/notes.c:562 builtin/tag.c:455
+#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409
+#: builtin/notes.c:566 builtin/tag.c:510
msgid "message"
msgstr ""
-#: builtin/commit.c:1432
+#: builtin/commit.c:1493
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1433
+#: builtin/commit.c:1494
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1434
+#: builtin/commit.c:1495
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1435
+#: builtin/commit.c:1496
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1436
+#: builtin/commit.c:1497
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1437
+#: builtin/commit.c:1498
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
+#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1439
+#: builtin/commit.c:1500
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1440
+#: builtin/commit.c:1501
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1441
+#: builtin/commit.c:1502
msgid "default"
msgstr ""
-#: builtin/commit.c:1441 builtin/tag.c:460
+#: builtin/commit.c:1502 builtin/tag.c:515
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1442
+#: builtin/commit.c:1503
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
-msgid "key id"
+#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92
+#: builtin/tag.c:516
+msgid "key-id"
msgstr ""
-#: builtin/commit.c:1444 builtin/merge.c:231
+#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93
msgid "GPG sign commit"
msgstr ""
-#. end commit message options
-#: builtin/commit.c:1447
+#: builtin/commit.c:1508
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1448
+#: builtin/commit.c:1509
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1449
+#: builtin/commit.c:1510
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1450
+#: builtin/commit.c:1511
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1451
+#: builtin/commit.c:1512
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1452
+#: builtin/commit.c:1513
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1453
+#: builtin/commit.c:1514
msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/commit.c:1454
+#: builtin/commit.c:1515
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1465
+#: builtin/commit.c:1526
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1466
+#: builtin/commit.c:1527
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1471
+#: builtin/commit.c:1532
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1474
+#: builtin/commit.c:1534
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1507
+#: builtin/commit.c:1562
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1545 builtin/merge.c:525
+#: builtin/commit.c:1601 builtin/merge.c:518
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1552
+#: builtin/commit.c:1608
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1559
+#: builtin/commit.c:1615
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1578
+#: builtin/commit.c:1634
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1645
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1650
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
+#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1686
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:1637
+#: builtin/commit.c:1690
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1648
+#: builtin/commit.c:1701
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-#: builtin/config.c:7
+#: builtin/config.c:8
msgid "git config [options]"
msgstr ""
-#: builtin/config.c:52
+#: builtin/config.c:53
msgid "Config file location"
msgstr ""
-#: builtin/config.c:53
+#: builtin/config.c:54
msgid "use global config file"
msgstr ""
-#: builtin/config.c:54
+#: builtin/config.c:55
msgid "use system config file"
msgstr ""
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use given config file"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "blob-id"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "Action"
msgstr ""
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/config.c:62
+#: builtin/config.c:63
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
+
+#: builtin/config.c:64
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/config.c:63
+#: builtin/config.c:65
msgid "add a new variable: name value"
msgstr ""
-#: builtin/config.c:64
+#: builtin/config.c:66
msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/config.c:65
+#: builtin/config.c:67
msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/config.c:66
+#: builtin/config.c:68
msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/config.c:67
+#: builtin/config.c:69
msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:68
+#: builtin/config.c:70
msgid "list all"
msgstr ""
-#: builtin/config.c:69
+#: builtin/config.c:71
msgid "open an editor"
msgstr ""
-#: builtin/config.c:70 builtin/config.c:71
+#: builtin/config.c:72 builtin/config.c:73
msgid "slot"
msgstr ""
-#: builtin/config.c:70
+#: builtin/config.c:72
msgid "find the color configured: [default]"
msgstr ""
-#: builtin/config.c:71
+#: builtin/config.c:73
msgid "find the color setting: [stdout-is-tty]"
msgstr ""
-#: builtin/config.c:72
+#: builtin/config.c:74
msgid "Type"
msgstr ""
-#: builtin/config.c:73
+#: builtin/config.c:75
msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/config.c:74
+#: builtin/config.c:76
msgid "value is decimal number"
msgstr ""
-#: builtin/config.c:75
+#: builtin/config.c:77
msgid "value is --bool or --int"
msgstr ""
-#: builtin/config.c:76
+#: builtin/config.c:78
msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/config.c:77
+#: builtin/config.c:79
msgid "Other"
msgstr ""
-#: builtin/config.c:78
+#: builtin/config.c:80
msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/config.c:79
+#: builtin/config.c:81
msgid "respect include directives on lookup"
msgstr ""
msgstr ""
#: builtin/describe.c:16
-msgid "git describe [options] <committish>*"
+msgid "git describe [options] <commit-ish>*"
msgstr ""
#: builtin/describe.c:17
msgid "git describe [options] --dirty"
msgstr ""
-#: builtin/describe.c:237
+#: builtin/describe.c:225
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:241
+#: builtin/describe.c:229
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/describe.c:243
+#: builtin/describe.c:231
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:270
+#: builtin/describe.c:258
#, c-format
msgid "Not a valid object name %s"
msgstr ""
-#: builtin/describe.c:273
+#: builtin/describe.c:261
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/describe.c:290
+#: builtin/describe.c:278
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:292
+#: builtin/describe.c:280
#, c-format
msgid "searching to describe %s\n"
msgstr ""
-#: builtin/describe.c:332
+#: builtin/describe.c:327
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:359
+#: builtin/describe.c:354
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/describe.c:363
+#: builtin/describe.c:358
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:384
+#: builtin/describe.c:379
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:387
+#: builtin/describe.c:382
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-#: builtin/describe.c:409
+#: builtin/describe.c:404
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:410
+#: builtin/describe.c:405
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:411
+#: builtin/describe.c:406
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:412
+#: builtin/describe.c:407
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:413
+#: builtin/describe.c:408
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:414
+#: builtin/describe.c:409
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:417
+#: builtin/describe.c:412
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:419
+#: builtin/describe.c:414
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:421
+#: builtin/describe.c:416
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:423 builtin/name-rev.c:322
+#: builtin/describe.c:418 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:424
+#: builtin/describe.c:419
msgid "mark"
msgstr ""
-#: builtin/describe.c:425
+#: builtin/describe.c:420
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:443
+#: builtin/describe.c:438
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:469
+#: builtin/describe.c:464
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:489
-msgid "--dirty is incompatible with committishes"
+#: builtin/describe.c:484
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/diff.c:79
+#: builtin/diff.c:85
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/diff.c:230
+#: builtin/diff.c:236
#, c-format
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:307
+#: builtin/diff.c:357
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:350
+#: builtin/diff.c:400
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:359
+#: builtin/diff.c:409
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:366
+#: builtin/diff.c:416
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:666
+#: builtin/fast-export.c:673
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:668
+#: builtin/fast-export.c:675
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:671
+#: builtin/fast-export.c:678
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:674
+#: builtin/fast-export.c:681
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:676
+#: builtin/fast-export.c:683
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:685
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:680
+#: builtin/fast-export.c:687
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:682
+#: builtin/fast-export.c:689
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:690
msgid "Skip output of blob data"
msgstr ""
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:60
+#: builtin/fetch.c:75
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:62
+#: builtin/fetch.c:77
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:64
+#: builtin/fetch.c:79
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:65
+#: builtin/fetch.c:80
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:67
+#: builtin/fetch.c:82
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:69
+#: builtin/fetch.c:84
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:71
+#: builtin/fetch.c:86
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:73
+#: builtin/fetch.c:88
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:74
+#: builtin/fetch.c:89
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:75
+#: builtin/fetch.c:90
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:79
+#: builtin/fetch.c:94
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:81
+#: builtin/fetch.c:96
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:84
+#: builtin/fetch.c:99
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:86
+#: builtin/fetch.c:101
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:88 builtin/log.c:1177
+#: builtin/fetch.c:103 builtin/log.c:1197
msgid "dir"
msgstr ""
-#: builtin/fetch.c:89
+#: builtin/fetch.c:104
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:92
+#: builtin/fetch.c:107
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:220
+#: builtin/fetch.c:109
+msgid "accept refs that update .git/shallow"
+msgstr ""
+
+#: builtin/fetch.c:347
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:273
+#: builtin/fetch.c:411
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:278
+#: builtin/fetch.c:416
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:292
+#: builtin/fetch.c:430
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/fetch.c:293 builtin/fetch.c:379
+#: builtin/fetch.c:431 builtin/fetch.c:517
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:304
+#: builtin/fetch.c:442
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
+#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497
msgid " (unable to update local ref)"
msgstr ""
-#: builtin/fetch.c:324
+#: builtin/fetch.c:462
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:327
+#: builtin/fetch.c:465
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:330
+#: builtin/fetch.c:468
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:375
+#: builtin/fetch.c:513
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:375
+#: builtin/fetch.c:513
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:381
+#: builtin/fetch.c:519
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:412 builtin/fetch.c:718
+#: builtin/fetch.c:552 builtin/fetch.c:785
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: builtin/fetch.c:421
+#: builtin/fetch.c:561
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:520
+#: builtin/fetch.c:579
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr ""
+
+#: builtin/fetch.c:667 builtin/fetch.c:750
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:531
+#: builtin/fetch.c:678
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:581
+#: builtin/fetch.c:730
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:582
+#: builtin/fetch.c:731
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:589
+#: builtin/fetch.c:755
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:590 builtin/remote.c:1055
+#: builtin/fetch.c:756 builtin/remote.c:1050
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:708
+#: builtin/fetch.c:775
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:742
+#: builtin/fetch.c:794
#, c-format
-msgid "Don't know how to fetch from %s"
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:823
+#: builtin/fetch.c:797
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:826
+#: builtin/fetch.c:853
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:928
+#: builtin/fetch.c:1015
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:930 builtin/remote.c:100
+#: builtin/fetch.c:1017 builtin/remote.c:90
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:949
+#: builtin/fetch.c:1035
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:969
+#: builtin/fetch.c:1059
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1107
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1017
+#: builtin/fetch.c:1109
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1036
+#: builtin/fetch.c:1132
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1038
+#: builtin/fetch.c:1134
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1049
+#: builtin/fetch.c:1145
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1057
+#: builtin/fetch.c:1153
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
msgstr ""
#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
-#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
+#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179
+#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501
+#: parse-options.h:132 parse-options.h:239
msgid "n"
msgstr ""
msgid "file to read from"
msgstr ""
-#: builtin/for-each-ref.c:979
+#: builtin/for-each-ref.c:1063
msgid "git for-each-ref [options] [<pattern>]"
msgstr ""
-#: builtin/for-each-ref.c:994
+#: builtin/for-each-ref.c:1078
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:996
+#: builtin/for-each-ref.c:1080
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:998
+#: builtin/for-each-ref.c:1082
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:1000
+#: builtin/for-each-ref.c:1084
msgid "quote placeholders suitably for tcl"
msgstr ""
-#: builtin/for-each-ref.c:1003
+#: builtin/for-each-ref.c:1087
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1088 builtin/replace.c:177
msgid "format"
msgstr ""
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1088
msgid "format to use for the output"
msgstr ""
-#: builtin/for-each-ref.c:1005
+#: builtin/for-each-ref.c:1089
msgid "key"
msgstr ""
-#: builtin/for-each-ref.c:1006
+#: builtin/for-each-ref.c:1090
msgid "field name to sort on"
msgstr ""
-#: builtin/fsck.c:608
+#: builtin/fsck.c:147 builtin/prune.c:172
+msgid "Checking connectivity"
+msgstr ""
+
+#: builtin/fsck.c:544
+msgid "Checking object directories"
+msgstr ""
+
+#: builtin/fsck.c:607
msgid "git fsck [options] [<object>...]"
msgstr ""
-#: builtin/fsck.c:614
+#: builtin/fsck.c:613
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:615
+#: builtin/fsck.c:614
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:616
+#: builtin/fsck.c:615
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:617
+#: builtin/fsck.c:616
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:618
+#: builtin/fsck.c:617
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:619
+#: builtin/fsck.c:618
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:620
+#: builtin/fsck.c:619
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:621
+#: builtin/fsck.c:620
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:623
+#: builtin/fsck.c:622
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:624 builtin/prune.c:134
+#: builtin/fsck.c:623 builtin/prune.c:144
msgid "show progress"
msgstr ""
-#: builtin/gc.c:22
+#: builtin/fsck.c:673
+msgid "Checking objects"
+msgstr ""
+
+#: builtin/gc.c:24
msgid "git gc [options]"
msgstr ""
-#: builtin/gc.c:63
+#: builtin/gc.c:90
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: builtin/gc.c:90
+#: builtin/gc.c:117
#, c-format
msgid "insanely long object directory %.*s"
msgstr ""
-#: builtin/gc.c:179
+#: builtin/gc.c:273
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:181
+#: builtin/gc.c:275
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:182
+#: builtin/gc.c:276
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:222
+#: builtin/gc.c:277
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:318
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:320
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:321
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr ""
+
+#: builtin/gc.c:336
#, c-format
msgid ""
-"Auto packing the repository for optimum performance. You may also\n"
-"run \"git gc\" manually. See \"git help gc\" for more information.\n"
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:249
+#: builtin/gc.c:361
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/grep.c:22
+#: builtin/grep.c:23
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:217
+#: builtin/grep.c:218
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:364
+#: builtin/grep.c:365
#, c-format
msgid "Failed to chdir: %s"
msgstr ""
-#: builtin/grep.c:442 builtin/grep.c:477
+#: builtin/grep.c:443 builtin/grep.c:478
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:492
+#: builtin/grep.c:493
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:550
+#: builtin/grep.c:549
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:567
+#: builtin/grep.c:566
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: builtin/grep.c:642
+#: builtin/grep.c:640
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:644
+#: builtin/grep.c:642
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:646
+#: builtin/grep.c:644
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:648
+#: builtin/grep.c:646
msgid "search also in ignored files"
msgstr ""
-#: builtin/grep.c:651
+#: builtin/grep.c:649
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:653
+#: builtin/grep.c:651
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:655
+#: builtin/grep.c:653
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:657
+#: builtin/grep.c:655
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:659
+#: builtin/grep.c:657
msgid "don't match patterns in binary files"
msgstr ""
+#: builtin/grep.c:660
+msgid "process binary files with textconv filters"
+msgstr ""
+
#: builtin/grep.c:662
msgid "descend at most <depth> levels"
msgstr ""
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:743 builtin/show-ref.c:188
+#: builtin/grep.c:743 builtin/show-ref.c:187
msgid "show usage"
msgstr ""
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:865
+#: builtin/grep.c:868
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:888
+#: builtin/grep.c:891
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:893
+#: builtin/grep.c:896
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:896
+#: builtin/grep.c:899
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:904
+#: builtin/grep.c:907
msgid "both --cached and trees are given."
msgstr ""
msgid "git hash-object --stdin-paths < <list-of-paths>"
msgstr ""
-#: builtin/hash-object.c:72
+#: builtin/hash-object.c:72 builtin/tag.c:521
msgid "type"
msgstr ""
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:349
+#: builtin/help.c:353
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:366
+#: builtin/help.c:370
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:374
+#: builtin/help.c:378
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:420
+#: builtin/help.c:424
msgid "Defining attributes per path"
msgstr ""
-#: builtin/help.c:421
+#: builtin/help.c:425
msgid "A Git glossary"
msgstr ""
-#: builtin/help.c:422
+#: builtin/help.c:426
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: builtin/help.c:423
+#: builtin/help.c:427
msgid "Defining submodule properties"
msgstr ""
-#: builtin/help.c:424
+#: builtin/help.c:428
msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: builtin/help.c:425
+#: builtin/help.c:429
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
-#: builtin/help.c:426
+#: builtin/help.c:430
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: builtin/help.c:438
+#: builtin/help.c:442
msgid "The common Git guides are:\n"
msgstr ""
-#: builtin/help.c:460 builtin/help.c:476
+#: builtin/help.c:463 builtin/help.c:480
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:492
+#: builtin/help.c:496
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:669 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
+#: builtin/index-pack.c:669 builtin/pack-objects.c:162
+#: builtin/pack-objects.c:254
#, c-format
msgid "unable to read %s"
msgstr ""
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:838 builtin/index-pack.c:868
+#: builtin/index-pack.c:839 builtin/index-pack.c:869
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1035
+#: builtin/index-pack.c:1036
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1040
+#: builtin/index-pack.c:1041
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1043
+#: builtin/index-pack.c:1044
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1054
+#: builtin/index-pack.c:1055
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1078
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1087
+#: builtin/index-pack.c:1088
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1129
+#: builtin/index-pack.c:1130
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1137
+#: builtin/index-pack.c:1138
#, c-format
msgid "completed with %d local objects"
msgstr ""
-#: builtin/index-pack.c:1147
+#: builtin/index-pack.c:1148
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1177
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1279
+#: builtin/index-pack.c:1280
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1293
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1313
+#: builtin/index-pack.c:1314
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1324
+#: builtin/index-pack.c:1325
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1358
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1363
+#: builtin/index-pack.c:1364
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
+#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1426
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1475
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1509
+#: builtin/index-pack.c:1510
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
-#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
+#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
+#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1590
+#: builtin/index-pack.c:1591
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
+#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1614
msgid "--verify with no packfile name given"
msgstr ""
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
-msgstr ""
-
-#.
-#. * TRANSLATORS: The first '%s' is either "Reinitialized
-#. * existing" or "Initialized empty", the second " shared" or
-#. * "", and the last '%s%s' is the verbatim directory name.
-#.
-#: builtin/init-db.c:420
+#. TRANSLATORS: The first '%s' is either "Reinitialized
+#. existing" or "Initialized empty", the second " shared" or
+#. "", and the last '%s%s' is the verbatim directory name.
+#: builtin/init-db.c:418
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:421
+#: builtin/init-db.c:419
msgid "Reinitialized existing"
msgstr ""
-#: builtin/init-db.c:421
+#: builtin/init-db.c:419
msgid "Initialized empty"
msgstr ""
-#: builtin/init-db.c:422
+#: builtin/init-db.c:420
msgid " shared"
msgstr ""
-#: builtin/init-db.c:441
+#: builtin/init-db.c:439
msgid "cannot tell cwd"
msgstr ""
-#: builtin/init-db.c:467
+#: builtin/init-db.c:465
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [directory]"
msgstr ""
-#: builtin/init-db.c:490
+#: builtin/init-db.c:488
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:491
+#: builtin/init-db.c:489
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:493 builtin/prune-packed.c:75
+#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168
msgid "be quiet"
msgstr ""
-#: builtin/init-db.c:522 builtin/init-db.c:529
+#: builtin/init-db.c:523 builtin/init-db.c:528
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:533
+#: builtin/init-db.c:532
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:555
+#: builtin/init-db.c:554
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:579
+#: builtin/init-db.c:578
msgid "Cannot access current working directory"
msgstr ""
-#: builtin/init-db.c:586
+#: builtin/init-db.c:585
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
msgid " or: git show [options] <object>..."
msgstr ""
-#: builtin/log.c:124
+#: builtin/log.c:125
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:125
+#: builtin/log.c:126
msgid "show source"
msgstr ""
-#: builtin/log.c:126
+#: builtin/log.c:127
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:127
+#: builtin/log.c:128
msgid "decorate options"
msgstr ""
-#: builtin/log.c:230
+#: builtin/log.c:231
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:453 builtin/log.c:545
+#: builtin/log.c:473 builtin/log.c:565
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:569
+#: builtin/log.c:589
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:669
+#: builtin/log.c:689
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:751
+#: builtin/log.c:771
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:767
+#: builtin/log.c:787
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:781
+#: builtin/log.c:801
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:789
+#: builtin/log.c:809
msgid "Not a range."
msgstr ""
-#: builtin/log.c:891
+#: builtin/log.c:911
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:967
+#: builtin/log.c:987
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:995
+#: builtin/log.c:1015
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr ""
-#: builtin/log.c:1040
+#: builtin/log.c:1060
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1155
+#: builtin/log.c:1175
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1158
+#: builtin/log.c:1178
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1162
+#: builtin/log.c:1182
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1164
+#: builtin/log.c:1184
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1166
+#: builtin/log.c:1186
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1167
+#: builtin/log.c:1187
msgid "sfx"
msgstr ""
-#: builtin/log.c:1168
+#: builtin/log.c:1188
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1170
+#: builtin/log.c:1190
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1172
+#: builtin/log.c:1192
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1174
+#: builtin/log.c:1194
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1177
+#: builtin/log.c:1197
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1180
+#: builtin/log.c:1200
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1183
+#: builtin/log.c:1203
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1185
+#: builtin/log.c:1205
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1187
+#: builtin/log.c:1207
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1189
+#: builtin/log.c:1209
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1190
+#: builtin/log.c:1210
msgid "header"
msgstr ""
-#: builtin/log.c:1191
+#: builtin/log.c:1211
msgid "add email header"
msgstr ""
-#: builtin/log.c:1192 builtin/log.c:1194
+#: builtin/log.c:1212 builtin/log.c:1214
msgid "email"
msgstr ""
-#: builtin/log.c:1192
+#: builtin/log.c:1212
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1194
+#: builtin/log.c:1214
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1196
+#: builtin/log.c:1216
msgid "ident"
msgstr ""
-#: builtin/log.c:1197
+#: builtin/log.c:1217
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1199
+#: builtin/log.c:1219
msgid "message-id"
msgstr ""
-#: builtin/log.c:1200
+#: builtin/log.c:1220
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1201 builtin/log.c:1204
+#: builtin/log.c:1221 builtin/log.c:1224
msgid "boundary"
msgstr ""
-#: builtin/log.c:1202
+#: builtin/log.c:1222
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1205
+#: builtin/log.c:1225
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1209
+#: builtin/log.c:1229
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1211
+#: builtin/log.c:1231
msgid "signature"
msgstr ""
-#: builtin/log.c:1212
+#: builtin/log.c:1232
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1214
+#: builtin/log.c:1233
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1288
+#: builtin/log.c:1307
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1303
+#: builtin/log.c:1322
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1305
+#: builtin/log.c:1324
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1313
+#: builtin/log.c:1332
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1315
+#: builtin/log.c:1334
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1317
+#: builtin/log.c:1336
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1340
+#: builtin/log.c:1359
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1342
+#: builtin/log.c:1361
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1490
+#: builtin/log.c:1509
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1539
+#: builtin/log.c:1558
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1594
+#: builtin/log.c:1613
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
+#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/ls-files.c:408
+#: builtin/ls-files.c:401
msgid "git ls-files [options] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:458
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:467
+#: builtin/ls-files.c:460
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:462
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:464
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:466
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:468
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:477
+#: builtin/ls-files.c:470
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:473
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:475
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:484
+#: builtin/ls-files.c:477
msgid "show 'other' directories' name only"
msgstr ""
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:480
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:483
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:492
+#: builtin/ls-files.c:485
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:494
+#: builtin/ls-files.c:487
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:497
+#: builtin/ls-files.c:490
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:493
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:502
+#: builtin/ls-files.c:495
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:505
+#: builtin/ls-files.c:498
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:508
+#: builtin/ls-files.c:501
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:502
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:503
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:512
+#: builtin/ls-files.c:505
msgid "show debugging data"
msgstr ""
-#: builtin/ls-tree.c:27
+#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/ls-tree.c:125
+#: builtin/ls-tree.c:126
msgid "only show trees"
msgstr ""
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "recurse into subtrees"
msgstr ""
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "show trees when recursing"
msgstr ""
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:133
msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
msgid "include object size"
msgstr ""
-#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
msgid "list only filenames"
msgstr ""
-#: builtin/ls-tree.c:140
+#: builtin/ls-tree.c:141
msgid "use full path names"
msgstr ""
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:198
+#: builtin/merge.c:191
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:201
+#: builtin/merge.c:194
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:202
+#: builtin/merge.c:195
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:204
+#: builtin/merge.c:197
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:207
+#: builtin/merge.c:200
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:209
+#: builtin/merge.c:202
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:211
+#: builtin/merge.c:204
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:212
+#: builtin/merge.c:205
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:214
+#: builtin/merge.c:207
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:218
+#: builtin/merge.c:211
msgid "Verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
+#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
msgid "strategy"
msgstr ""
-#: builtin/merge.c:220
+#: builtin/merge.c:213
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:221
+#: builtin/merge.c:214
msgid "option=value"
msgstr ""
-#: builtin/merge.c:222
+#: builtin/merge.c:215
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:224
+#: builtin/merge.c:217
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:228
+#: builtin/merge.c:221
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:257
+#: builtin/merge.c:250
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:262
+#: builtin/merge.c:255
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:267
+#: builtin/merge.c:260
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:286 builtin/merge.c:303
+#: builtin/merge.c:279 builtin/merge.c:296
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:333
+#: builtin/merge.c:326
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:346
+#: builtin/merge.c:339
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:378
+#: builtin/merge.c:371
msgid "Writing SQUASH_MSG"
msgstr ""
-#: builtin/merge.c:380
+#: builtin/merge.c:373
msgid "Finishing SQUASH_MSG"
msgstr ""
-#: builtin/merge.c:403
+#: builtin/merge.c:396
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:453
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:565
+#: builtin/merge.c:558
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:657
+#: builtin/merge.c:653
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/merge.c:685
+#: builtin/merge.c:681
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:699
+#: builtin/merge.c:695
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:713
+#: builtin/merge.c:709
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:811
+#: builtin/merge.c:807
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:817
+#: builtin/merge.c:813
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:841
+#: builtin/merge.c:837
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:853
+#: builtin/merge.c:849
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:918
+#: builtin/merge.c:914
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:934
+#: builtin/merge.c:930
#, c-format
msgid "'%s' is not a commit"
msgstr ""
-#: builtin/merge.c:975
+#: builtin/merge.c:971
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:977
+#: builtin/merge.c:973
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:979
+#: builtin/merge.c:975
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:984
+#: builtin/merge.c:980
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1140
+#: builtin/merge.c:1136
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1156 git-pull.sh:31
+#: builtin/merge.c:1152 git-pull.sh:31
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
-#: builtin/merge.c:1159 git-pull.sh:34
+#: builtin/merge.c:1155 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1163
+#: builtin/merge.c:1159
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
-#: builtin/merge.c:1166
+#: builtin/merge.c:1162
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1175
+#: builtin/merge.c:1171
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1184
+#: builtin/merge.c:1180
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1216
+#: builtin/merge.c:1212
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1219
+#: builtin/merge.c:1215
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1221
+#: builtin/merge.c:1217
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1226
+#: builtin/merge.c:1222
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1277
+#: builtin/merge.c:1273
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1280
+#: builtin/merge.c:1276
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#. 'N'
-#: builtin/merge.c:1283
+#: builtin/merge.c:1279
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1286
+#: builtin/merge.c:1282
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/merge.c:1370
+#: builtin/merge.c:1366
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1409
+#: builtin/merge.c:1405
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1416
+#: builtin/merge.c:1412
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1448
+#: builtin/merge.c:1444
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1471 builtin/merge.c:1550
+#: builtin/merge.c:1467 builtin/merge.c:1546
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1475
+#: builtin/merge.c:1471
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1541
+#: builtin/merge.c:1537
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1543
+#: builtin/merge.c:1539
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1552
+#: builtin/merge.c:1548
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1564
+#: builtin/merge.c:1560
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-#: builtin/merge-base.c:26
+#: builtin/merge-base.c:29
msgid "git merge-base [-a|--all] <commit> <commit>..."
msgstr ""
-#: builtin/merge-base.c:27
+#: builtin/merge-base.c:30
msgid "git merge-base [-a|--all] --octopus <commit>..."
msgstr ""
-#: builtin/merge-base.c:28
+#: builtin/merge-base.c:31
msgid "git merge-base --independent <commit>..."
msgstr ""
-#: builtin/merge-base.c:29
+#: builtin/merge-base.c:32
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr ""
-#: builtin/merge-base.c:98
+#: builtin/merge-base.c:33
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr ""
+
+#: builtin/merge-base.c:214
msgid "output all common ancestors"
msgstr ""
-#: builtin/merge-base.c:99
+#: builtin/merge-base.c:216
msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/merge-base.c:100
+#: builtin/merge-base.c:218
msgid "list revs not reachable from others"
msgstr ""
-#: builtin/merge-base.c:102
+#: builtin/merge-base.c:220
msgid "is the first one ancestor of the other?"
msgstr ""
+#: builtin/merge-base.c:222
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+
#: builtin/merge-file.c:8
msgid ""
"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
msgid "set labels for file1/orig_file/file2"
msgstr ""
-#: builtin/mktree.c:67
+#: builtin/mktree.c:64
msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
-#: builtin/mktree.c:153
+#: builtin/mktree.c:150
msgid "input is NUL terminated"
msgstr ""
-#: builtin/mktree.c:154 builtin/write-tree.c:24
+#: builtin/mktree.c:151 builtin/write-tree.c:24
msgid "allow missing objects"
msgstr ""
-#: builtin/mktree.c:155
+#: builtin/mktree.c:152
msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/mv.c:14
+#: builtin/mv.c:15
msgid "git mv [options] <source>... <destination>"
msgstr ""
-#: builtin/mv.c:64
+#: builtin/mv.c:71
msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/mv.c:65
+#: builtin/mv.c:72
msgid "skip move/rename errors"
msgstr ""
-#: builtin/mv.c:108
+#: builtin/mv.c:122
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/mv.c:112
+#: builtin/mv.c:126
msgid "bad source"
msgstr ""
-#: builtin/mv.c:115
+#: builtin/mv.c:129
msgid "can not move directory into itself"
msgstr ""
-#: builtin/mv.c:118
+#: builtin/mv.c:132
msgid "cannot move directory over file"
msgstr ""
-#: builtin/mv.c:128
+#: builtin/mv.c:138
+#, c-format
+msgid "Huh? Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:140 builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:156
#, c-format
msgid "Huh? %.*s is in index?"
msgstr ""
-#: builtin/mv.c:140
+#: builtin/mv.c:169
msgid "source directory is empty"
msgstr ""
-#: builtin/mv.c:171
+#: builtin/mv.c:205
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:173
+#: builtin/mv.c:207
msgid "destination exists"
msgstr ""
-#: builtin/mv.c:181
+#: builtin/mv.c:215
#, c-format
msgid "overwriting '%s'"
msgstr ""
-#: builtin/mv.c:184
+#: builtin/mv.c:218
msgid "Cannot overwrite"
msgstr ""
-#: builtin/mv.c:187
+#: builtin/mv.c:221
msgid "multiple sources for the same target"
msgstr ""
-#: builtin/mv.c:202
+#: builtin/mv.c:223
+msgid "destination directory does not exist"
+msgstr ""
+
+#: builtin/mv.c:243
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/mv.c:212
+#: builtin/mv.c:253
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [options] <commit>..."
msgstr ""
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [options] --all"
msgstr ""
-#: builtin/name-rev.c:261
+#: builtin/name-rev.c:260
msgid "git name-rev [options] --stdin"
msgstr ""
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:320
-msgid "allow to print `undefined` names"
+#: builtin/name-rev.c:319
+msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:326
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr ""
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:167 builtin/tag.c:341
+#: builtin/notes.c:167 builtin/tag.c:373
#, c-format
msgid "could not create file '%s'"
msgstr ""
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:207 builtin/notes.c:844
+#: builtin/notes.c:207 builtin/notes.c:848
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
msgid "The note contents has been left in %s"
msgstr ""
-#: builtin/notes.c:248 builtin/tag.c:540
+#: builtin/notes.c:248 builtin/tag.c:604
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:250 builtin/tag.c:543
+#: builtin/notes.c:250 builtin/tag.c:607
#, c-format
msgid "could not open or read '%s'"
msgstr ""
-#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
-#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
-#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
-#: builtin/notes.c:839 builtin/tag.c:556
+#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
+#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
+#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
+#: builtin/notes.c:843 builtin/tag.c:620
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
msgid "Failed to read object '%s'."
msgstr ""
-#: builtin/notes.c:312
+#: builtin/notes.c:276
+#, c-format
+msgid "Cannot read note data from non-blob object '%s'."
+msgstr ""
+
+#: builtin/notes.c:316
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/notes.c:327
+#: builtin/notes.c:331
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
-#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
-#: builtin/notes.c:904
+#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
+#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
+#: builtin/notes.c:908
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:384 builtin/notes.c:643
+#: builtin/notes.c:388 builtin/notes.c:647
#, c-format
msgid "No note found for object %s."
msgstr ""
-#: builtin/notes.c:406 builtin/notes.c:563
+#: builtin/notes.c:410 builtin/notes.c:567
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:566
+#: builtin/notes.c:413 builtin/notes.c:570
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
-#: builtin/notes.c:571 builtin/tag.c:474
+#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
+#: builtin/notes.c:575 builtin/tag.c:539
msgid "object"
msgstr ""
-#: builtin/notes.c:412 builtin/notes.c:569
+#: builtin/notes.c:416 builtin/notes.c:573
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:572
+#: builtin/notes.c:419 builtin/notes.c:576
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:417 builtin/notes.c:485
+#: builtin/notes.c:421 builtin/notes.c:489
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:451
+#: builtin/notes.c:455
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:456 builtin/notes.c:533
+#: builtin/notes.c:460 builtin/notes.c:537
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:486
+#: builtin/notes.c:490
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:488
+#: builtin/notes.c:492
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:506
+#: builtin/notes.c:510
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:527
+#: builtin/notes.c:531
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:539
+#: builtin/notes.c:543
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:588
+#: builtin/notes.c:592
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:735
+#: builtin/notes.c:739
msgid "General options"
msgstr ""
-#: builtin/notes.c:737
+#: builtin/notes.c:741
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:739
+#: builtin/notes.c:743
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:741
+#: builtin/notes.c:745
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:743
+#: builtin/notes.c:747
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:745
+#: builtin/notes.c:749
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:747
+#: builtin/notes.c:751
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:842
+#: builtin/notes.c:846
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:854
+#: builtin/notes.c:858
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:857
+#: builtin/notes.c:861
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:938
-msgid "notes_ref"
+#: builtin/notes.c:942
+msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:939
+#: builtin/notes.c:943
msgid "use notes from <notes_ref>"
msgstr ""
-#: builtin/notes.c:974 builtin/remote.c:1598
+#: builtin/notes.c:978 builtin/remote.c:1593
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:23
+#: builtin/pack-objects.c:25
msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
msgstr ""
-#: builtin/pack-objects.c:24
+#: builtin/pack-objects.c:26
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr ""
-#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:2397
+#: builtin/pack-objects.c:771
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1012
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2174
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2530
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2401
+#: builtin/pack-objects.c:2534
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2424
+#: builtin/pack-objects.c:2557
#, c-format
msgid "option %s does not accept negative form"
msgstr ""
-#: builtin/pack-objects.c:2428
+#: builtin/pack-objects.c:2561
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr ""
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c:2580
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2449
+#: builtin/pack-objects.c:2582
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2584
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2454
+#: builtin/pack-objects.c:2587
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2455
+#: builtin/pack-objects.c:2588
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2589
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2459
+#: builtin/pack-objects.c:2592
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2461
+#: builtin/pack-objects.c:2594
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2463
+#: builtin/pack-objects.c:2596
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2465
+#: builtin/pack-objects.c:2598
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2467
+#: builtin/pack-objects.c:2600
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2469
+#: builtin/pack-objects.c:2602
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2471
+#: builtin/pack-objects.c:2604
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2473
+#: builtin/pack-objects.c:2606
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2475
+#: builtin/pack-objects.c:2608
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2477
+#: builtin/pack-objects.c:2610
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2479
+#: builtin/pack-objects.c:2612
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2481
+#: builtin/pack-objects.c:2614
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2483
+#: builtin/pack-objects.c:2616
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2486
+#: builtin/pack-objects.c:2619
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2489
+#: builtin/pack-objects.c:2622
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2492
+#: builtin/pack-objects.c:2625
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2494
+#: builtin/pack-objects.c:2627
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2496
+#: builtin/pack-objects.c:2629
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2497 parse-options.h:141
+#: builtin/pack-objects.c:2630 parse-options.h:140
msgid "time"
msgstr ""
-#: builtin/pack-objects.c:2498
+#: builtin/pack-objects.c:2631
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2501
+#: builtin/pack-objects.c:2634
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2503
+#: builtin/pack-objects.c:2636
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2505
+#: builtin/pack-objects.c:2638
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2507
+#: builtin/pack-objects.c:2640
msgid "do not hide commits by grafts"
msgstr ""
+#: builtin/pack-objects.c:2642
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2644
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2723
+msgid "Counting objects"
+msgstr ""
+
#: builtin/pack-refs.c:6
msgid "git pack-refs [options]"
msgstr ""
msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
msgstr ""
+#: builtin/prune-packed.c:49
+msgid "Removing duplicate objects"
+msgstr ""
+
#: builtin/prune.c:12
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:132
+#: builtin/prune.c:142
msgid "do not remove, show only"
msgstr ""
-#: builtin/prune.c:133
+#: builtin/prune.c:143
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:136
+#: builtin/prune.c:146
msgid "expire objects older than <time>"
msgstr ""
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/push.c:45
+#: builtin/push.c:85
msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/push.c:64
+#: builtin/push.c:95
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:99
+#: builtin/push.c:140
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:102
+#: builtin/push.c:143
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
"%s"
msgstr ""
-#: builtin/push.c:117
+#: builtin/push.c:158
#, c-format
msgid ""
"You are not currently on a branch.\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:131
+#: builtin/push.c:172
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:139
+#: builtin/push.c:180
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:142
+#: builtin/push.c:183
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"to update which remote branch."
msgstr ""
-#: builtin/push.c:165
+#: builtin/push.c:206
msgid ""
-"push.default is unset; its implicit value is changing in\n"
+"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-"and maintain the current behavior after the default changes, use:\n"
+"and maintain the traditional behavior, use:\n"
"\n"
" git config --global push.default matching\n"
"\n"
"\n"
" git config --global push.default simple\n"
"\n"
+"When push.default is set to 'matching', git will push local branches\n"
+"to the remote branches that already exist with the same name.\n"
+"\n"
+"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
+"behavior, which only pushes the current branch to the corresponding\n"
+"remote branch that 'git pull' uses to update the current branch.\n"
+"\n"
"See 'git help config' and search for 'push.default' for further "
"information.\n"
"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr ""
-#: builtin/push.c:225
+#: builtin/push.c:273
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:232
+#: builtin/push.c:280
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:238
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. If you did not intend to push that branch, you may want to\n"
-"specify branches to push or set the 'push.default' configuration variable\n"
-"to 'simple', 'current' or 'upstream' to push only the current branch."
-msgstr ""
-
-#: builtin/push.c:244
+#: builtin/push.c:286
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:250
+#: builtin/push.c:292
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:257
+#: builtin/push.c:299
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:260
+#: builtin/push.c:302
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
-#: builtin/push.c:320
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:324
+#: builtin/push.c:365
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:357
+#: builtin/push.c:395
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:358
+#: builtin/push.c:396
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
" git push <name>\n"
msgstr ""
-#: builtin/push.c:373
+#: builtin/push.c:411
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:374
+#: builtin/push.c:412
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:379
+#: builtin/push.c:417
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:380
+#: builtin/push.c:418
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:385
+#: builtin/push.c:423
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:445
+#: builtin/push.c:483
msgid "repository"
msgstr ""
-#: builtin/push.c:446
+#: builtin/push.c:484
msgid "push all refs"
msgstr ""
-#: builtin/push.c:447
+#: builtin/push.c:485
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:449
+#: builtin/push.c:487
msgid "delete refs"
msgstr ""
-#: builtin/push.c:450
+#: builtin/push.c:488
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:453
+#: builtin/push.c:491
msgid "force updates"
msgstr ""
-#: builtin/push.c:454
+#: builtin/push.c:493
+msgid "refname>:<expect"
+msgstr ""
+
+#: builtin/push.c:494
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:496
msgid "check"
msgstr ""
-#: builtin/push.c:455
+#: builtin/push.c:497
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:457
+#: builtin/push.c:499
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:458 builtin/push.c:459
+#: builtin/push.c:500 builtin/push.c:501
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:460
+#: builtin/push.c:502
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:463
+#: builtin/push.c:505
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:465
+#: builtin/push.c:507
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:466
+#: builtin/push.c:508
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:476
+#: builtin/push.c:518
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:478
+#: builtin/push.c:520
msgid "--delete doesn't make sense without any refs"
msgstr ""
msgid "debug unpack-trees"
msgstr ""
-#: builtin/reflog.c:500
+#: builtin/reflog.c:499
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr ""
-#: builtin/reflog.c:616 builtin/reflog.c:621
+#: builtin/reflog.c:615 builtin/reflog.c:620
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
-#: builtin/remote.c:11
+#: builtin/remote.c:12
msgid "git remote [-v | --verbose]"
msgstr ""
-#: builtin/remote.c:12
+#: builtin/remote.c:13
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
-#: builtin/remote.c:13 builtin/remote.c:32
+#: builtin/remote.c:14 builtin/remote.c:33
msgid "git remote rename <old> <new>"
msgstr ""
-#: builtin/remote.c:14 builtin/remote.c:37
+#: builtin/remote.c:15 builtin/remote.c:38
msgid "git remote remove <name>"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:42
-msgid "git remote set-head <name> (-a | -d | <branch>)"
+#: builtin/remote.c:16
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
msgstr ""
-#: builtin/remote.c:16
+#: builtin/remote.c:17
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr ""
-#: builtin/remote.c:17
+#: builtin/remote.c:18
msgid "git remote prune [-n | --dry-run] <name>"
msgstr ""
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
-#: builtin/remote.c:19
+#: builtin/remote.c:20
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
-#: builtin/remote.c:20 builtin/remote.c:68
+#: builtin/remote.c:21 builtin/remote.c:69
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:22 builtin/remote.c:70
msgid "git remote set-url --add <name> <newurl>"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:71
msgid "git remote set-url --delete <name> <url>"
msgstr ""
-#: builtin/remote.c:27
+#: builtin/remote.c:28
msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: builtin/remote.c:47
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/remote.c:43
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
#: builtin/remote.c:48
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:49
msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
-#: builtin/remote.c:53
+#: builtin/remote.c:54
msgid "git remote show [<options>] <name>"
msgstr ""
-#: builtin/remote.c:58
+#: builtin/remote.c:59
msgid "git remote prune [<options>] <name>"
msgstr ""
-#: builtin/remote.c:63
+#: builtin/remote.c:64
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: builtin/remote.c:98
+#: builtin/remote.c:88
#, c-format
msgid "Updating %s"
msgstr ""
-#: builtin/remote.c:130
+#: builtin/remote.c:120
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: builtin/remote.c:147
+#: builtin/remote.c:137
#, c-format
msgid "unknown mirror argument: %s"
msgstr ""
-#: builtin/remote.c:163
+#: builtin/remote.c:153
msgid "fetch the remote branches"
msgstr ""
-#: builtin/remote.c:165
+#: builtin/remote.c:155
msgid "import all tags and associated objects when fetching"
msgstr ""
-#: builtin/remote.c:168
+#: builtin/remote.c:158
msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
-#: builtin/remote.c:170
+#: builtin/remote.c:160
msgid "branch(es) to track"
msgstr ""
-#: builtin/remote.c:171
+#: builtin/remote.c:161
msgid "master branch"
msgstr ""
-#: builtin/remote.c:172
+#: builtin/remote.c:162
msgid "push|fetch"
msgstr ""
-#: builtin/remote.c:173
+#: builtin/remote.c:163
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
-#: builtin/remote.c:185
+#: builtin/remote.c:175
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
-#: builtin/remote.c:187
+#: builtin/remote.c:177
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:646
+#: builtin/remote.c:185 builtin/remote.c:641
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:199 builtin/remote.c:650
+#: builtin/remote.c:189 builtin/remote.c:645
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/remote.c:243
+#: builtin/remote.c:233
#, c-format
msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/remote.c:299
+#: builtin/remote.c:289
#, c-format
msgid "more than one %s"
msgstr ""
-#: builtin/remote.c:339
+#: builtin/remote.c:334
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/remote.c:440 builtin/remote.c:448
+#: builtin/remote.c:435 builtin/remote.c:443
msgid "(matching)"
msgstr ""
-#: builtin/remote.c:452
+#: builtin/remote.c:447
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
+#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
+#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885
#, c-format
msgid "No such remote: %s"
msgstr ""
-#: builtin/remote.c:656
+#: builtin/remote.c:651
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:662 builtin/remote.c:799
+#: builtin/remote.c:657 builtin/remote.c:794
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:677
+#: builtin/remote.c:672
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:683
+#: builtin/remote.c:678
#, c-format
msgid "Could not append '%s'"
msgstr ""
-#: builtin/remote.c:694
+#: builtin/remote.c:689
#, c-format
msgid "Could not set '%s'"
msgstr ""
-#: builtin/remote.c:716
+#: builtin/remote.c:711
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:750
+#: builtin/remote.c:745
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:764
+#: builtin/remote.c:759
#, c-format
msgid "Could not remove branch %s"
msgstr ""
-#: builtin/remote.c:834
+#: builtin/remote.c:829
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:943
+#: builtin/remote.c:938
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:946
+#: builtin/remote.c:941
msgid " tracked"
msgstr ""
-#: builtin/remote.c:948
+#: builtin/remote.c:943
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:950
+#: builtin/remote.c:945
msgid " ???"
msgstr ""
-#: builtin/remote.c:991
+#: builtin/remote.c:986
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:998
+#: builtin/remote.c:993
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:1001
+#: builtin/remote.c:996
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:1002
+#: builtin/remote.c:997
msgid " and with remote"
msgstr ""
-#: builtin/remote.c:1004
+#: builtin/remote.c:999
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:1005
+#: builtin/remote.c:1000
msgid " and with remote"
msgstr ""
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
msgid "create"
msgstr ""
-#: builtin/remote.c:1054
+#: builtin/remote.c:1049
msgid "delete"
msgstr ""
-#: builtin/remote.c:1058
+#: builtin/remote.c:1053
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1061
+#: builtin/remote.c:1056
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1064
+#: builtin/remote.c:1059
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1071
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1074
+#: builtin/remote.c:1069
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1078
+#: builtin/remote.c:1073
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1081
+#: builtin/remote.c:1076
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1091
+#: builtin/remote.c:1144
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1118
+#: builtin/remote.c:1171
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1119
+#: builtin/remote.c:1172
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1120 builtin/remote.c:1285
+#: builtin/remote.c:1173 builtin/remote.c:1318
msgid "(no URL)"
msgstr ""
-#: builtin/remote.c:1129 builtin/remote.c:1131
+#: builtin/remote.c:1182 builtin/remote.c:1184
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
+#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1139
+#: builtin/remote.c:1192
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1151
+#: builtin/remote.c:1204
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1154 builtin/remote.c:1181
+#: builtin/remote.c:1207 builtin/remote.c:1234
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1163
+#: builtin/remote.c:1216
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1171
+#: builtin/remote.c:1224
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1178
+#: builtin/remote.c:1231
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1199
+#: builtin/remote.c:1252
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1201
+#: builtin/remote.c:1254
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1216
+#: builtin/remote.c:1269
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1218
+#: builtin/remote.c:1271
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1228
+#: builtin/remote.c:1281
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1236
+#: builtin/remote.c:1289
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1238
+#: builtin/remote.c:1291
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1274
+#: builtin/remote.c:1307
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1275
+#: builtin/remote.c:1308
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1281
+#: builtin/remote.c:1314
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1282
+#: builtin/remote.c:1315
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1295
+#: builtin/remote.c:1328
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1298
+#: builtin/remote.c:1331
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1321
+#: builtin/remote.c:1374
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1387 builtin/remote.c:1461
+#: builtin/remote.c:1440 builtin/remote.c:1514
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1407
+#: builtin/remote.c:1460
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1414
+#: builtin/remote.c:1467
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1436
+#: builtin/remote.c:1489
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1438
+#: builtin/remote.c:1491
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1440
+#: builtin/remote.c:1493
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1447
+#: builtin/remote.c:1500
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1487
+#: builtin/remote.c:1540
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1495
+#: builtin/remote.c:1548
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1497
+#: builtin/remote.c:1550
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1569
+#: builtin/remote.c:1564
msgid "be verbose; must be placed before a subcommand"
msgstr ""
+#: builtin/repack.c:16
+msgid "git repack [options]"
+msgstr ""
+
+#: builtin/repack.c:156
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:158
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:161
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:163
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:165
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:167
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:170
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:172
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:173
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:174
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:176
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:177 builtin/repack.c:181
+msgid "bytes"
+msgstr ""
+
+#: builtin/repack.c:178
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:180
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:182
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:184
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:371
+#, c-format
+msgid "removing '%s' failed"
+msgstr ""
+
#: builtin/replace.c:17
msgid "git replace [-f] <object> <replacement>"
msgstr ""
msgstr ""
#: builtin/replace.c:19
-msgid "git replace -l [<pattern>]"
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/replace.c:121
+#: builtin/replace.c:174
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:122
+#: builtin/replace.c:175
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:123
+#: builtin/replace.c:176
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/rerere.c:11
+#: builtin/replace.c:177
+msgid "use this format"
+msgstr ""
+
+#: builtin/rerere.c:12
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/rerere.c:56
+#: builtin/rerere.c:57
msgid "register clean resolutions in index"
msgstr ""
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/reset.c:172
+#: builtin/reset.c:182
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:251
+#: builtin/reset.c:273
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:253
+#: builtin/reset.c:275
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:254
+#: builtin/reset.c:276
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:256 builtin/reset.c:258
+#: builtin/reset.c:278 builtin/reset.c:280
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:260
+#: builtin/reset.c:282
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:278
+#: builtin/reset.c:285
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+
+#: builtin/reset.c:302
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:281 builtin/reset.c:289
+#: builtin/reset.c:305 builtin/reset.c:313
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/reset.c:286
+#: builtin/reset.c:310
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:295
+#: builtin/reset.c:319
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:304
+#: builtin/reset.c:328
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:306
+#: builtin/reset.c:330
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:316
+#: builtin/reset.c:340
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:336
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/reset.c:344
+msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/reset.c:342
+#: builtin/reset.c:361
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:347
+#: builtin/reset.c:367
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr ""
+
+#: builtin/reset.c:372
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-parse.c:345
+#: builtin/rev-parse.c:359
msgid "git rev-parse --parseopt [options] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:350
+#: builtin/rev-parse.c:364
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:352
+#: builtin/rev-parse.c:366
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:470
+#: builtin/rev-parse.c:369
+msgid "output in stuck long form"
+msgstr ""
+
+#: builtin/rev-parse.c:497
msgid ""
"git rev-parse --parseopt [options] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/revert.c:71 builtin/revert.c:94
+#: builtin/revert.c:71
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/revert.c:105
+#: builtin/revert.c:80
msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:106
+#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:107
+#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:108
+#: builtin/revert.c:83
msgid "don't automatically commit"
msgstr ""
-#: builtin/revert.c:109
+#: builtin/revert.c:84
msgid "edit the commit message"
msgstr ""
-#: builtin/revert.c:112
+#: builtin/revert.c:87
msgid "parent number"
msgstr ""
-#: builtin/revert.c:114
+#: builtin/revert.c:89
msgid "merge strategy"
msgstr ""
-#: builtin/revert.c:115
+#: builtin/revert.c:90
msgid "option"
msgstr ""
-#: builtin/revert.c:116
+#: builtin/revert.c:91
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:127
+#: builtin/revert.c:104
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:128
+#: builtin/revert.c:105
msgid "allow fast-forward"
msgstr ""
-#: builtin/revert.c:129
+#: builtin/revert.c:106
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:130
+#: builtin/revert.c:107
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/revert.c:131
+#: builtin/revert.c:108
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:135
+#: builtin/revert.c:112
msgid "program error"
msgstr ""
-#: builtin/revert.c:225
+#: builtin/revert.c:197
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:240
+#: builtin/revert.c:212
msgid "cherry-pick failed"
msgstr ""
-#: builtin/rm.c:16
+#: builtin/rm.c:17
msgid "git rm [options] [--] <file>..."
msgstr ""
-#: builtin/rm.c:64
+#: builtin/rm.c:65
msgid ""
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:70
+#: builtin/rm.c:71
msgid ""
"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: builtin/rm.c:230
+#: builtin/rm.c:231
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:235
+#: builtin/rm.c:236
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
-#: builtin/rm.c:239
+#: builtin/rm.c:240
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:244 builtin/rm.c:255
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/rm.c:251
+#: builtin/rm.c:252
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:269
+#: builtin/rm.c:270
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:270
+#: builtin/rm.c:271
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:271
+#: builtin/rm.c:272
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:272
+#: builtin/rm.c:273
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:274
+#: builtin/rm.c:275
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:345
+#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:384
+#: builtin/rm.c:375
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
msgid "Missing author: %s"
msgstr ""
-#: builtin/shortlog.c:228
+#: builtin/shortlog.c:230
msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:232
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:234
msgid "Show the email address of each author"
msgstr ""
-#: builtin/shortlog.c:233
+#: builtin/shortlog.c:235
msgid "w[,i1[,i2]]"
msgstr ""
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:236
msgid "Linewrap output"
msgstr ""
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:679
+#: builtin/show-branch.c:678
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:680
+#: builtin/show-branch.c:679
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:173 builtin/show-ref.c:176
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:177
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:179
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:184
+#: builtin/show-ref.c:183
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:186
+#: builtin/show-ref.c:185
msgid "show refs from stdin that aren't in local repository"
msgstr ""
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
msgid "reason of the update"
msgstr ""
msgid "git tag -v <tagname>..."
msgstr ""
-#: builtin/tag.c:60
+#: builtin/tag.c:67
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: builtin/tag.c:207
+#: builtin/tag.c:239
#, c-format
msgid "tag name too long: %.*s..."
msgstr ""
-#: builtin/tag.c:212
+#: builtin/tag.c:244
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:227
+#: builtin/tag.c:259
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:239
+#: builtin/tag.c:271
#, c-format
msgid "could not verify the tag '%s'"
msgstr ""
-#: builtin/tag.c:249
+#: builtin/tag.c:281
#, c-format
msgid ""
"\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:253
+#: builtin/tag.c:285
#, c-format
msgid ""
"\n"
"want to.\n"
msgstr ""
-#: builtin/tag.c:292
+#: builtin/tag.c:324
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:294
+#: builtin/tag.c:326
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:319
+#: builtin/tag.c:351
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:332
+#: builtin/tag.c:364
msgid "tag header too big."
msgstr ""
-#: builtin/tag.c:368
+#: builtin/tag.c:400
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:374
+#: builtin/tag.c:406
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:423
+#: builtin/tag.c:455
msgid "switch 'points-at' requires an object"
msgstr ""
-#: builtin/tag.c:425
+#: builtin/tag.c:457
#, c-format
msgid "malformed object name '%s'"
msgstr ""
-#: builtin/tag.c:445
+#: builtin/tag.c:480
+#, c-format
+msgid "unsupported sort specification %s"
+msgstr ""
+
+#: builtin/tag.c:500
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:447
+#: builtin/tag.c:502
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:449
+#: builtin/tag.c:504
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:450
+#: builtin/tag.c:505
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:452
+#: builtin/tag.c:507
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:454
+#: builtin/tag.c:509
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:456
+#: builtin/tag.c:511
msgid "tag message"
msgstr ""
-#: builtin/tag.c:458
+#: builtin/tag.c:513
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:462
+#: builtin/tag.c:517
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:463
+#: builtin/tag.c:518
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:464
+#: builtin/tag.c:519
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:466
+#: builtin/tag.c:521
+msgid "sort tags"
+msgstr ""
+
+#: builtin/tag.c:525
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:469
+#: builtin/tag.c:528 builtin/tag.c:534
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:475
+#: builtin/tag.c:540
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:504
+#: builtin/tag.c:566
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:521
+#: builtin/tag.c:578
+msgid "--sort and -n are incompatible"
+msgstr ""
+
+#: builtin/tag.c:585
msgid "-n option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:523
+#: builtin/tag.c:587
msgid "--contains option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:525
+#: builtin/tag.c:589
msgid "--points-at option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:533
+#: builtin/tag.c:597
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:553
+#: builtin/tag.c:617
msgid "too many params"
msgstr ""
-#: builtin/tag.c:559
+#: builtin/tag.c:623
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:564
+#: builtin/tag.c:628
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:582
+#: builtin/tag.c:646
#, c-format
msgid "%s: cannot lock the ref"
msgstr ""
-#: builtin/tag.c:584
+#: builtin/tag.c:648
#, c-format
msgid "%s: cannot update the ref"
msgstr ""
-#: builtin/tag.c:586
+#: builtin/tag.c:650
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/update-index.c:401
+#: builtin/unpack-objects.c:483
+msgid "Unpacking objects"
+msgstr ""
+
+#: builtin/update-index.c:399
msgid "git update-index [options] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:718
+#: builtin/update-index.c:748
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:721
+#: builtin/update-index.c:751
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:724
+#: builtin/update-index.c:754
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:726
+#: builtin/update-index.c:756
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:728
+#: builtin/update-index.c:758
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:730
+#: builtin/update-index.c:760
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:733
+#: builtin/update-index.c:763
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:737
+#: builtin/update-index.c:767
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:741
-msgid "<mode>
<object> <path>"
+#: builtin/update-index.c:771
+msgid "<mode>
,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:742
+#: builtin/update-index.c:772
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:746
+#: builtin/update-index.c:776
msgid "(+/-)x"
msgstr ""
-#: builtin/update-index.c:747
+#: builtin/update-index.c:777
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/update-index.c:751
+#: builtin/update-index.c:781
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:754
+#: builtin/update-index.c:784
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:757
+#: builtin/update-index.c:787
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:760
+#: builtin/update-index.c:790
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:763
+#: builtin/update-index.c:793
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:765
+#: builtin/update-index.c:795
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:767
+#: builtin/update-index.c:797
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:769
+#: builtin/update-index.c:799
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:773
+#: builtin/update-index.c:803
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:777
+#: builtin/update-index.c:807
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:781
+#: builtin/update-index.c:811
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:785
+#: builtin/update-index.c:815
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:788
+#: builtin/update-index.c:818
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:790
+#: builtin/update-index.c:820
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:794
+#: builtin/update-index.c:824
msgid "write index in this format"
msgstr ""
-#: builtin/update-ref.c:7
+#: builtin/update-ref.c:9
msgid "git update-ref [options] -d <refname> [<oldval>]"
msgstr ""
-#: builtin/update-ref.c:8
+#: builtin/update-ref.c:10
msgid "git update-ref [options] <refname> <newval> [<oldval>]"
msgstr ""
-#: builtin/update-ref.c:19
+#: builtin/update-ref.c:11
+msgid "git update-ref [options] --stdin [-z]"
+msgstr ""
+
+#: builtin/update-ref.c:256
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:21
+#: builtin/update-ref.c:258
msgid "update <refname> not the one it points to"
msgstr ""
+#: builtin/update-ref.c:259
+msgid "stdin has NUL-terminated arguments"
+msgstr ""
+
+#: builtin/update-ref.c:260
+msgid "read updates from stdin"
+msgstr ""
+
#: builtin/update-server-info.c:6
msgid "git update-server-info [--force]"
msgstr ""
"to read about a specific subcommand or concept."
msgstr ""
-#: parse-options.h:144
-msgid "expiry date"
+#: parse-options.h:143
+msgid "expiry-date"
msgstr ""
-#: parse-options.h:159
+#: parse-options.h:158
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:236
+#: parse-options.h:232
msgid "be more verbose"
msgstr ""
-#: parse-options.h:238
+#: parse-options.h:234
msgid "be more quiet"
msgstr ""
-#: parse-options.h:244
+#: parse-options.h:240
msgid "use <n> digits to display SHA-1s"
msgstr ""
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: git-am.sh:50
+#: git-am.sh:52
msgid "You need to set your committer info first"
msgstr ""
-#: git-am.sh:95
+#: git-am.sh:97
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: git-am.sh:105
+#: git-am.sh:107
#, sh-format
msgid ""
"When you have resolved this problem, run \"$cmdline --continue\".\n"
"To restore the original branch and stop patching, run \"$cmdline --abort\"."
msgstr ""
-#: git-am.sh:121
+#: git-am.sh:123
msgid "Cannot fall back to three-way merge."
msgstr ""
-#: git-am.sh:137
+#: git-am.sh:139
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: git-am.sh:139
+#: git-am.sh:141
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: git-am.sh:154
+#: git-am.sh:156
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: git-am.sh:163
+#: git-am.sh:165
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: git-am.sh:179
+#: git-am.sh:181
msgid "Failed to merge in the changes."
msgstr ""
-#: git-am.sh:274
+#: git-am.sh:276
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: git-am.sh:361
+#: git-am.sh:363
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr ""
-#: git-am.sh:363
+#: git-am.sh:365
msgid "Patch format detection failed."
msgstr ""
-#: git-am.sh:389
+#: git-am.sh:392
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 ""
-#: git-am.sh:479
+#: git-am.sh:486
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr ""
-#: git-am.sh:484
+#: git-am.sh:491
msgid "Please make up your mind. --skip or --abort?"
msgstr ""
-#: git-am.sh:520
+#: git-am.sh:527
#, sh-format
msgid ""
"Stray $dotest directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: git-am.sh:528
+#: git-am.sh:535
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: git-am.sh:594
+#: git-am.sh:601
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
-#: git-am.sh:698
+#: git-am.sh:705
#, sh-format
msgid ""
"Patch is empty. Was it split wrong?\n"
"To restore the original branch and stop patching run \"$cmdline --abort\"."
msgstr ""
-#: git-am.sh:725
+#: git-am.sh:732
msgid "Patch does not have a valid e-mail address."
msgstr ""
-#: git-am.sh:772
+#: git-am.sh:779
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: git-am.sh:776
+#: git-am.sh:783
msgid "Commit Body is:"
msgstr ""
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
-#: git-am.sh:783
+#: git-am.sh:790
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
-#: git-am.sh:819
+#: git-am.sh:826
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
-#: git-am.sh:840
+#: git-am.sh:847
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 ""
-#: git-am.sh:848
+#: git-am.sh:855
msgid ""
"You still have unmerged paths in your index\n"
"did you forget to use 'git add'?"
msgstr ""
-#: git-am.sh:864
+#: git-am.sh:871
msgid "No changes -- Patch already applied."
msgstr ""
-#: git-am.sh:874
+#: git-am.sh:881
#, sh-format
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr ""
-#: git-am.sh:877
+#: git-am.sh:884
#, sh-format
msgid ""
"The copy of the patch that failed is found in:\n"
" $dotest/patch"
msgstr ""
-#: git-am.sh:895
+#: git-am.sh:902
msgid "applying to an empty history"
msgstr ""
msgstr ""
#: git-bisect.sh:140
-msgid "won't bisect on seeked tree"
+msgid "won't bisect on cg-seek'ed tree"
msgstr ""
#: git-bisect.sh:144
msgid "'git bisect bad' can take only one argument."
msgstr ""
-#. have bad but not good. we could bisect although
-#. this is less optimum.
#: git-bisect.sh:273
msgid "Warning: bisecting only with a bad commit."
msgstr ""
msgid "Pull is not possible because you have unmerged files."
msgstr ""
-#: git-pull.sh:203
+#: git-pull.sh:247
msgid "updating an unborn branch with changes added to the index"
msgstr ""
-#. The fetch involved updating the current branch.
-#. The working tree and the index file is still based on the
-#. $orig_head commit, but we are merging into $curr_head.
-#. First update the working tree to match $curr_head.
-#: git-pull.sh:235
+#: git-pull.sh:271
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
"Warning: commit $orig_head."
msgstr ""
-#: git-pull.sh:260
+#: git-pull.sh:296
msgid "Cannot merge multiple branches into empty head"
msgstr ""
-#: git-pull.sh:264
+#: git-pull.sh:300
msgid "Cannot rebase onto multiple branches"
msgstr ""
-#: git-rebase.sh:54
+#: git-rebase.sh:57
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:156
+#: git-rebase.sh:164
msgid "Applied autostash."
msgstr ""
-#: git-rebase.sh:159
+#: git-rebase.sh:167
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:160
+#: git-rebase.sh:168
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: git-rebase.sh:190
+#: git-rebase.sh:207
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:195
+#: git-rebase.sh:212
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:329
+#: git-rebase.sh:350
msgid "The --exec option must be used with the --interactive option"
msgstr ""
-#: git-rebase.sh:334
+#: git-rebase.sh:355
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:345
+#: git-rebase.sh:366
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:352
+#: git-rebase.sh:373
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:355
+#: git-rebase.sh:376
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:373
+#: git-rebase.sh:394
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:392
+#: git-rebase.sh:413
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:437
+#: git-rebase.sh:464
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:461
+#: git-rebase.sh:488
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:464 git-rebase.sh:468
+#: git-rebase.sh:491 git-rebase.sh:495
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:473
+#: git-rebase.sh:500
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:496
+#: git-rebase.sh:523
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:519
+#: git-rebase.sh:556
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:524
+#: git-rebase.sh:561
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:528
+#: git-rebase.sh:565
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:548
+#: git-rebase.sh:585
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:552
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:563
+#: git-rebase.sh:600
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#. Detach HEAD and reset the tree
-#: git-rebase.sh:572
+#: git-rebase.sh:609
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:582
+#: git-rebase.sh:619
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:241
+#: git-stash.sh:237
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: git-stash.sh:262
+#: git-stash.sh:258
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:268
-msgid ""
-"The following untracked files would NOT be saved but need to be removed by "
-"stash save:"
-msgstr ""
-
-#: git-stash.sh:270
-msgid ""
-"Aborting. Consider using either the --force or --include-untracked option."
-msgstr ""
-
-#: git-stash.sh:274
+#: git-stash.sh:262
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:278
+#: git-stash.sh:266
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:296
+#: git-stash.sh:284
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:395
+#: git-stash.sh:383
msgid "No stash found."
msgstr ""
-#: git-stash.sh:402
+#: git-stash.sh:390
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:408
+#: git-stash.sh:396
#, sh-format
msgid "$reference is not valid reference"
msgstr ""
-#: git-stash.sh:436
+#: git-stash.sh:424
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:447
+#: git-stash.sh:435
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:455
+#: git-stash.sh:443
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:459
+#: git-stash.sh:447
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:467
+#: git-stash.sh:455
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:469
+#: git-stash.sh:457
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:503
+#: git-stash.sh:491
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:518
+#: git-stash.sh:506
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:535
+#: git-stash.sh:529
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:536
+#: git-stash.sh:530
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:543
+#: git-stash.sh:537
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:615
+#: git-stash.sh:609
msgid "(To restore them type \"git stash apply\")"
msgstr ""
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
-#: git-submodule.sh:281
+#: git-submodule.sh:287
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr ""
-#: git-submodule.sh:293
+#: git-submodule.sh:299
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
-#: git-submodule.sh:403
+#: git-submodule.sh:409
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:413
+#: git-submodule.sh:419
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:430
+#: git-submodule.sh:436
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:434
+#: git-submodule.sh:440
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:452
+#: git-submodule.sh:458
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:454
+#: git-submodule.sh:460
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:462
+#: git-submodule.sh:468
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:464
+#: git-submodule.sh:470
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr ""
-#: git-submodule.sh:466
+#: git-submodule.sh:472
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
-#: git-submodule.sh:467
+#: git-submodule.sh:473
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-#: git-submodule.sh:469
+#: git-submodule.sh:475
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:481
+#: git-submodule.sh:487
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:486
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:495
+#: git-submodule.sh:501
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:539
+#: git-submodule.sh:545
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr ""
-#: git-submodule.sh:554
+#: git-submodule.sh:565
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:600
+#: git-submodule.sh:611
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
-#: git-submodule.sh:609
+#: git-submodule.sh:620
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:611
+#: git-submodule.sh:622
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:619
+#: git-submodule.sh:639
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:656
+#: git-submodule.sh:677
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr ""
-#: git-submodule.sh:673
+#: git-submodule.sh:694
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
-#: git-submodule.sh:674
+#: git-submodule.sh:695
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: git-submodule.sh:680
+#: git-submodule.sh:701
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-#: git-submodule.sh:683
+#: git-submodule.sh:704
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:684
+#: git-submodule.sh:705
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: git-submodule.sh:687
+#: git-submodule.sh:708
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:696
+#: git-submodule.sh:717
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:811
+#: git-submodule.sh:833
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-#: git-submodule.sh:824
+#: git-submodule.sh:846
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:833
+#: git-submodule.sh:855
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:857
+#: git-submodule.sh:879
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:871
+#: git-submodule.sh:893
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:894
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:898
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:872
+#: git-submodule.sh:899
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:877
+#: git-submodule.sh:904
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:878
+#: git-submodule.sh:905
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:883
+#: git-submodule.sh:910
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr ""
-#: git-submodule.sh:884
+#: git-submodule.sh:911
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:889
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:890
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:917
+#: git-submodule.sh:941
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:1025
+#: git-submodule.sh:1049
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#. unexpected type
-#: git-submodule.sh:1066
+#: git-submodule.sh:1097
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:1086
+#: git-submodule.sh:1117
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:1089
+#: git-submodule.sh:1120
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:1092
+#: git-submodule.sh:1123
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1117
+#: git-submodule.sh:1148
msgid "blob"
msgstr ""
-#: git-submodule.sh:1155
-msgid "Submodules changed but not updated:"
-msgstr ""
-
-#: git-submodule.sh:1157
-msgid "Submodule changes to be committed:"
-msgstr ""
-
-#: git-submodule.sh:1242
+#: git-submodule.sh:1262
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1306
+#: git-submodule.sh:1326
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""