msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2014-02-01 08:06+0800\n"
+"POT-Creation-Date: 2015-12-22 22: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:88
msgid ""
-"Fix them up in the work tree,\n"
-"and then use 'git add/rm <file>' as\n"
-"appropriate to mark resolution and make a commit,\n"
-"or use 'git commit -a'."
+"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution and make a commit."
msgstr ""
-#: archive.c:10
-msgid "git archive [options] <tree-ish> [<path>...]"
+#: advice.c:101 builtin/merge.c:1225
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: archive.c:11
-msgid "git archive --list"
+#: advice.c:103
+msgid "Please, commit your changes before merging."
+msgstr ""
+
+#: advice.c:104
+msgid "Exiting because of unfinished merge."
msgstr ""
#: archive.c:12
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
+msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr ""
#: archive.c:13
+msgid "git archive --list"
+msgstr ""
+
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: archive.c:15
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:327
+#: archive.c:429
msgid "fmt"
msgstr ""
-#: archive.c:327
+#: archive.c:429
msgid "archive format"
msgstr ""
-#: archive.c:328 builtin/log.c:1193
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr ""
-#: archive.c:329
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265
-#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680
-#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
-#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
+#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
+#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
+#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr ""
-#: archive.c:331 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:333
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:334
+#: archive.c:436
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:335
+#: archive.c:437
msgid "store only"
msgstr ""
-#: archive.c:336
+#: archive.c:438
msgid "compress faster"
msgstr ""
-#: archive.c:344
+#: archive.c:446
msgid "compress better"
msgstr ""
-#: archive.c:347
+#: archive.c:449
msgid "list supported archive formats"
msgstr ""
-#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr ""
-#: archive.c:350 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr ""
-#: archive.c:352 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: attr.c:259
+#: attr.c:265
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
-#: branch.c:82
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
-#: branch.c:83
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr ""
-#: branch.c:87
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
-#: branch.c:88
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr ""
-#: branch.c:92
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
-#: branch.c:93
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr ""
-#: branch.c:97
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
-#: branch.c:98
+#: branch.c:101
#, 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:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:182
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:187
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:195
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:215
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:217
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:219
+#: branch.c:200
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:264
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:284
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:289
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:295
-msgid "Failed to lock ref for update"
-msgstr ""
-
-#: branch.c:313
-msgid "Failed to write ref"
+#: branch.c:322
+#, c-format
+msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: bundle.c:37
+#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: bundle.c:64
+#: bundle.c:61
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:90 builtin/commit.c:706
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:141
+#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
-#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr ""
-#: bundle.c:187
+#: bundle.c:185
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:194
+#: bundle.c:192
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:196
+#: bundle.c:194
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:296
-msgid "rev-list died"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261
-#, c-format
-msgid "unrecognized argument: %s"
+#: bundle.c:264
+msgid "pack-objects died"
msgstr ""
-#: bundle.c:337
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
+#: bundle.c:304
+msgid "rev-list died"
msgstr ""
-#: bundle.c:382
-msgid "Refusing to create empty bundle."
+#: bundle.c:353
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:398
-msgid "Could not spawn pack-objects"
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
+#, c-format
+msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:416
-msgid "pack-objects died"
+#: bundle.c:449
+msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:419
+#: bundle.c:459
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:441
+#: bundle.c:480
msgid "index-pack died"
msgstr ""
-#: commit.c:53
+#: color.c:275
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr ""
+
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:55
+#: commit.c:42
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
msgid "memory exhausted"
msgstr ""
-#: connected.c:70
+#: config.c:474 config.c:476
+#, c-format
+msgid "bad config file line %d in %s"
+msgstr ""
+
+#: config.c:592
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
+
+#: config.c:594
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr ""
+
+#: config.c:679
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr ""
+
+#: config.c:757 config.c:768
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr ""
+
+#: config.c:890
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr ""
+
+#: config.c:1216
+msgid "unable to parse command-line config"
+msgstr ""
+
+#: config.c:1277
+msgid "unknown error occured while reading the configuration files"
+msgstr ""
+
+#: config.c:1601
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr ""
+
+#: config.c:1603
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr ""
+
+#: config.c:1662
+#, c-format
+msgid "%s has multiple values"
+msgstr ""
+
+#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:90
+#: connected.c:89
#, c-format
msgid "failed write to rev-list: %s"
msgstr ""
-#: connected.c:98
+#: connected.c:97
#, 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"
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diff.c:113
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr ""
+
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:118
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:213
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:263
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3509
+#: diff.c:3000
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr ""
+
+#: diff.c:3396
+msgid "--follow requires exactly one pathspec"
+msgstr ""
+
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3523
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: gpg-interface.c:59 gpg-interface.c:131
+#: dir.c:1915
+msgid "failed to get kernel name and information"
+msgstr ""
+
+#: dir.c:1998
+msgid "Untracked cache is disabled on this system."
+msgstr ""
+
+#: gpg-interface.c:166 gpg-interface.c:237
msgid "could not run gpg."
msgstr ""
-#: gpg-interface.c:71
+#: gpg-interface.c:178
msgid "gpg did not accept the data"
msgstr ""
-#: gpg-interface.c:82
+#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:115
+#: gpg-interface.c:222
#, c-format
msgid "could not create temporary file '%s': %s"
msgstr ""
-#: gpg-interface.c:118
+#: gpg-interface.c:225
#, c-format
msgid "failed writing detached signature to '%s': %s"
msgstr ""
-#: grep.c:1695
+#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1712
+#: grep.c:1735
#, c-format
msgid "'%s': %s"
msgstr ""
-#: grep.c:1723
+#: grep.c:1746
#, c-format
msgid "'%s': short read %s"
msgstr ""
-#: help.c:210
+#: help.c:207
#, c-format
msgid "available git commands in '%s'"
msgstr ""
-#: help.c:217
+#: help.c:214
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:233
-msgid "The most commonly used git commands are:"
+#: help.c:246
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: help.c:290
+#: help.c:311
#, 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:368
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:369
+#: help.c:390
#, 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:395
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
-#: help.c:381
+#: help.c:402
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:385 help.c:444
+#: help.c:406 help.c:466
msgid ""
"\n"
"Did you mean this?"
msgstr[0] ""
msgstr[1] ""
-#: help.c:440
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: merge.c:56
+#: merge.c:41
msgid "failed to read the cache"
msgstr ""
-#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
-#: builtin/clone.c:661
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:190
+#: merge-recursive.c:189
#, c-format
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:206
+#: merge-recursive.c:209
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr ""
-#: merge-recursive.c:269
+#: merge-recursive.c:270
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:673
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:684
+#: merge-recursive.c:697
#, 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:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:709
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:749
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:751
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:774 builtin/clone.c:317
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: merge-recursive.c:782
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr ""
-#: merge-recursive.c:785
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:923
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:927
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:943
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr ""
-#: merge-recursive.c:1022 merge-recursive.c:1036
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, 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:1037 merge-recursive.c:1050
#, 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:1091
msgid "rename"
msgstr ""
-#: merge-recursive.c:1082 wt-status.c:283
+#: merge-recursive.c:1091
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1138
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1160
+#: merge-recursive.c:1169
#, 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:1174
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1219
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1249
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1448
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1458
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1463 merge-recursive.c:1661
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1514
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1517
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1565
+#: merge-recursive.c:1578
msgid "modify"
msgstr ""
-#: merge-recursive.c:1565 wt-status.c:281
+#: merge-recursive.c:1578
msgid "modified"
msgstr ""
-#: merge-recursive.c:1575
+#: merge-recursive.c:1588
msgid "content"
msgstr ""
-#: merge-recursive.c:1582
+#: merge-recursive.c:1595
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1616
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1630
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1634 git-submodule.sh:1148
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1635
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1725
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1750
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1756
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1761
+#: merge-recursive.c:1770
#, 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:1780
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1788
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr ""
-#: merge-recursive.c:1807
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr ""
-#: merge-recursive.c:1816
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:1846
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr ""
-#: merge-recursive.c:1891
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:1904
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:1941
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:1998
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2010 builtin/merge.c:665
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr ""
-#: notes-utils.c:40
+#: notes-utils.c:41
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: notes-utils.c:81
+#: notes-utils.c:100
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: notes-utils.c:91
+#: notes-utils.c:110
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
-#: notes-utils.c:118
+#: notes-utils.c:137
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:202
+#: object.c:242
#, c-format
msgid "unable to parse object: %s"
msgstr ""
-#: parse-options.c:537
+#: parse-options.c:570
msgid "..."
msgstr ""
-#: parse-options.c:555
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:559
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:562
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:596
+#: parse-options.c:629
msgid "-NUM"
msgstr ""
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr ""
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr ""
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#.
-#. * We may want to substitute "this command" with a command
-#. * name. E.g. when add--interactive dies when running
-#. * "checkout -p"
-#.
#: pathspec.c:353
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:433
+#: pathspec.c:432
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:442
+#: pathspec.c:441
msgid ""
"There is nothing to exclude from by :(exclude) patterns.\n"
"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-#: remote.c:753
+#: pretty.c:969
+msgid "unable to parse --pretty format"
+msgstr ""
+
+#: progress.c:235
+msgid "done"
+msgstr ""
+
+#: read-cache.c:1281
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1291
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: builtin/merge.c:983
+#, c-format
+msgid "Could not open '%s' for writing"
+msgstr ""
+
+#: refs/files-backend.c:2359
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr ""
+
+#: refs/files-backend.c:2362
+#, c-format
+msgid "could not delete references: %s"
+msgstr ""
+
+#: refs/files-backend.c:2371
+#, c-format
+msgid "could not remove reference %s"
+msgstr ""
+
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr ""
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr ""
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr ""
+
+#: ref-filter.c:835
+msgid "unable to parse format"
+msgstr ""
+
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr ""
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr ""
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr ""
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr ""
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr ""
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr ""
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:757
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:761
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#.
-#. * This last possibility doesn't occur because
-#. * FETCH_HEAD_IGNORE entries always appear at
-#. * the end of the list.
-#.
-#: remote.c:769
+#: remote.c:772
msgid "Internal error"
msgstr ""
-#: remote.c:1871
+#: remote.c:1687 remote.c:1730
+msgid "HEAD does not point to a branch"
+msgstr ""
+
+#: remote.c:1696
+#, c-format
+msgid "no such branch: '%s'"
+msgstr ""
+
+#: remote.c:1699
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr ""
+
+#: remote.c:1705
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr ""
+
+#: remote.c:1720
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+
+#: remote.c:1735
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr ""
+
+#: remote.c:1746
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr ""
+
+#: remote.c:1759
+msgid "push has no destination (push.default is 'nothing')"
+msgstr ""
+
+#: remote.c:1781
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr ""
+
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:1875
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:1878
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr ""
-#: remote.c:1882
+#: remote.c:2094
#, 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:1888
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:1891
+#: remote.c:2103
#, 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:1899
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:1902
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1912
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: run-command.c:80
+#: revision.c:2193
+msgid "your current branch appears to be broken"
+msgstr ""
+
+#: revision.c:2196
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr ""
+
+#: revision.c:2390
+msgid "--first-parent is incompatible with --bisect"
+msgstr ""
+
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr ""
-#: run-command.c:82
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr ""
-#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896
-#: builtin/merge.c:1006 builtin/merge.c:1016
-#, c-format
-msgid "Could not open '%s' for writing"
+#: send-pack.c:295
+msgid "failed to sign the push certificate"
msgstr ""
-#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786
-#: builtin/merge.c:1008 builtin/merge.c:1021
-#, c-format
-msgid "Could not write to '%s'"
+#: send-pack.c:404
+msgid "the receiving end does not support --signed push"
+msgstr ""
+
+#: send-pack.c:406
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+
+#: send-pack.c:418
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: sequencer.c:229
+#: sequencer.c:183
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:232
+#: sequencer.c:186
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:245 sequencer.c:870 sequencer.c:953
+#: sequencer.c:199 sequencer.c:842 sequencer.c:922
#, c-format
msgid "Could not write to %s"
msgstr ""
-#: sequencer.c:248
+#: sequencer.c:202
#, c-format
msgid "Error wrapping up %s"
msgstr ""
-#: sequencer.c:263
+#: sequencer.c:217
msgid "Your local changes would be overwritten by cherry-pick."
msgstr ""
-#: sequencer.c:265
+#: sequencer.c:219
msgid "Your local changes would be overwritten by revert."
msgstr ""
-#: sequencer.c:268
+#: sequencer.c:222
msgid "Commit your changes or stash them to proceed."
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:325
+#: sequencer.c:309
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:356
+#: sequencer.c:327
msgid "Could not resolve HEAD commit\n"
msgstr ""
-#: sequencer.c:378
+#: sequencer.c:347
msgid "Unable to update cache tree\n"
msgstr ""
-#: sequencer.c:423
+#: sequencer.c:399
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
-#: sequencer.c:428
+#: sequencer.c:404
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:494
+#: sequencer.c:469
msgid "Your index file is unmerged."
msgstr ""
-#: sequencer.c:513
+#: sequencer.c:488
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:521
+#: sequencer.c:496
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:525
+#: sequencer.c:500
#, 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:538
+#: sequencer.c:513
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:542
+#: sequencer.c:517
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
-#: sequencer.c:628
+#: sequencer.c:603
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:629
+#: sequencer.c:604
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:665
+#: sequencer.c:639
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:673
+#: sequencer.c:647
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:678
+#: sequencer.c:651
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:736
+#: sequencer.c:711
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
-#: sequencer.c:758
+#: sequencer.c:733
#, c-format
msgid "Could not parse line %d."
msgstr ""
-#: sequencer.c:763
+#: sequencer.c:738
msgid "No commits parsed."
msgstr ""
-#: sequencer.c:776
+#: sequencer.c:750
#, c-format
msgid "Could not open %s"
msgstr ""
-#: sequencer.c:780
+#: sequencer.c:754
#, c-format
msgid "Could not read %s."
msgstr ""
-#: sequencer.c:787
+#: sequencer.c:761
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
-#: sequencer.c:815
+#: sequencer.c:791
#, c-format
msgid "Invalid key: %s"
msgstr ""
-#: sequencer.c:818
+#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: sequencer.c:830
+#: sequencer.c:804
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
-#: sequencer.c:851
+#: sequencer.c:823
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:852
+#: sequencer.c:824
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:856
+#: sequencer.c:828
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:872 sequencer.c:957
+#: sequencer.c:844 sequencer.c:926
#, c-format
msgid "Error wrapping up %s."
msgstr ""
-#: sequencer.c:891 sequencer.c:1025
+#: sequencer.c:863 sequencer.c:996
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:893
+#: sequencer.c:865
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:895
+#: sequencer.c:867
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:917 builtin/apply.c:4061
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: sequencer.c:920
+#: sequencer.c:890
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:921
+#: sequencer.c:891
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:927
+#: sequencer.c:897
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:950
+#: sequencer.c:919
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:1093
+#: sequencer.c:1064
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:1096
+#: sequencer.c:1067
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:1130
+#: sequencer.c:1101
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:1131
+#: sequencer.c:1102
msgid "Can't cherry-pick into empty head"
msgstr ""
-#: sha1_name.c:439
+#: setup.c:248
+#, c-format
+msgid "failed to read %s"
+msgstr ""
+
+#: sha1_name.c:463
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:1070
-msgid "HEAD does not point to a branch"
+#: submodule.c:61 submodule.c:95
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: sha1_name.c:1073
+#: submodule.c:65 submodule.c:99
#, c-format
-msgid "No such branch: '%s'"
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: sha1_name.c:1075
+#: submodule.c:73
#, c-format
-msgid "No upstream configured for branch '%s'"
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: sha1_name.c:1079
+#: submodule.c:106
#, c-format
-msgid "Upstream branch '%s' not stored as a remote-tracking branch"
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: submodule.c:117
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:68 submodule.c:102
+#: submodule.c:1040
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "Could not set core.worktree in %s"
msgstr ""
-#. Maybe the user already did that, don't error out here
-#: submodule.c:76
+#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
+#: trailer.c:561
#, c-format
-msgid "Could not update .gitmodules entry %s"
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#. Maybe the user already did that, don't error out here
-#: submodule.c:109
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr ""
-
-#: submodule.c:127
-msgid "could not find .gitmodules in index"
-msgstr ""
-
-#: submodule.c:133
-msgid "reading updated .gitmodules failed"
-msgstr ""
-
-#: submodule.c:135
-msgid "unable to stat updated .gitmodules"
+msgid "more than one %s"
msgstr ""
-#: submodule.c:139
-msgid "unable to remove .gitmodules from index"
+#: trailer.c:581
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: submodule.c:141
-msgid "adding updated .gitmodules failed"
+#: trailer.c:701
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: submodule.c:143
-msgid "staging updated .gitmodules failed"
+#: trailer.c:704
+msgid "could not read from stdin"
msgstr ""
-#: submodule.c:1144 builtin/init-db.c:363
+#: transport-helper.c:1025
#, c-format
-msgid "Could not create git link %s"
+msgid "Could not read ref %s"
msgstr ""
-#: submodule.c:1155
-#, c-format
-msgid "Could not set core.worktree in %s"
+#: unpack-trees.c:203
+msgid "Checking out files"
msgstr ""
#: urlmatch.c:120
msgid "invalid '..' path segment"
msgstr ""
-#: wrapper.c:422
+#: wrapper.c:219 wrapper.c:362
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr ""
+
+#: wrapper.c:221 wrapper.c:364
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr ""
+
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr ""
+
+#: wrapper.c:579
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: wrapper.c:443
+#: wrapper.c:600
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:454
+#: wrapper.c:608
+msgid "unable to get current working directory"
+msgstr ""
+
+#: wrapper.c:635
+#, c-format
+msgid "could not open %s for writing"
+msgstr ""
+
+#: wrapper.c:646 builtin/am.c:425
#, c-format
-msgid "unable to look up current user in the passwd file: %s"
+msgid "could not write to %s"
msgstr ""
-#: wrapper.c:455
-msgid "no such user"
+#: wrapper.c:652
+#, c-format
+msgid "could not close %s"
msgstr ""
-#: wt-status.c:150
+#: wt-status.c:149
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:176 wt-status.c:203
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:178 wt-status.c:205
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:183
+#: wt-status.c:182
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:184 wt-status.c:188
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:187
+#: wt-status.c:186
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:198
+#: wt-status.c:197 wt-status.c:880
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:216
+#: wt-status.c:215 wt-status.c:889
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:220
+#: wt-status.c:219
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:222
+#: wt-status.c:221
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:223
+#: wt-status.c:222
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:225
+#: wt-status.c:224
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:237
+#: wt-status.c:236
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:254
-msgid "bug"
-msgstr ""
-
-#: wt-status.c:259
+#: wt-status.c:251
msgid "both deleted:"
msgstr ""
-#: wt-status.c:260
+#: wt-status.c:253
msgid "added by us:"
msgstr ""
-#: wt-status.c:261
+#: wt-status.c:255
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:262
+#: wt-status.c:257
msgid "added by them:"
msgstr ""
-#: wt-status.c:263
+#: wt-status.c:259
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:264
+#: wt-status.c:261
msgid "both added:"
msgstr ""
-#: wt-status.c:265
+#: wt-status.c:263
msgid "both modified:"
msgstr ""
+#: wt-status.c:265
+#, c-format
+msgid "bug: unhandled unmerged status %x"
+msgstr ""
+
+#: wt-status.c:273
+msgid "new file:"
+msgstr ""
+
#: wt-status.c:275
-msgid "new file"
+msgid "copied:"
msgstr ""
#: wt-status.c:277
-msgid "copied"
+msgid "deleted:"
msgstr ""
#: wt-status.c:279
-msgid "deleted"
+msgid "modified:"
msgstr ""
-#: wt-status.c:285
-msgid "typechange"
+#: wt-status.c:281
+msgid "renamed:"
msgstr ""
-#: wt-status.c:287
-msgid "unknown"
+#: wt-status.c:283
+msgid "typechange:"
msgstr ""
-#: wt-status.c:289
-msgid "unmerged"
+#: wt-status.c:285
+msgid "unknown:"
msgstr ""
-#: wt-status.c:336
+#: wt-status.c:287
+msgid "unmerged:"
+msgstr ""
+
+#: wt-status.c:369
msgid "new commits, "
msgstr ""
-#: wt-status.c:338
+#: wt-status.c:371
msgid "modified content, "
msgstr ""
-#: wt-status.c:340
+#: wt-status.c:373
msgid "untracked content, "
msgstr ""
-#: wt-status.c:357
+#: wt-status.c:390
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:732
+#: wt-status.c:754
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:734
+#: wt-status.c:756
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:836
+#: wt-status.c:837
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr ""
-#: wt-status.c:899
+#: wt-status.c:948
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:902
+#: wt-status.c:951
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:905
+#: wt-status.c:954
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:908
+#: wt-status.c:957
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:918
+#: wt-status.c:967
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:921
+#: wt-status.c:970
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:925
+#: wt-status.c:974
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:927
+#: wt-status.c:976
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:929
+#: wt-status.c:978
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:989 wt-status.c:1006
+#: wt-status.c:1105
+msgid "No commands done."
+msgstr ""
+
+#: wt-status.c:1108
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1119
+#, c-format
+msgid " (see more in file %s)"
+msgstr ""
+
+#: wt-status.c:1124
+msgid "No commands remaining."
+msgstr ""
+
+#: wt-status.c:1127
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1135
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr ""
+
+#: wt-status.c:1148
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:994 wt-status.c:1011
+#: wt-status.c:1153
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:997
+#: wt-status.c:1167
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:999
+#: wt-status.c:1169
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1001
+#: wt-status.c:1171
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1014
+#: wt-status.c:1177
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1018
+#: wt-status.c:1181
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1023
+#: wt-status.c:1186
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1026
+#: wt-status.c:1189
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1030
+#: wt-status.c:1193
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1035
+#: wt-status.c:1198
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1038
+#: wt-status.c:1201
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1040
+#: wt-status.c:1203
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1050
+#: wt-status.c:1213
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1055
+#: wt-status.c:1218
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1058
+#: wt-status.c:1221
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1060
+#: wt-status.c:1223
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1069
+#: wt-status.c:1232
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1074
+#: wt-status.c:1237
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1077
+#: wt-status.c:1240
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1079
+#: wt-status.c:1242
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1090
+#: wt-status.c:1253
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1094
+#: wt-status.c:1257
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1097
+#: wt-status.c:1260
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1272
+#: wt-status.c:1438
msgid "On branch "
msgstr ""
-#: wt-status.c:1279
+#: wt-status.c:1444
+msgid "interactive rebase in progress; onto "
+msgstr ""
+
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1286
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1288
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1291
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1308
+#: wt-status.c:1474
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1322
+#: wt-status.c:1488
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1324
+#: wt-status.c:1490
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1328
+#: wt-status.c:1494
#, 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:1334
+#: wt-status.c:1500
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1336
+#: wt-status.c:1502
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1342
+#: wt-status.c:1508
msgid "No changes"
msgstr ""
-#: wt-status.c:1347
+#: wt-status.c:1513
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1350
+#: wt-status.c:1516
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1353
+#: wt-status.c:1519
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1356
+#: wt-status.c:1522
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1359
+#: wt-status.c:1525
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1362 wt-status.c:1367
+#: wt-status.c:1528 wt-status.c:1533
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1365
+#: wt-status.c:1531
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1369
+#: wt-status.c:1535
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: wt-status.c:1478
-msgid "HEAD (no branch)"
+#: wt-status.c:1642
+msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1484
-msgid "Initial commit on "
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1514
+#: wt-status.c:1675
msgid "gone"
msgstr ""
-#: wt-status.c:1516
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr ""
-#: wt-status.c:1519 wt-status.c:1522
-msgid "ahead "
-msgstr ""
-
-#: wt-status.c:1524
-msgid ", behind "
-msgstr ""
-
-#: compat/precompose_utf8.c:55 builtin/clone.c:356
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/add.c:20
-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"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/add.c:144
+#: builtin/add.c:65
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:149 builtin/commit.c:260
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:163
+#: builtin/add.c:80
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:237
+#: builtin/add.c:134
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:299
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:310
+#: builtin/add.c:205
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:314
+#: builtin/add.c:209
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:319
+#: builtin/add.c:212
+msgid "editing patch failed"
+msgstr ""
+
+#: builtin/add.c:215
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:321
+#: builtin/add.c:217
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:327
+#: builtin/add.c:222
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:337
+#: builtin/add.c:232
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70
-#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344
-#: builtin/rm.c:269
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr ""
-#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
-#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr ""
-#: builtin/add.c:357
+#: builtin/add.c:252
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:359
+#: builtin/add.c:254
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:360
+#: builtin/add.c:255
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:361
+#: builtin/add.c:256
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:362
+#: builtin/add.c:257
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:363
+#: builtin/add.c:258
msgid "add changes from all tracked and untracked files"
msgstr ""
-#. takes no arguments
-#: builtin/add.c:366
+#: builtin/add.c:261
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:368
+#: builtin/add.c:263
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:369
+#: builtin/add.c:264
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:370
+#: builtin/add.c:265
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:392
+#: builtin/add.c:287
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:393
-msgid "no files added"
-msgstr ""
-
-#: builtin/add.c:399
+#: builtin/add.c:294
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:438
+#: builtin/add.c:330
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:456
+#: builtin/add.c:337
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:486
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:487
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
-#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr ""
-#: builtin/apply.c:57
-msgid "git apply [options] [<patch>...]"
+#: builtin/am.c:42
+#, c-format
+msgid "could not stat %s"
+msgstr ""
+
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
+#: builtin/am.c:445
+msgid "could not parse author script"
+msgstr ""
+
+#: builtin/am.c:522
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr ""
+
+#: builtin/am.c:563 builtin/notes.c:300
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr ""
+
+#: builtin/am.c:600 builtin/notes.c:315
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#: builtin/am.c:626
+msgid "fseek failed"
+msgstr ""
+
+#: builtin/am.c:787 builtin/am.c:875
+#, c-format
+msgid "could not open '%s' for reading: %s"
+msgstr ""
+
+#: builtin/am.c:794
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr ""
+
+#: builtin/am.c:803
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr ""
+
+#: builtin/am.c:868
+msgid "Only one StGIT patch series can be applied at once"
+msgstr ""
+
+#: builtin/am.c:916
+msgid "invalid timestamp"
+msgstr ""
+
+#: builtin/am.c:919 builtin/am.c:927
+msgid "invalid Date line"
+msgstr ""
+
+#: builtin/am.c:924
+msgid "invalid timezone offset"
+msgstr ""
+
+#: builtin/am.c:1011
+msgid "Patch format detection failed."
+msgstr ""
+
+#: builtin/am.c:1016 builtin/clone.c:373
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr ""
+
+#: builtin/am.c:1020
+msgid "Failed to split patches."
+msgstr ""
+
+#: builtin/am.c:1152 builtin/commit.c:363
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/am.c:1203
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr ""
+
+#: builtin/am.c:1204
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+
+#: builtin/am.c:1205
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+
+#: builtin/am.c:1343
+msgid "Patch is empty. Was it split wrong?"
+msgstr ""
+
+#: builtin/am.c:1417 builtin/log.c:1347
+#, c-format
+msgid "invalid ident line: %s"
+msgstr ""
+
+#: builtin/am.c:1444
+#, c-format
+msgid "unable to parse commit %s"
+msgstr ""
+
+#: builtin/am.c:1646
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+
+#: builtin/am.c:1648
+msgid "Using index info to reconstruct a base tree..."
+msgstr ""
+
+#: builtin/am.c:1667
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+
+#: builtin/am.c:1673
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+
+#: builtin/am.c:1688
+msgid "Failed to merge in the changes."
+msgstr ""
+
+#: builtin/am.c:1712 builtin/merge.c:632
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: builtin/am.c:1719
+msgid "applying to an empty history"
+msgstr ""
+
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
+#: builtin/merge.c:854
+msgid "failed to write commit object"
+msgstr ""
+
+#: builtin/am.c:1764 builtin/am.c:1768
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr ""
+
+#: builtin/am.c:1784
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+
+#: builtin/am.c:1789
+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.
+#.
+#: builtin/am.c:1799
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr ""
+
+#: builtin/am.c:1849
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr ""
+
+#: builtin/am.c:1884 builtin/am.c:1955
+#, c-format
+msgid "Applying: %.*s"
+msgstr ""
+
+#: builtin/am.c:1900
+msgid "No changes -- Patch already applied."
+msgstr ""
+
+#: builtin/am.c:1908
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr ""
+
+#: builtin/am.c:1914
+#, c-format
+msgid "The copy of the patch that failed is found in: %s"
+msgstr ""
+
+#: builtin/am.c:1958
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+
+#: builtin/am.c:1965
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
+#: builtin/reset.c:316
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr ""
+
+#: builtin/am.c:2125
+msgid "failed to clean index"
+msgstr ""
+
+#: builtin/am.c:2159
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+
+#: builtin/am.c:2220
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr ""
+
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr ""
+
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr ""
+
+#: builtin/am.c:2260
+msgid "run interactively"
msgstr ""
-#: builtin/apply.c:110
+#: builtin/am.c:2262
+msgid "historical option -- no-op"
+msgstr ""
+
+#: builtin/am.c:2264
+msgid "allow fall back on 3way merging if needed"
+msgstr ""
+
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/repack.c:171
+msgid "be quiet"
+msgstr ""
+
+#: builtin/am.c:2267
+msgid "add a Signed-off-by line to the commit message"
+msgstr ""
+
+#: builtin/am.c:2270
+msgid "recode into utf8 (default)"
+msgstr ""
+
+#: builtin/am.c:2272
+msgid "pass -k flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2274
+msgid "pass -b flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2276
+msgid "pass -m flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2278
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr ""
+
+#: builtin/am.c:2281
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+
+#: builtin/am.c:2284
+msgid "strip everything before a scissors line"
+msgstr ""
+
+#: builtin/am.c:2285 builtin/apply.c:4554
+msgid "action"
+msgstr ""
+
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
+msgid "pass it through git-apply"
+msgstr ""
+
+#: builtin/am.c:2294 builtin/apply.c:4578
+msgid "root"
+msgstr ""
+
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
+msgid "path"
+msgstr ""
+
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
+msgid "n"
+msgstr ""
+
+#: builtin/am.c:2306 builtin/apply.c:4522
+msgid "num"
+msgstr ""
+
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr ""
+
+#: builtin/am.c:2310
+msgid "format the patch(es) are in"
+msgstr ""
+
+#: builtin/am.c:2316
+msgid "override error message when patch failure occurs"
+msgstr ""
+
+#: builtin/am.c:2318
+msgid "continue applying patches after resolving a conflict"
+msgstr ""
+
+#: builtin/am.c:2321
+msgid "synonyms for --continue"
+msgstr ""
+
+#: builtin/am.c:2324
+msgid "skip the current patch"
+msgstr ""
+
+#: builtin/am.c:2327
+msgid "restore the original branch and abort the patching operation."
+msgstr ""
+
+#: builtin/am.c:2331
+msgid "lie about committer date"
+msgstr ""
+
+#: builtin/am.c:2333
+msgid "use current timestamp for author date"
+msgstr ""
+
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr ""
+
+#: builtin/am.c:2336
+msgid "GPG-sign commits"
+msgstr ""
+
+#: builtin/am.c:2339
+msgid "(internal use for git-rebase)"
+msgstr ""
+
+#: builtin/am.c:2354
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
+msgstr ""
+
+#: builtin/am.c:2361
+msgid "failed to read the index"
+msgstr ""
+
+#: builtin/am.c:2376
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+
+#: builtin/am.c:2400
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+
+#: builtin/am.c:2406
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr ""
+
+#: builtin/apply.c:59
+msgid "git apply [<options>] [<patch>...]"
+msgstr ""
+
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: builtin/apply.c:125
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: builtin/apply.c:823
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: builtin/apply.c:832
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: builtin/apply.c:913
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: builtin/apply.c:945
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: builtin/apply.c:949
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: builtin/apply.c:950
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: builtin/apply.c:957
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/apply.c:1422
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/apply.c:1479
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1496
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:1656
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr ""
-#: builtin/apply.c:1658
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr ""
-#: builtin/apply.c:1684
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/apply.c:1720
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/apply.c:1722
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/apply.c:1725
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/apply.c:1871
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#. there has to be one hunk (forward hunk)
-#: builtin/apply.c:1900
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/apply.c:1986
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/apply.c:2076
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: builtin/apply.c:2080
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: builtin/apply.c:2688
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: builtin/apply.c:2806
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:2818
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: builtin/apply.c:2824
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: builtin/apply.c:2843
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/apply.c:2946
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/apply.c:2952
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: builtin/apply.c:2973
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: builtin/apply.c:3095
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr ""
-#: builtin/apply.c:3174 builtin/apply.c:3396
+#: builtin/apply.c:3239
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr ""
+
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: builtin/apply.c:3255 builtin/apply.c:3410
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr ""
-#: builtin/apply.c:3264 builtin/apply.c:3418
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: builtin/apply.c:3366
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/apply.c:3435
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: builtin/apply.c:3437
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/apply.c:3538
+#: builtin/apply.c:3689 builtin/apply.c:3691
+#, c-format
+msgid "invalid path '%s'"
+msgstr ""
+
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: builtin/apply.c:3541
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: builtin/apply.c:3561
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: builtin/apply.c:3566
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: builtin/apply.c:3574
+#: builtin/apply.c:3794
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr ""
+
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: builtin/apply.c:3587
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: builtin/apply.c:3823
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: builtin/apply.c:3851
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: builtin/apply.c:3855
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/apply.c:3860
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/apply.c:3863 builtin/apply.c:3971
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/apply.c:3896
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: builtin/apply.c:3945
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/apply.c:4032
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/apply.c:4040
+#: builtin/apply.c:4266
msgid "internal error"
msgstr ""
-#. Say this even without --verbose
-#: builtin/apply.c:4043
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4053
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/apply.c:4074
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/apply.c:4077
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/apply.c:4227
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr ""
-#: builtin/apply.c:4238
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
-#: builtin/fetch.c:78
-msgid "path"
-msgstr ""
-
-#: builtin/apply.c:4358
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4361
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4363
-msgid "num"
-msgstr ""
-
-#: builtin/apply.c:4364
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: builtin/apply.c:4367
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr ""
-#: builtin/apply.c:4369
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: builtin/apply.c:4373
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: builtin/apply.c:4375
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: builtin/apply.c:4377
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: builtin/apply.c:4379
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: builtin/apply.c:4381
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr ""
-#: builtin/apply.c:4383
+#: builtin/apply.c:4542
+msgid "accept a patch that touches outside the working area"
+msgstr ""
+
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: builtin/apply.c:4385
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: builtin/apply.c:4387
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr ""
-#: builtin/apply.c:4392
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: builtin/apply.c:4393
-msgid "action"
-msgstr ""
-
-#: builtin/apply.c:4394
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/apply.c:4397 builtin/apply.c:4400
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: builtin/apply.c:4403
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr ""
-#: builtin/apply.c:4405
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr ""
-#: builtin/apply.c:4407
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: builtin/apply.c:4409
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr ""
-#: builtin/apply.c:4412
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: builtin/apply.c:4415
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: builtin/apply.c:4417
-msgid "root"
-msgstr ""
-
-#: builtin/apply.c:4418
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr ""
-#: builtin/apply.c:4440
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr ""
-#: builtin/apply.c:4448
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr ""
-#: builtin/apply.c:4451
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr ""
-#: builtin/apply.c:4467
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr ""
-#: builtin/apply.c:4481
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4487 builtin/apply.c:4497
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/blame.c:27
-msgid "git blame [options] [rev-opts] [rev] [--] file"
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/blame.c:32
-msgid "[rev-opts] are documented in git-rev-list(1)"
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:2249
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2250
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2251
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2252
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2253
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2254
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2255
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2256
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2257
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2258
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2259
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2260
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2261
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2262
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2263
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2264
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2265
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2266
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2267 builtin/blame.c:2268
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr ""
-#: builtin/blame.c:2267
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2268
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2269
+#: builtin/blame.c:2539
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2269
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/branch.c:24
-msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
+#. TRANSLATORS: This string is used to tell us the maximum
+#. display width for a relative timestamp in "git blame"
+#. output. For C locale, "4 years, 11 months ago", which
+#. takes 22 places, is the longest among various forms of
+#. relative timestamps, but your language may need more or
+#. fewer display columns.
+#: builtin/blame.c:2620
+msgid "4 years, 11 months ago"
msgstr ""
#: builtin/branch.c:25
-msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
#: builtin/branch.c:26
-msgid "git branch [options] [-r] (-d | -D) <branchname>..."
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
#: builtin/branch.c:27
-msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr ""
+
+#: builtin/branch.c:28
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr ""
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/branch.c:150
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr ""
-#: builtin/branch.c:240
+#: builtin/branch.c:235
#, c-format
-msgid "remote branch '%s' not found."
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:241
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:255
+#: builtin/branch.c:251
#, c-format
-msgid "Error deleting remote branch '%s'"
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:256
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:263
+#: builtin/branch.c:259
#, c-format
-msgid "Deleted remote branch %s (was %s).\n"
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:264
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:366
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr ""
-
-#: builtin/branch.c:454
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr ""
-#: builtin/branch.c:459
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr ""
-#: builtin/branch.c:464
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr ""
-#: builtin/branch.c:466
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr ""
-#: builtin/branch.c:470
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/branch.c:472
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:475
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:478
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:502
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr ""
-#: builtin/branch.c:594
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/branch.c:597
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/branch.c:600
+#: builtin/branch.c:375
#, c-format
-msgid "(detached from %s)"
+msgid "(HEAD detached at %s)"
msgstr ""
-#: builtin/branch.c:603
-msgid "(no branch)"
-msgstr ""
-
-#: builtin/branch.c:649
+#: builtin/branch.c:378
#, c-format
-msgid "object '%s' does not point to a commit"
+msgid "(HEAD detached from %s)"
msgstr ""
-#: builtin/branch.c:681
-msgid "some refs could not be read"
+#: builtin/branch.c:382
+msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:694
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:704
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:719
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:723
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:727
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:734
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:749
-#, c-format
-msgid "malformed object name %s"
-msgstr ""
-
-#: builtin/branch.c:773
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr ""
-#: builtin/branch.c:803
+#: builtin/branch.c:616
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:805
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:806
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:807
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:809
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr ""
-#: builtin/branch.c:813
+#: builtin/branch.c:626
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:814
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
-#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461
-#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
-msgid "commit"
-msgstr ""
-
-#: builtin/branch.c:818 builtin/branch.c:824
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:830
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:831
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:833
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:834
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:835
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:836
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:837
+#: builtin/branch.c:640
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:838
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:840
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:841
-msgid "force creation (when already exists)"
+#: builtin/branch.c:644
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:844
-msgid "print only not merged branches"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:850
-msgid "print only merged branches"
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:854
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:867
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr ""
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr ""
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr ""
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr ""
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:872 builtin/clone.c:635
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:896
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:902 builtin/branch.c:941
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:917
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:922
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:929
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:932
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:947
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/branch.c:952
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/branch.c:956
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:963
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:975
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/branch.c:979
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:985
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:999
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/branch.c:1005
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:1008
+#: builtin/branch.c:814
#, 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:1025
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: builtin/branch.c:1026
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr ""
-#: builtin/branch.c:1027
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr ""
-#: builtin/bundle.c:47
+#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
msgstr ""
-#: builtin/bundle.c:56
+#: builtin/bundle.c:64
msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/bundle.c:60
+#: builtin/bundle.c:68
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:328
-msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
+#: builtin/cat-file.c:428
+msgid ""
+"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
+"<type>|--textconv) <object>"
msgstr ""
-#: builtin/cat-file.c:329
-msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
+#: builtin/cat-file.c:429
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr ""
-#: builtin/cat-file.c:366
+#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:367
+#: builtin/cat-file.c:467
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:368
+#: builtin/cat-file.c:468
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:370
+#: builtin/cat-file.c:470
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:371
+#: builtin/cat-file.c:471
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:373
+#: builtin/cat-file.c:473
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:375
+#: builtin/cat-file.c:475
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr ""
+
+#: builtin/cat-file.c:476
+msgid "buffer --batch output"
+msgstr ""
+
+#: builtin/cat-file.c:478
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:378
+#: builtin/cat-file.c:481
msgid "show info about objects fed from the standard input"
msgstr ""
+#: builtin/cat-file.c:484
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr ""
+
+#: builtin/cat-file.c:486
+msgid "show all objects with --batch or --batch-check"
+msgstr ""
+
#: builtin/check-attr.c:11
-msgid "git check-attr [-a | --all | attr...] [--] pathname..."
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
#: builtin/check-attr.c:19
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
msgid "read file names from stdin"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr ""
msgstr ""
#: builtin/check-mailmap.c:8
-msgid "git check-mailmap [options] <contact>..."
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
#: builtin/check-mailmap.c:13
msgstr ""
#: builtin/checkout-index.c:126
-msgid "git checkout-index [options] [--] [<file>...]"
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:188
msgid "check out all files in the index"
msgstr ""
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:189
msgid "force overwrite of existing files"
msgstr ""
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:191
msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:193
msgid "don't checkout new files"
msgstr ""
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:195
msgid "update stat information in the index file"
msgstr ""
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:201
msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/checkout-index.c:202
+#: builtin/checkout-index.c:203
msgid "write the content to temporary files"
msgstr ""
-#: builtin/checkout-index.c:203 builtin/column.c:30
+#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr ""
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:205
msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/checkout-index.c:207
+#: builtin/checkout-index.c:208
msgid "copy out the files from named stage"
msgstr ""
#: builtin/checkout.c:25
-msgid "git checkout [options] <branch>"
+msgid "git checkout [<options>] <branch>"
msgstr ""
#: builtin/checkout.c:26
-msgid "git checkout [options] [<branch>] -- <file>..."
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:114 builtin/checkout.c:147
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:116 builtin/checkout.c:149
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:132
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:176
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:193
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:210
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
-#: builtin/checkout.c:241
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:244 builtin/checkout.c:247
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:250
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:261 builtin/checkout.c:451
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr ""
-#: builtin/checkout.c:322 builtin/checkout.c:329
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:473
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:594
+#: builtin/checkout.c:623
#, c-format
-msgid "Can not do reflog for '%s'\n"
+msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:632
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:639
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:642
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:646
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:648 builtin/checkout.c:1033
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:650
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:706
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#. The singular version
-#: builtin/checkout.c:712
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:730
+#: builtin/checkout.c:756
#, c-format
msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
-" git branch new_branch_name %s\n"
+" git branch <new-branch-name> %s\n"
"\n"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/checkout.c:760
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:764
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:791 builtin/checkout.c:1028
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:935
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#. case (1): want a tree
-#: builtin/checkout.c:1003
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1045 builtin/checkout.c:1049
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
-#: builtin/remote.c:159 builtin/remote.c:161
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1092
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1094
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1095
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1097
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1099
-msgid "new branch"
+#: builtin/checkout.c:1143
+msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1100
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1102
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1105
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1106 builtin/merge.c:225
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr ""
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1113
-msgid "second guess 'git checkout no-such-branch'"
+#: builtin/checkout.c:1157
+msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1159
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr ""
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1204
+#: builtin/checkout.c:1256
#, 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:1209
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1213
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/clean.c:26
+#: builtin/clean.c:25
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/clean.c:30
+#: builtin/clean.c:29
#, c-format
msgid "Removing %s\n"
msgstr ""
-#: builtin/clean.c:31
+#: builtin/clean.c:30
#, c-format
msgid "Would remove %s\n"
msgstr ""
-#: builtin/clean.c:32
+#: builtin/clean.c:31
#, c-format
msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/clean.c:33
+#: builtin/clean.c:32
#, c-format
msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/clean.c:34
+#: builtin/clean.c:33
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:294
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
" - (empty) select nothing"
msgstr ""
-#: builtin/clean.c:298
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
" - (empty) finish selecting"
msgstr ""
-#: builtin/clean.c:516
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr ""
-#: builtin/clean.c:659
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:696
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:717
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr ""
-#: builtin/clean.c:757
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:776
#, c-format
-msgid "remove %s? "
+msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:782
+#: builtin/clean.c:801
msgid "Bye."
msgstr ""
-#: builtin/clean.c:790
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:817
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:818
+#: builtin/clean.c:837
msgid "What now"
msgstr ""
-#: builtin/clean.c:826
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:843
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:874
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:876
+#: builtin/clean.c:895
msgid "force"
msgstr ""
-#: builtin/clean.c:877
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:879
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
-#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr ""
-#: builtin/clean.c:881
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:882
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:884
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:902
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:906
+#: builtin/clean.c:925
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:928
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 ""
-#: builtin/clone.c:36
-msgid "git clone [options] [--] <repo> [<dir>]"
+#: builtin/clone.c:37
+msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222
-#: builtin/push.c:521
-msgid "force progress reporting"
-msgstr ""
-
-#: builtin/clone.c:66
+#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:71
+#: builtin/clone.c:64
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:73
+#: builtin/clone.c:66
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:75
+#: builtin/clone.c:68
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:77
+#: builtin/clone.c:70
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:79 builtin/clone.c:81
+#: builtin/clone.c:72 builtin/clone.c:74
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:82 builtin/init-db.c:485
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:83 builtin/init-db.c:486
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:85
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:80
+msgid "use --reference only while cloning"
+msgstr ""
+
+#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:87
+#: builtin/clone.c:82
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:89
+#: builtin/clone.c:84
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:91
+#: builtin/clone.c:86
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
+#: builtin/pull.c:186
msgid "depth"
msgstr ""
-#: builtin/clone.c:93
+#: builtin/clone.c:88
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:95
+#: builtin/clone.c:90
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:96 builtin/init-db.c:494
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:97 builtin/init-db.c:495
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:98
+#: builtin/clone.c:93
msgid "key=value"
msgstr ""
-#: builtin/clone.c:99
+#: builtin/clone.c:94
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:252
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/clone.c:256
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/clone.c:259
+#: builtin/clone.c:310
#, 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:323 builtin/diff.c:83
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: builtin/clone.c:325
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:339
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:361
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:365
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:388 builtin/clone.c:565
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:401
+#: builtin/clone.c:454
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:480
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:560
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr ""
-#: builtin/clone.c:563
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:626
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:657
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:765
+#: builtin/clone.c:808
+msgid "cannot repack to clean up"
+msgstr ""
+
+#: builtin/clone.c:810
+msgid "cannot unlink temporary alternates file"
+msgstr ""
+
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:769
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:780
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:783
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:796
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:802
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:805
-msgid "source repository is shallow, ignoring --local"
-msgstr ""
-
-#: builtin/clone.c:810
-msgid "--local is ignored"
-msgstr ""
-
-#: builtin/clone.c:814 builtin/fetch.c:1119
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:824
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:834
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:847 builtin/clone.c:859
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:850
+#: builtin/clone.c:917
#, c-format
-msgid "could not create work tree dir '%s'."
+msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:869
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:871
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:906
+#: builtin/clone.c:975
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:978
+msgid "source repository is shallow, ignoring --local"
+msgstr ""
+
+#: builtin/clone.c:983
+msgid "--local is ignored"
+msgstr ""
+
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:957 builtin/clone.c:965
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:968
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr ""
#: builtin/column.c:9
-msgid "git column [options]"
+msgid "git column [<options>]"
msgstr ""
#: builtin/column.c:26
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit.c:36
-msgid "git commit [options] [--] <pathspec>..."
+#: builtin/commit.c:38
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:43
+msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:41
-msgid "git status [options] [--] <pathspec>..."
+#: builtin/commit.c:48
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/commit.c:46
+#: builtin/commit.c:61
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:58
+#: builtin/commit.c:73
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:63
+#: builtin/commit.c:78
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:70
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:73
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:287
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:329
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:335
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
+#: builtin/commit.c:365
+msgid "unable to update temporary index"
+msgstr ""
+
+#: builtin/commit.c:367
+msgid "Failed to update main cache tree"
+msgstr ""
+
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:420
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:422
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:432
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:452
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:543 builtin/commit.c:549
+#: builtin/commit.c:580
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr ""
+
+#: builtin/commit.c:582
#, c-format
-msgid "invalid commit: %s"
+msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:571
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:591
+#: builtin/commit.c:609
#, c-format
-msgid "Malformed ident string: '%s'"
+msgid "invalid date format: %s"
msgstr ""
-#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
+#: builtin/commit.c:653
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:642 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:644
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:648
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:654
-msgid "commit has empty message"
-msgstr ""
-
-#: builtin/commit.c:670
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:674
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:678
-#, c-format
-msgid "could not read '%s'"
-msgstr ""
-
-#: builtin/commit.c:749
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:760
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:765
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:777
+#: builtin/commit.c:821
#, 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:782
+#: builtin/commit.c:828
#, 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:795
+#: builtin/commit.c:848
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:856
#, c-format
-msgid "%sAuthor: %s"
+msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:802
+#: builtin/commit.c:863
#, c-format
-msgid "%sCommitter: %s"
+msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:822
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:865
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:880 builtin/tag.c:359
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:982
+#: builtin/commit.c:1055
#, c-format
-msgid "No existing author found with '%s'"
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:997 builtin/commit.c:1237
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1034
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1064
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1075
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1078
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1080
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1083
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1093
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1095
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1103
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1120
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1122
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1124
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1126
-msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+#: builtin/commit.c:1197
+msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1136 builtin/tag.c:572
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1141
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1251 builtin/commit.c:1482
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1253 builtin/commit.c:1484
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1258 builtin/commit.c:1488
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1261 builtin/commit.c:1491
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
-#: builtin/fast-export.c:677 builtin/tag.c:459
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr ""
-#: builtin/commit.c:1264 builtin/commit.c:1494
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1267
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1268 parse-options.h:156
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr ""
-#: builtin/commit.c:1269
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1271
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1340
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1342
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1383
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1385
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1452
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1453
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1455
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1456 builtin/tag.c:457
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1457
+#: builtin/commit.c:1580
msgid "author"
msgstr ""
-#: builtin/commit.c:1457
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1458 builtin/gc.c:261
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr ""
-#: builtin/commit.c:1458
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405
-#: builtin/notes.c:562 builtin/tag.c:455
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr ""
-#: builtin/commit.c:1459
+#: builtin/commit.c:1582
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1460
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr ""
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1461
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1462
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1463
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1464
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1466
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1467
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1468
+#: builtin/commit.c:1591
msgid "default"
msgstr ""
-#: builtin/commit.c:1468 builtin/tag.c:460
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1469
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461
-msgid "key id"
-msgstr ""
-
-#: builtin/commit.c:1471 builtin/merge.c:224
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr ""
-#. end commit message options
-#: builtin/commit.c:1474
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1475
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1476
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1477
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1478
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1479
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1480
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/commit.c:1481
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1492
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1493
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1498
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1500
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1529
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1567 builtin/merge.c:518
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr ""
-
-#: builtin/commit.c:1574
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1581
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1600
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1611
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1616
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879
-msgid "failed to write commit object"
-msgstr ""
-
-#: builtin/commit.c:1652
-msgid "cannot lock HEAD ref"
-msgstr ""
-
-#: builtin/commit.c:1656
-msgid "cannot update HEAD ref"
-msgstr ""
-
-#: builtin/commit.c:1667
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full or quota is\n"
+"new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
#: builtin/config.c:8
-msgid "git config [options]"
+msgid "git config [<options>]"
msgstr ""
#: builtin/config.c:54
msgid "open an editor"
msgstr ""
-#: builtin/config.c:73 builtin/config.c:74
-msgid "slot"
-msgstr ""
-
#: builtin/config.c:73
-msgid "find the color configured: [default]"
+msgid "find the color configured: slot [default]"
msgstr ""
#: builtin/config.c:74
-msgid "find the color setting: [stdout-is-tty]"
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
#: builtin/config.c:75
msgstr ""
#: builtin/config.c:82
+msgid "show variable names only"
+msgstr ""
+
+#: builtin/config.c:83
msgid "respect include directives on lookup"
msgstr ""
-#: builtin/count-objects.c:82
+#: builtin/config.c:303
+msgid "unable to parse default color value"
+msgstr ""
+
+#: builtin/config.c:441
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+
+#: builtin/config.c:575
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr ""
+
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr ""
-#: builtin/describe.c:16
-msgid "git describe [options] <commit-ish>*"
+#: builtin/describe.c:17
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/describe.c:17
-msgid "git describe [options] --dirty"
+#: builtin/describe.c:18
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/describe.c:237
+#: builtin/describe.c:217
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:241
+#: builtin/describe.c:221
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/describe.c:243
+#: builtin/describe.c:223
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:270
+#: builtin/describe.c:250 builtin/log.c:459
#, c-format
msgid "Not a valid object name %s"
msgstr ""
-#: builtin/describe.c:273
+#: builtin/describe.c:253
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/describe.c:290
+#: builtin/describe.c:270
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:292
+#: builtin/describe.c:272
#, c-format
msgid "searching to describe %s\n"
msgstr ""
-#: builtin/describe.c:332
+#: builtin/describe.c:319
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:359
+#: builtin/describe.c:346
#, 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:350
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:384
+#: builtin/describe.c:371
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:387
+#: builtin/describe.c:374
#, 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:396
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:410
+#: builtin/describe.c:397
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:411
+#: builtin/describe.c:398
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:412
+#: builtin/describe.c:399
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:413
+#: builtin/describe.c:400
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:414
+#: builtin/describe.c:401
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:417
+#: builtin/describe.c:404
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:419
+#: builtin/describe.c:406
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:421
+#: builtin/describe.c:408
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:423 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:424
+#: builtin/describe.c:411
msgid "mark"
msgstr ""
-#: builtin/describe.c:425
+#: builtin/describe.c:412
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:443
+#: builtin/describe.c:430
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:469
+#: builtin/describe.c:456
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:489
+#: builtin/describe.c:476
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/diff.c:85
+#: builtin/diff.c:86
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/diff.c:236
+#: builtin/diff.c:237
#, c-format
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:357
+#: builtin/diff.c:358
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:400
+#: builtin/diff.c:401
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:409
+#: builtin/diff.c:410
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:416
+#: builtin/diff.c:417
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/fast-export.c:22
+#: builtin/fast-export.c:25
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:673
+#: builtin/fast-export.c:980
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:675
+#: builtin/fast-export.c:982
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:985
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:681
+#: builtin/fast-export.c:988
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:990
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:685
+#: builtin/fast-export.c:992
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:687
+#: builtin/fast-export.c:994
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:689
+#: builtin/fast-export.c:996
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:690
+#: builtin/fast-export.c:997
msgid "Skip output of blob data"
msgstr ""
+#: builtin/fast-export.c:998
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:999
+msgid "Apply refspec to exported refs"
+msgstr ""
+
+#: builtin/fast-export.c:1000
+msgid "anonymize output"
+msgstr ""
+
#: builtin/fetch.c:20
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:75
+#: builtin/fetch.c:90 builtin/pull.c:162
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:77
+#: builtin/fetch.c:92 builtin/pull.c:165
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:79
+#: builtin/fetch.c:94 builtin/pull.c:168
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:80
+#: builtin/fetch.c:95 builtin/pull.c:170
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:82
+#: builtin/fetch.c:97
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:84
+#: builtin/fetch.c:99 builtin/pull.c:172
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:86
+#: builtin/fetch.c:101
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:88
+#: builtin/fetch.c:103 builtin/pull.c:175
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:89
+#: builtin/fetch.c:104 builtin/pull.c:178
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:90
+#: builtin/fetch.c:105 builtin/pull.c:179
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:94
+#: builtin/fetch.c:109 builtin/pull.c:184
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:96
+#: builtin/fetch.c:111
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:99
+#: builtin/fetch.c:114 builtin/pull.c:187
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:101
+#: builtin/fetch.c:116 builtin/pull.c:190
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:103 builtin/log.c:1197
+#: builtin/fetch.c:118 builtin/log.c:1233
msgid "dir"
msgstr ""
-#: builtin/fetch.c:104
+#: builtin/fetch.c:119
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:107
+#: builtin/fetch.c:122
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:109
+#: builtin/fetch.c:124 builtin/pull.c:193
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:347
+#: builtin/fetch.c:125 builtin/pull.c:195
+msgid "refmap"
+msgstr ""
+
+#: builtin/fetch.c:126 builtin/pull.c:196
+msgid "specify fetch refmap"
+msgstr ""
+
+#: builtin/fetch.c:378
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:411
+#: builtin/fetch.c:458
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:416
+#: builtin/fetch.c:463
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:430
+#: builtin/fetch.c:477
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/fetch.c:431 builtin/fetch.c:517
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:442
+#: builtin/fetch.c:489
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497
+#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
msgid " (unable to update local ref)"
msgstr ""
-#: builtin/fetch.c:462
+#: builtin/fetch.c:509
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:465
+#: builtin/fetch.c:512
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:468
+#: builtin/fetch.c:515
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:513
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:513
+#: builtin/fetch.c:561
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:519
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:552 builtin/fetch.c:785
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: builtin/fetch.c:561
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:579
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:667 builtin/fetch.c:750
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:678
+#: builtin/fetch.c:727
#, 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:730
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:731
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:755
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:756 builtin/remote.c:1050
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:775
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:794
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:797
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:853
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1017 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1036
+#: builtin/fetch.c:1092
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:1059
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1107
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1109
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1132
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1145
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1153
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fmt-merge-msg.c:13
-msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
-#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164
-#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446
-#: parse-options.h:135 parse-options.h:242
-msgid "n"
+#: builtin/fmt-merge-msg.c:14
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr ""
-#: builtin/for-each-ref.c:1063
-msgid "git for-each-ref [
options] [<pattern>]"
+#: builtin/for-each-ref.c:9
+msgid "git for-each-ref [
<options>] [<pattern>]"
msgstr ""
-#: builtin/for-each-ref.c:1078
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:1080
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:1082
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:1084
-msgid "quote placeholders suitably for tcl"
+#: builtin/for-each-ref.c:33
+msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/for-each-ref.c:1087
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:1088 builtin/replace.c:177
-msgid "format"
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
+msgid "format to use for the output"
msgstr ""
-#: builtin/for-each-ref.c:1088
-msgid "format to use for the output"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:1089
-msgid "key"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
msgstr ""
-#: builtin/for-each-ref.c:1090
-msgid "field name to sort on"
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr ""
+
+#: builtin/fsck.c:156 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr ""
+
+#: builtin/fsck.c:486
+msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:607
-msgid "git fsck [options] [<object>...]"
+#: builtin/fsck.c:553
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:613
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:614
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:615
+#: builtin/fsck.c:561
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:616
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:617
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:618
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:619
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:620
+#: builtin/fsck.c:566
+msgid "check only connectivity"
+msgstr ""
+
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:622
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:623 builtin/prune.c:144
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr ""
-#: builtin/gc.c:24
-msgid "git gc [options]"
+#: builtin/fsck.c:631
+msgid "Checking objects"
+msgstr ""
+
+#: builtin/gc.c:25
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/gc.c:80
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: builtin/gc.c:107
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr ""
-#: builtin/gc.c:262
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:264
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:265
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:266
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:306
+#: builtin/gc.c:373
#, 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"
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:375
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:376
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#. be quiet on --auto
-#: builtin/gc.c:316
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:341
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#: builtin/grep.c:23
-msgid "git grep [
options] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgid "git grep [
<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
#: builtin/grep.c:218
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:365
-#, c-format
-msgid "Failed to chdir: %s"
-msgstr ""
-
-#: builtin/grep.c:443 builtin/grep.c:478
+#: builtin/grep.c:441 builtin/grep.c:476
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:493
+#: builtin/grep.c:491
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:551
+#: builtin/grep.c:547
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:568
+#: builtin/grep.c:564
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: builtin/grep.c:642
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:644
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:646
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:648
-msgid "search also in ignored files"
+#: builtin/grep.c:639
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:651
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:653
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:655
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:657
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:659
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:662
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:664
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:668
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:671
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:674
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:677
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:680
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:681
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:682
+#: builtin/grep.c:673
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:684
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:686
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:688
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:691
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:693
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:695
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:696
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:698
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:700
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:703
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:706
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:708
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:709
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:712
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:714
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:717
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:719
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:721
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:733
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:735
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:737
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:741
+#: builtin/grep.c:732
msgid "pager"
msgstr ""
-#: builtin/grep.c:741
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:744
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:745 builtin/show-ref.c:187
-msgid "show usage"
-msgstr ""
-
-#: builtin/grep.c:812
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:870
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:893
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:898
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:901
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:909
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr ""
-#: builtin/hash-object.c:60
+#: builtin/hash-object.c:80
msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
-"<file>..."
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/hash-object.c:61
-msgid "git hash-object --stdin-paths < <list-of-paths>"
+#: builtin/hash-object.c:81
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/hash-object.c:72
+#: builtin/hash-object.c:92
msgid "type"
msgstr ""
-#: builtin/hash-object.c:72
+#: builtin/hash-object.c:92
msgid "object type"
msgstr ""
-#: builtin/hash-object.c:73
+#: builtin/hash-object.c:93
msgid "write the object into the object database"
msgstr ""
-#: builtin/hash-object.c:74
+#: builtin/hash-object.c:95
msgid "read the object from stdin"
msgstr ""
-#: builtin/hash-object.c:76
+#: builtin/hash-object.c:97
msgid "store file as is without filters"
msgstr ""
-#: builtin/hash-object.c:77
+#: builtin/hash-object.c:98
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+
+#: builtin/hash-object.c:99
msgid "process file as it were from this path"
msgstr ""
msgstr ""
#: builtin/help.c:52
-msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
#: builtin/help.c:64
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:92
+#: builtin/help.c:91
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:105
+#: builtin/help.c:104
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:113
+#: builtin/help.c:112
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr ""
-#: builtin/help.c:216
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:228
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:353
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:370
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:378
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:424
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr ""
-#: builtin/help.c:425
+#: builtin/help.c:412
+msgid "Everyday Git With 20 Commands Or So"
+msgstr ""
+
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr ""
-#: builtin/help.c:426
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: builtin/help.c:427
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr ""
-#: builtin/help.c:428
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: builtin/help.c:429
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
-#: builtin/help.c:430
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: builtin/help.c:442
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr ""
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:496
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:152
+#, c-format
+msgid "unable to open %s"
+msgstr ""
+
+#: builtin/index-pack.c:202
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:204
-msgid "object of unexpected type"
+#: builtin/index-pack.c:222
+#, c-format
+msgid "did not receive expected object %s"
+msgstr ""
+
+#: builtin/index-pack.c:225
+#, c-format
+msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:244
+#: builtin/index-pack.c:267
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:254
+#: builtin/index-pack.c:277
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:255
+#: builtin/index-pack.c:278
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:290
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:274
+#: builtin/index-pack.c:297
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:313
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:318
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:309
+#: builtin/index-pack.c:332
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:334
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:329
+#: builtin/index-pack.c:352
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr ""
-#: builtin/index-pack.c:451
+#: builtin/index-pack.c:473
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:500
+#: builtin/index-pack.c:522
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:508
+#: builtin/index-pack.c:530
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:516
+#: builtin/index-pack.c:538
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:547
+#: builtin/index-pack.c:569
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:549
+#: builtin/index-pack.c:571
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:597
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
-#: builtin/index-pack.c:729 builtin/index-pack.c:738
+#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
+#: builtin/index-pack.c:806 builtin/index-pack.c:815
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:669 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:263
+#: builtin/index-pack.c:746 builtin/pack-objects.c:162
+#: builtin/pack-objects.c:254
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:735
+#: builtin/index-pack.c:812
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:749
+#: builtin/index-pack.c:826
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:763
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:766
+#: builtin/index-pack.c:843
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:768
+#: builtin/index-pack.c:845
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:839 builtin/index-pack.c:869
+#: builtin/index-pack.c:917 builtin/index-pack.c:948
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1010
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1010
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1036
+#: builtin/index-pack.c:1150
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1041
+#: builtin/index-pack.c:1155
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1044
+#: builtin/index-pack.c:1158
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1055
+#: builtin/index-pack.c:1169
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1078
+#: builtin/index-pack.c:1194
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1088
+#: builtin/index-pack.c:1205
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1247
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1138
+#: builtin/index-pack.c:1253
#, c-format
msgid "completed with %d local objects"
msgstr ""
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1263
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1267
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1177
+#: builtin/index-pack.c:1291
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1256
+#: builtin/index-pack.c:1367
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1280
+#: builtin/index-pack.c:1391
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1404
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1412
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1314
+#: builtin/index-pack.c:1425
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1325
+#: builtin/index-pack.c:1436
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1358
+#: builtin/index-pack.c:1469
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1364
+#: builtin/index-pack.c:1475
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
+#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/index-pack.c:1426
+#: builtin/index-pack.c:1537
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1539
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1475
+#: builtin/index-pack.c:1586
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1482
+#: builtin/index-pack.c:1593
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1510
+#: builtin/index-pack.c:1623
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
-#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
+#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1591
+#: builtin/index-pack.c:1708
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1614
+#: builtin/index-pack.c:1729
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/init-db.c:35
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr ""
-
-#: builtin/init-db.c:62
-#, c-format
-msgid "insanely long template name %s"
-msgstr ""
-
-#: builtin/init-db.c:67
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/init-db.c:73
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/init-db.c:80
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/init-db.c:97
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/init-db.c:99
-#, c-format
-msgid "insanely long symlink %s"
-msgstr ""
-
-#: builtin/init-db.c:102
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/init-db.c:106
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:110
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr ""
-#: builtin/init-db.c:133
-#, c-format
-msgid "insanely long template path %s"
-msgstr ""
-
-#: builtin/init-db.c:141
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr ""
-#: builtin/init-db.c:154
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr ""
-#: builtin/init-db.c:192
-#, c-format
-msgid "insane git directory %s"
-msgstr ""
-
-#: builtin/init-db.c:323 builtin/init-db.c:326
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:355
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:358
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %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:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:421
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr ""
-#: builtin/init-db.c:421
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr ""
-#: builtin/init-db.c:422
+#: builtin/init-db.c:401
msgid " shared"
msgstr ""
-#: builtin/init-db.c:441
-msgid "cannot tell cwd"
-msgstr ""
-
-#: builtin/init-db.c:467
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [directory]"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:490
+#: builtin/init-db.c:471
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:491
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155
-msgid "be quiet"
-msgstr ""
-
-#: builtin/init-db.c:525 builtin/init-db.c:530
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:534
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:556
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:580
-msgid "Cannot access current working directory"
-msgstr ""
-
-#: builtin/init-db.c:587
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/log.c:41
-msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
+"[<file>...]"
+msgstr ""
+
+#: builtin/interpret-trailers.c:25
+msgid "trim empty trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:26
+msgid "trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:27
+msgid "trailer(s) to add"
+msgstr ""
+
+#: builtin/log.c:43
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/log.c:44
+msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:42
-msgid " or: git show [options] <object>..."
+#: builtin/log.c:83
+#, c-format
+msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:125
+#: builtin/log.c:131
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:126
+#: builtin/log.c:132
msgid "show source"
msgstr ""
-#: builtin/log.c:127
+#: builtin/log.c:133
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:128
+#: builtin/log.c:134
msgid "decorate options"
msgstr ""
-#: builtin/log.c:231
+#: builtin/log.c:137
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+
+#: builtin/log.c:233
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:473 builtin/log.c:565
+#: builtin/log.c:465
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:479 builtin/log.c:572
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:589
+#: builtin/log.c:596
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:689
+#: builtin/log.c:714
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:771
+#: builtin/log.c:798
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:787
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:801
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:809
+#: builtin/log.c:837
msgid "Not a range."
msgstr ""
-#: builtin/log.c:911
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:987
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1015
-msgid "git format-patch [options] [<since> | <revision range>]"
+#: builtin/log.c:1050
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1060
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1175
+#: builtin/log.c:1211
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1178
+#: builtin/log.c:1214
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1182
+#: builtin/log.c:1218
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1184
+#: builtin/log.c:1220
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1186
+#: builtin/log.c:1222
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1187
+#: builtin/log.c:1223
msgid "sfx"
msgstr ""
-#: builtin/log.c:1188
+#: builtin/log.c:1224
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1190
+#: builtin/log.c:1226
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1192
+#: builtin/log.c:1228
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1194
+#: builtin/log.c:1230
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1197
+#: builtin/log.c:1233
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1200
+#: builtin/log.c:1236
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1203
+#: builtin/log.c:1239
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1205
+#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1207
+#: builtin/log.c:1245
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1209
+#: builtin/log.c:1247
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1210
+#: builtin/log.c:1248
msgid "header"
msgstr ""
-#: builtin/log.c:1211
+#: builtin/log.c:1249
msgid "add email header"
msgstr ""
-#: builtin/log.c:1212 builtin/log.c:1214
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr ""
-#: builtin/log.c:1212
+#: builtin/log.c:1250
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1214
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1216
+#: builtin/log.c:1254
msgid "ident"
msgstr ""
-#: builtin/log.c:1217
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1219
+#: builtin/log.c:1257
msgid "message-id"
msgstr ""
-#: builtin/log.c:1220
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1221 builtin/log.c:1224
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr ""
-#: builtin/log.c:1222
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1225
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1229
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1231
+#: builtin/log.c:1269
msgid "signature"
msgstr ""
-#: builtin/log.c:1232
+#: builtin/log.c:1270
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1233
-msgid "don't print the patch filenames"
+#: builtin/log.c:1272
+msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1307
-#, c-format
-msgid "invalid ident line: %s"
+#: builtin/log.c:1273
+msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1322
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1324
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1332
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1334
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1336
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1359
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1361
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1509
+#: builtin/log.c:1500
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1558
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1613
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/ls-files.c:398
-msgid "git ls-files [options] [<file>...]"
+#: builtin/ls-files.c:358
+msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:415
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:417
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:459
+#: builtin/ls-files.c:419
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:421
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:423
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:425
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:467
+#: builtin/ls-files.c:427
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:430
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:432
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:474
-msgid "show 'other' directories' name only"
+#: builtin/ls-files.c:434
+msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:477
+#: builtin/ls-files.c:437
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:440
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:442
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:484
+#: builtin/ls-files.c:444
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:447
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:450
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:492
+#: builtin/ls-files.c:452
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:495
+#: builtin/ls-files.c:455
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:498
+#: builtin/ls-files.c:458
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:499
+#: builtin/ls-files.c:459
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:460
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:502
+#: builtin/ls-files.c:462
msgid "show debugging data"
msgstr ""
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/ls-tree.c:126
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr ""
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr ""
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr ""
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr ""
-#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr ""
-#: builtin/ls-tree.c:141
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr ""
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
-#: builtin/merge.c:43
-msgid "git merge [options] [<commit>...]"
+#: builtin/merge.c:45
+msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:44
-msgid "git merge [options] <msg> HEAD <commit>"
+#: builtin/merge.c:46
+msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr ""
-#: builtin/merge.c:45
+#: builtin/merge.c:47
msgid "git merge --abort"
msgstr ""
-#: builtin/merge.c:98
+#: builtin/merge.c:100
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:135
+#: builtin/merge.c:137
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:136
+#: builtin/merge.c:138
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:141
+#: builtin/merge.c:143
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:191
+#: builtin/merge.c:193 builtin/pull.c:119
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:194
+#: builtin/merge.c:196 builtin/pull.c:122
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:195
+#: builtin/merge.c:197 builtin/pull.c:125
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:197
+#: builtin/merge.c:199 builtin/pull.c:128
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:200
+#: builtin/merge.c:202 builtin/pull.c:131
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:202
+#: builtin/merge.c:204 builtin/pull.c:134
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:204
+#: builtin/merge.c:206 builtin/pull.c:137
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:205
+#: builtin/merge.c:207
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:207
+#: builtin/merge.c:209 builtin/pull.c:143
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:211
+#: builtin/merge.c:213
msgid "Verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89
+#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
+#: builtin/revert.c:89
msgid "strategy"
msgstr ""
-#: builtin/merge.c:213
+#: builtin/merge.c:215 builtin/pull.c:149
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:214
+#: builtin/merge.c:216 builtin/pull.c:152
msgid "option=value"
msgstr ""
-#: builtin/merge.c:215
+#: builtin/merge.c:217 builtin/pull.c:153
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:217
+#: builtin/merge.c:219
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:221
+#: builtin/merge.c:223
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:250
+#: builtin/merge.c:251
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:255
+#: builtin/merge.c:256
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:260
+#: builtin/merge.c:261
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:279 builtin/merge.c:296
+#: builtin/merge.c:280 builtin/merge.c:297
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:326
+#: builtin/merge.c:327
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:339
+#: builtin/merge.c:340
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:371
+#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
+#: builtin/merge.c:988
+#, c-format
+msgid "Could not write to '%s'"
+msgstr ""
+
+#: builtin/merge.c:372
msgid "Writing SQUASH_MSG"
msgstr ""
-#: builtin/merge.c:373
+#: builtin/merge.c:374
msgid "Finishing SQUASH_MSG"
msgstr ""
-#: builtin/merge.c:396
+#: builtin/merge.c:397
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:446
+#: builtin/merge.c:447
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:558
+#: builtin/merge.c:537
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:650
-msgid "git write-tree failed to write a tree"
-msgstr ""
-
-#: builtin/merge.c:678
+#: builtin/merge.c:656
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:692
+#: builtin/merge.c:670
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:706
+#: builtin/merge.c:683
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:795
+#: builtin/merge.c:772
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:804
+#: builtin/merge.c:781
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:810
+#: builtin/merge.c:787
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:834
+#: builtin/merge.c:811
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:846
+#: builtin/merge.c:823
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:911
+#: builtin/merge.c:878
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:927
+#: builtin/merge.c:894
#, c-format
msgid "'%s' is not a commit"
msgstr ""
-#: builtin/merge.c:968
+#: builtin/merge.c:935
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:970
+#: builtin/merge.c:937
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:972
+#: builtin/merge.c:939
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:977
+#: builtin/merge.c:944
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1133
+#: builtin/merge.c:1079
+#, c-format
+msgid "could not close '%s'"
+msgstr ""
+
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1149 git-pull.sh:31
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
-msgstr ""
-
-#: builtin/merge.c:1152 git-pull.sh:34
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1156
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1159
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1168
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1177
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1209
-msgid "Can merge only exactly one commit into empty head"
-msgstr ""
-
-#: builtin/merge.c:1212
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1214
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1219
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1270
+#: builtin/merge.c:1276
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1273
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#. 'N'
-#: builtin/merge.c:1276
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1279
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/merge.c:1363
+#: builtin/merge.c:1423
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1402
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1409
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1441
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1464 builtin/merge.c:1543
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1468
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1534
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1536
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1545
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1557
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
#: builtin/merge-base.c:29
-msgid "git merge-base [-a|--all] <commit> <commit>..."
+msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
#: builtin/merge-base.c:30
-msgid "git merge-base [-a|--all] --octopus <commit>..."
+msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
#: builtin/merge-base.c:31
#: builtin/merge-file.c:8
msgid ""
-"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
-"file2"
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
msgstr ""
#: builtin/merge-file.c:33
msgstr ""
#: builtin/merge-file.c:45
-msgid "set labels for file1/orig_file/file2"
+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:15
-msgid "git mv [options] <source>... <destination>"
+msgid "git mv [<options>] <source>... <destination>"
msgstr ""
-#: builtin/mv.c:71
-msgid "force move/rename even if target exists"
+#: builtin/mv.c:69
+#, c-format
+msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/mv.c:72
-msgid "skip move/rename errors"
+#: builtin/mv.c:71
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/mv.c:122
+#: builtin/mv.c:89
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+msgid "%.*s is in index"
msgstr ""
-#: builtin/mv.c:126
-msgid "bad source"
+#: builtin/mv.c:111
+msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/mv.c:129
-msgid "can not move directory into itself"
+#: builtin/mv.c:112
+msgid "skip move/rename errors"
msgstr ""
-#: builtin/mv.c:132
-msgid "cannot move directory over file"
+#: builtin/mv.c:151
+#, c-format
+msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/mv.c:138
+#: builtin/mv.c:162
#, c-format
-msgid "Huh? Directory %s is in index and no submodule?"
+msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/mv.c:140 builtin/rm.c:318
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#: builtin/mv.c:166
+msgid "bad source"
msgstr ""
-#: builtin/mv.c:156
-#, c-format
-msgid "Huh? %.*s is in index?"
+#: builtin/mv.c:169
+msgid "can not move directory into itself"
+msgstr ""
+
+#: builtin/mv.c:172
+msgid "cannot move directory over file"
msgstr ""
-#: builtin/mv.c:168
+#: builtin/mv.c:181
msgid "source directory is empty"
msgstr ""
-#: builtin/mv.c:200
+#: builtin/mv.c:206
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:202
+#: builtin/mv.c:209
msgid "destination exists"
msgstr ""
-#: builtin/mv.c:210
+#: builtin/mv.c:217
#, c-format
msgid "overwriting '%s'"
msgstr ""
-#: builtin/mv.c:213
+#: builtin/mv.c:220
msgid "Cannot overwrite"
msgstr ""
-#: builtin/mv.c:216
+#: builtin/mv.c:223
msgid "multiple sources for the same target"
msgstr ""
-#: builtin/mv.c:218
+#: builtin/mv.c:225
msgid "destination directory does not exist"
msgstr ""
-#: builtin/mv.c:233
+#: builtin/mv.c:232
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/mv.c:243
+#: builtin/mv.c:253
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:258
-msgid "git name-rev [options] <commit>..."
+#: builtin/name-rev.c:251
+msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:259
-msgid "git name-rev [options] --all"
+#: builtin/name-rev.c:252
+msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:260
-msgid "git name-rev [options] --stdin"
+#: builtin/name-rev.c:253
+msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr ""
-#: builtin/notes.c:24
-msgid "git notes [--ref <notes_ref>] [list [<object>]]"
-msgstr ""
-
#: builtin/notes.c:25
-msgid ""
-"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
-"<object>] [<object>]"
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
#: builtin/notes.c:26
-msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
msgstr ""
#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
-"<object>] [<object>]"
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
#: builtin/notes.c:28
-msgid "git notes [--ref <notes_ref>] edit [<object>]"
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
msgstr ""
#: builtin/notes.c:29
-msgid "git notes [--ref <notes_ref>] show [<object>]"
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
#: builtin/notes.c:30
-msgid ""
-"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
+msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
#: builtin/notes.c:31
-msgid "git notes merge --commit [-v | -q]"
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
#: builtin/notes.c:32
-msgid "git notes merge --abort [-v | -q]"
+msgid "git notes merge --commit [-v | -q]"
msgstr ""
#: builtin/notes.c:33
-msgid "git notes [--ref <notes_ref>] remove [<object>...]"
+msgid "git notes merge --abort [-v | -q]"
msgstr ""
#: builtin/notes.c:34
-msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
#: builtin/notes.c:35
-msgid "git notes [--ref <notes_ref>] get-ref"
+msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgstr ""
+
+#: builtin/notes.c:36
+msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
-#: builtin/notes.c:40
+#: builtin/notes.c:41
msgid "git notes [list [<object>]]"
msgstr ""
-#: builtin/notes.c:45
+#: builtin/notes.c:46
msgid "git notes add [<options>] [<object>]"
msgstr ""
-#: builtin/notes.c:50
+#: builtin/notes.c:51
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
-#: builtin/notes.c:51
+#: builtin/notes.c:52
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
-#: builtin/notes.c:56
+#: builtin/notes.c:57
msgid "git notes append [<options>] [<object>]"
msgstr ""
-#: builtin/notes.c:61
+#: builtin/notes.c:62
msgid "git notes edit [<object>]"
msgstr ""
-#: builtin/notes.c:66
+#: builtin/notes.c:67
msgid "git notes show [<object>]"
msgstr ""
-#: builtin/notes.c:71
-msgid "git notes merge [<options>] <notes_ref>"
+#: builtin/notes.c:72
+msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
-#: builtin/notes.c:72
+#: builtin/notes.c:73
msgid "git notes merge --commit [<options>]"
msgstr ""
-#: builtin/notes.c:73
+#: builtin/notes.c:74
msgid "git notes merge --abort [<options>]"
msgstr ""
-#: builtin/notes.c:78
+#: builtin/notes.c:79
msgid "git notes remove [<object>]"
msgstr ""
-#: builtin/notes.c:83
+#: builtin/notes.c:84
msgid "git notes prune [<options>]"
msgstr ""
-#: builtin/notes.c:88
+#: builtin/notes.c:89
msgid "git notes get-ref"
msgstr ""
-#: builtin/notes.c:137
+#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:141
+#: builtin/notes.c:151
msgid "could not read 'show' output"
msgstr ""
-#: builtin/notes.c:149
+#: builtin/notes.c:159
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:167 builtin/tag.c:341
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: builtin/notes.c:186
+#: builtin/notes.c:193
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:207 builtin/notes.c:844
-#, c-format
-msgid "Removing note for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:212
+#: builtin/notes.c:202
msgid "unable to write note object"
msgstr ""
-#: builtin/notes.c:214
+#: builtin/notes.c:204
#, c-format
-msgid "The note contents has been left in %s"
+msgid "The note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:248 builtin/tag.c:537
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:250 builtin/tag.c:540
+#: builtin/notes.c:234 builtin/tag.c:443
#, 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:553
+#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
+#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
+#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:272
+#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
msgstr ""
-#: builtin/notes.c:312
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr ""
-
-#: builtin/notes.c:327
+#: builtin/notes.c:260
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "Cannot read note data from non-blob object '%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:359 builtin/notes.c:414 builtin/notes.c:490
+#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
+#: builtin/notes.c:942
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:384 builtin/notes.c:643
+#: builtin/notes.c:372 builtin/notes.c:659
#, c-format
msgid "No note found for object %s."
msgstr ""
-#: builtin/notes.c:406 builtin/notes.c:563
+#: builtin/notes.c:393 builtin/notes.c:556
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:566
+#: builtin/notes.c:396 builtin/notes.c:559
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
-msgid "object"
-msgstr ""
-
-#: builtin/notes.c:412 builtin/notes.c:569
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:572
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:417 builtin/notes.c:485
+#: builtin/notes.c:405 builtin/notes.c:568
+msgid "allow storing empty note"
+msgstr ""
+
+#: builtin/notes.c:406 builtin/notes.c:477
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:451
+#: builtin/notes.c:431
#, 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:446 builtin/notes.c:525
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:486
+#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:478
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:488
+#: builtin/notes.c:480
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:506
+#: builtin/notes.c:498
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:527
+#: builtin/notes.c:519
#, 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:531
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:588
+#: builtin/notes.c:583
#, 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:764
msgid "General options"
msgstr ""
-#: builtin/notes.c:737
+#: builtin/notes.c:766
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:739
+#: builtin/notes.c:768
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:741
+#: builtin/notes.c:770
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:743
+#: builtin/notes.c:772
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:745
+#: builtin/notes.c:774
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:747
+#: builtin/notes.c:776
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:842
+#: builtin/notes.c:853
+#, c-format
+msgid "A notes merge into %s is already in-progress at %s"
+msgstr ""
+
+#: builtin/notes.c:880
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:854
+#: builtin/notes.c:892
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:857
+#: builtin/notes.c:895
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:938
-msgid "notes_ref"
+#: builtin/notes.c:976
+msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:939
-msgid "use notes from <notes_ref>"
+#: builtin/notes.c:977
+msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:974 builtin/remote.c:1593
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:23
-msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
+#: builtin/pack-objects.c:28
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:24
-msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
+#: builtin/pack-objects.c:29
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
+#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:2396
-#, c-format
-msgid "unsupported index version %s"
+#: builtin/pack-objects.c:771
+msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:2400
-#, c-format
-msgid "bad index version '%s'"
+#: builtin/pack-objects.c:1011
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2171
+msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2423
+#: builtin/pack-objects.c:2568
#, c-format
-msgid "option %s does not accept negative form"
+msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2427
+#: builtin/pack-objects.c:2572
#, c-format
-msgid "unable to parse value '%s' for option %s"
+msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2446
+#: builtin/pack-objects.c:2602
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2604
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2450
+#: builtin/pack-objects.c:2606
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2453
+#: builtin/pack-objects.c:2609
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2454
+#: builtin/pack-objects.c:2610
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2455
+#: builtin/pack-objects.c:2611
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2458
+#: builtin/pack-objects.c:2614
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2460
+#: builtin/pack-objects.c:2616
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2462
+#: builtin/pack-objects.c:2618
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2464
+#: builtin/pack-objects.c:2620
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2466
+#: builtin/pack-objects.c:2622
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2468
+#: builtin/pack-objects.c:2624
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2470
+#: builtin/pack-objects.c:2626
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2472
+#: builtin/pack-objects.c:2628
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2474
+#: builtin/pack-objects.c:2630
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2476
+#: builtin/pack-objects.c:2632
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2478
+#: builtin/pack-objects.c:2634
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2480
+#: builtin/pack-objects.c:2636
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2482
+#: builtin/pack-objects.c:2638
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2485
+#: builtin/pack-objects.c:2641
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2488
+#: builtin/pack-objects.c:2644
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2491
+#: builtin/pack-objects.c:2647
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:2650
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2493
+#: builtin/pack-objects.c:2652
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2495
+#: builtin/pack-objects.c:2654
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2496 parse-options.h:143
+#: builtin/pack-objects.c:2655 parse-options.h:142
msgid "time"
msgstr ""
-#: builtin/pack-objects.c:2497
+#: builtin/pack-objects.c:2656
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2500
+#: builtin/pack-objects.c:2659
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2502
+#: builtin/pack-objects.c:2661
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:2663
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2504
+#: builtin/pack-objects.c:2665
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2506
+#: builtin/pack-objects.c:2667
msgid "do not hide commits by grafts"
msgstr ""
+#: builtin/pack-objects.c:2669
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2671
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2762
+msgid "Counting objects"
+msgstr ""
+
#: builtin/pack-refs.c:6
-msgid "git pack-refs [options]"
+msgid "git pack-refs [<options>]"
msgstr ""
#: builtin/pack-refs.c:14
msgstr ""
#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr ""
+
+#: builtin/prune-packed.c:40
+msgid "Removing duplicate objects"
msgstr ""
-#: builtin/prune.c:12
+#: builtin/prune.c:11
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:142
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr ""
-#: builtin/prune.c:143
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:146
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr ""
-#: builtin/push.c:14
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:69
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/pull.c:113
+msgid "Options related to merging"
+msgstr ""
+
+#: builtin/pull.c:116
+msgid "incorporate changes by rebasing rather than merging"
+msgstr ""
+
+#: builtin/pull.c:140 builtin/revert.c:105
+msgid "allow fast-forward"
+msgstr ""
+
+#: builtin/pull.c:146
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/pull.c:160
+msgid "Options related to fetching"
+msgstr ""
+
+#: builtin/pull.c:268
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr ""
+
+#: builtin/pull.c:352
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+
+#: builtin/pull.c:358
+msgid "Additionally, your index contains uncommitted changes."
+msgstr ""
+
+#: builtin/pull.c:360
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+
+#: builtin/pull.c:436
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:438
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:439
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:442
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+
+#: builtin/pull.c:447
+msgid "You are not currently on a branch."
+msgstr ""
+
+#: builtin/pull.c:449 builtin/pull.c:464
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:451 builtin/pull.c:466
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:452 builtin/pull.c:467
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:462
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:471
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+msgstr ""
+
+#: builtin/pull.c:476
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+
+#: builtin/pull.c:830
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:859
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:864
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+
+#: builtin/pull.c:879
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:883
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/push.c:86
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/push.c:96
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:141
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:144
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
"%s"
msgstr ""
-#: builtin/push.c:159
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:173
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:181
+#: builtin/push.c:182
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:184
+#: builtin/push.c:185
#, 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:207
+#: builtin/push.c:208
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"
"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"
-"In Git 2.0, Git will default to the more conservative 'simple'\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"
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr ""
-#: builtin/push.c:274
+#: builtin/push.c:275
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:281
+#: builtin/push.c:282
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:287
-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:293
+#: builtin/push.c:288
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:299
+#: builtin/push.c:294
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:306
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:309
+#: builtin/push.c:304
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:375
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:379
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:412
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:413
+#: builtin/push.c:398
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:428
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:429
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:434
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:435
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:440
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:500
+#: builtin/push.c:537
msgid "repository"
msgstr ""
-#: builtin/push.c:501
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr ""
-#: builtin/push.c:502
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:504
+#: builtin/push.c:541
msgid "delete refs"
msgstr ""
-#: builtin/push.c:505
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:508
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr ""
-#: builtin/push.c:510
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr ""
-#: builtin/push.c:511
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:513
-msgid "check"
+#: builtin/push.c:550
+msgid "check|on-demand|no"
msgstr ""
-#: builtin/push.c:514
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:516
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:517 builtin/push.c:518
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
+#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:519
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:522
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:524
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:525
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:535
+#: builtin/push.c:565 builtin/send-pack.c:166
+msgid "GPG sign the push"
+msgstr ""
+
+#: builtin/push.c:567 builtin/send-pack.c:170
+msgid "request atomic transaction on remote side"
+msgstr ""
+
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:537
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/read-tree.c:36
+#: builtin/read-tree.c:37
msgid ""
-"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-#: builtin/read-tree.c:109
+#: builtin/read-tree.c:110
msgid "write resulting index to <file>"
msgstr ""
-#: builtin/read-tree.c:112
+#: builtin/read-tree.c:113
msgid "only empty the index"
msgstr ""
-#: builtin/read-tree.c:114
+#: builtin/read-tree.c:115
msgid "Merging"
msgstr ""
-#: builtin/read-tree.c:116
+#: builtin/read-tree.c:117
msgid "perform a merge in addition to a read"
msgstr ""
-#: builtin/read-tree.c:118
+#: builtin/read-tree.c:119
msgid "3-way merge if no file level merging required"
msgstr ""
-#: builtin/read-tree.c:120
+#: builtin/read-tree.c:121
msgid "3-way merge in presence of adds and removes"
msgstr ""
-#: builtin/read-tree.c:122
+#: builtin/read-tree.c:123
msgid "same as -m, but discard unmerged entries"
msgstr ""
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "<subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:125
msgid "read the tree into the index under <subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:128
msgid "update working tree with merge result"
msgstr ""
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:130
msgid "gitignore"
msgstr ""
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "allow explicitly ignored files to be overwritten"
msgstr ""
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:134
msgid "don't check the working tree after merging"
msgstr ""
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "don't update the index or the work tree"
msgstr ""
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "debug unpack-trees"
msgstr ""
-#: builtin/reflog.c:499
+#: builtin/reflog.c:428
#, c-format
-msgid "%s' for '%s' is not a valid timestamp"
+msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: builtin/reflog.c:615 builtin/reflog.c:620
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
#: builtin/remote.c:13
msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr ""
-#: builtin/remote.c:16
-msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+#: builtin/remote.c:16 builtin/remote.c:44
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
#: builtin/remote.c:17
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr ""
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: builtin/remote.c:43
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
-msgstr ""
-
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr ""
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr ""
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr ""
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr ""
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr ""
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr ""
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr ""
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr ""
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr ""
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr ""
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:185 builtin/remote.c:641
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:189 builtin/remote.c:645
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/remote.c:233
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/remote.c:289
-#, c-format
-msgid "more than one %s"
-msgstr ""
-
-#: builtin/remote.c:334
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/remote.c:435 builtin/remote.c:443
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr ""
-#: builtin/remote.c:447
+#: builtin/remote.c:454
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr ""
-#: builtin/remote.c:651
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:657 builtin/remote.c:794
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:672
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:678
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr ""
-#: builtin/remote.c:689
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr ""
-#: builtin/remote.c:711
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:745
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:759
-#, c-format
-msgid "Could not remove branch %s"
-msgstr ""
-
-#: builtin/remote.c:829
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:938
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:941
+#: builtin/remote.c:931
msgid " tracked"
msgstr ""
-#: builtin/remote.c:943
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:945
+#: builtin/remote.c:935
msgid " ???"
msgstr ""
-#: builtin/remote.c:986
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:993
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:996
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:997
+#: builtin/remote.c:987
msgid " and with remote"
msgstr ""
-#: builtin/remote.c:999
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:1000
+#: builtin/remote.c:990
msgid " and with remote"
msgstr ""
-#: builtin/remote.c:1046
+#: builtin/remote.c:1036
msgid "create"
msgstr ""
-#: builtin/remote.c:1049
+#: builtin/remote.c:1039
msgid "delete"
msgstr ""
-#: builtin/remote.c:1053
+#: builtin/remote.c:1043
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1056
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1059
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1066
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1069
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1073
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1076
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1144
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1171
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1172
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1173 builtin/remote.c:1318
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr ""
-#: builtin/remote.c:1182 builtin/remote.c:1184
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1192
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1204
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1207 builtin/remote.c:1234
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1216
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1224
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1231
+#: builtin/remote.c:1221
#, 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:1252
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1254
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1269
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1271
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1281
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1289
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1291
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1307
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1308
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1314
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1315
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1328
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1331
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1374
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1440 builtin/remote.c:1514
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1460
+#: builtin/remote.c:1461
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1489
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr ""
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr ""
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1491
+#: builtin/remote.c:1543
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1493
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1500
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1540
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1548
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1550
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1564
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/repack.c:15
-msgid "git repack [options]"
+#: builtin/repack.c:17
+msgid "git repack [<options>]"
msgstr ""
-#: builtin/repack.c:143
+#: builtin/repack.c:159
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:145
+#: builtin/repack.c:161
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:148
+#: builtin/repack.c:164
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:150
+#: builtin/repack.c:166
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:152
+#: builtin/repack.c:168
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:154
+#: builtin/repack.c:170
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:157
+#: builtin/repack.c:173
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:158
+#: builtin/repack.c:175
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:176
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:159
+#: builtin/repack.c:177
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:161
+#: builtin/repack.c:179
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:162 builtin/repack.c:166
+#: builtin/repack.c:180 builtin/repack.c:184
msgid "bytes"
msgstr ""
-#: builtin/repack.c:163
+#: builtin/repack.c:181
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:165
+#: builtin/repack.c:183
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:167
+#: builtin/repack.c:185
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:343
+#: builtin/repack.c:187
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr ""
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr ""
-#: builtin/replace.c:17
+#: builtin/replace.c:19
msgid "git replace [-f] <object> <replacement>"
msgstr ""
-#: builtin/replace.c:18
+#: builtin/replace.c:20
+msgid "git replace [-f] --edit <object>"
+msgstr ""
+
+#: builtin/replace.c:21
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr ""
+
+#: builtin/replace.c:22
msgid "git replace -d <object>..."
msgstr ""
-#: builtin/replace.c:19
+#: builtin/replace.c:23
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/replace.c:174
+#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#, c-format
+msgid "Not a valid object name: '%s'"
+msgstr ""
+
+#: builtin/replace.c:355
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:357
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:368
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:401
+#, c-format
+msgid "the original commit '%s' has a gpg signature."
+msgstr ""
+
+#: builtin/replace.c:402
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:408
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:432
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:175
+#: builtin/replace.c:433
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:176
+#: builtin/replace.c:434
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:435
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:436
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:177
+#: builtin/replace.c:437
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:438
msgid "use this format"
msgstr ""
#: builtin/rerere.c:12
-msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr ""
-#: builtin/reset.c:25
+#: builtin/reset.c:26
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: builtin/reset.c:26
+#: builtin/reset.c:27
msgid "git reset [-q] <tree-ish> [--] <paths>..."
msgstr ""
-#: builtin/reset.c:27
+#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr ""
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "mixed"
msgstr ""
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "soft"
msgstr ""
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "hard"
msgstr ""
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "merge"
msgstr ""
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "keep"
msgstr ""
-#: builtin/reset.c:73
+#: builtin/reset.c:74
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:75
+#: builtin/reset.c:76
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:81
+#: builtin/reset.c:82
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:99
+#: builtin/reset.c:100
#, c-format
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/reset.c:172
+#: builtin/reset.c:183
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:262
+#: builtin/reset.c:276
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:264
+#: builtin/reset.c:278
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:265
+#: builtin/reset.c:279
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:267 builtin/reset.c:269
+#: builtin/reset.c:281 builtin/reset.c:283
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:271
+#: builtin/reset.c:285
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:289
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+#: builtin/reset.c:288
+msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:292 builtin/reset.c:300
+#: builtin/reset.c:305
#, c-format
-msgid "Could not parse object '%s'."
+msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:297
+#: builtin/reset.c:313
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:306
+#: builtin/reset.c:322
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:315
+#: builtin/reset.c:331
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:317
+#: builtin/reset.c:333
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:327
+#: builtin/reset.c:343
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:344
+#: builtin/reset.c:347
+msgid "-N can only be used with --mixed"
+msgstr ""
+
+#: builtin/reset.c:364
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:350
+#: builtin/reset.c:370
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:355
+#: builtin/reset.c:374
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-parse.c:359
-msgid "git rev-parse --parseopt [options] -- [<args>...]"
+#: builtin/rev-list.c:354
+msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-parse.c:364
+#: builtin/rev-parse.c:358
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr ""
+
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:369
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:486
+#: builtin/rev-parse.c:499
msgid ""
-"git rev-parse --parseopt [
options] -- [<args>...]\n"
+"git rev-parse --parseopt [
<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
-" or: git rev-parse [
options] [<arg>...]\n"
+" or: git rev-parse [
<options>] [<arg>...]\n"
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
#: builtin/revert.c:22
-msgid "git revert [options] <commit-ish>..."
+msgid "git revert [<options>] <commit-ish>..."
msgstr ""
#: builtin/revert.c:23
msgstr ""
#: builtin/revert.c:28
-msgid "git cherry-pick [options] <commit-ish>..."
+msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
#: builtin/revert.c:29
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:103
-msgid "allow fast-forward"
-msgstr ""
-
-#: builtin/revert.c:104
+#: builtin/revert.c:106
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:105
+#: builtin/revert.c:107
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/revert.c:106
+#: builtin/revert.c:108
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:110
+#: builtin/revert.c:112
msgid "program error"
msgstr ""
-#: builtin/revert.c:195
+#: builtin/revert.c:197
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:210
+#: builtin/revert.c:212
msgid "cherry-pick failed"
msgstr ""
#: builtin/rm.c:17
-msgid "git rm [options] [--] <file>..."
+msgid "git rm [<options>] [--] <file>..."
msgstr ""
#: builtin/rm.c:65
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
msgid_plural ""
-"the following submodules (or one of its nested submodules)\n"
+"the following submodules (or one of their nested submodules)\n"
"use a .git directory:"
msgstr[0] ""
msgstr[1] ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: builtin/rm.c:231
+#: builtin/rm.c:230
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:236
+#: builtin/rm.c:235
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
-#: builtin/rm.c:240
+#: builtin/rm.c:239
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:244 builtin/rm.c:255
+#: builtin/rm.c:243 builtin/rm.c:254
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/rm.c:252
+#: builtin/rm.c:251
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:270
+#: builtin/rm.c:269
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:271
+#: builtin/rm.c:270
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:272
+#: builtin/rm.c:271
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:273
+#: builtin/rm.c:272
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:275
+#: builtin/rm.c:274
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:336
+#: builtin/rm.c:317
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:375
+#: builtin/rm.c:374
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
+#: builtin/send-pack.c:18
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+
+#: builtin/send-pack.c:160
+msgid "remote name"
+msgstr ""
+
+#: builtin/send-pack.c:171
+msgid "use stateless RPC protocol"
+msgstr ""
+
+#: builtin/send-pack.c:172
+msgid "read refs from stdin"
+msgstr ""
+
+#: builtin/send-pack.c:173
+msgid "print status from remote helper"
+msgstr ""
+
#: builtin/shortlog.c:13
-msgid "git shortlog [<options>] [<revision
range>] [[--] [<path>...]]"
+msgid "git shortlog [<options>] [<revision
-range>] [[--] [<path>...]]"
msgstr ""
#: builtin/shortlog.c:131
msgid "Linewrap output"
msgstr ""
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
-"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
-"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
-"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
-"<glob>)...]"
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-#: builtin/show-branch.c:10
-msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/show-branch.c:14
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:673
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:679
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
#: builtin/show-ref.c:10
msgid ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=pattern] < ref-list"
+msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/show-ref.c:168
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/show-ref.c:169
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:173 builtin/show-ref.c:175
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/show-ref.c:177
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:183
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr ""
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr ""
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr ""
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr ""
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr ""
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr ""
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr ""
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr ""
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr ""
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr ""
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr ""
+
#: builtin/symbolic-ref.c:7
-msgid "git symbolic-ref [options] name [ref]"
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref -d [-q] name"
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
#: builtin/symbolic-ref.c:40
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr ""
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
-"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
-"\t\t[<pattern>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
+"\t\t[
--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr ""
-#: builtin/tag.c:60
-#, c-format
-msgid "malformed object at '%s'"
-msgstr ""
-
-#: builtin/tag.c:207
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr ""
-#: builtin/tag.c:212
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:227
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:239
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr ""
-#: builtin/tag.c:249
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
-"Write a tag message\n"
+"Write a message for tag:\n"
+" %s\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:253
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
-"Write a tag message\n"
+"Write a message for tag:\n"
+" %s\n"
"Lines starting with '%c' will be kept; you may remove them yourself if you "
"want to.\n"
msgstr ""
-#: builtin/tag.c:292
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:294
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:319
+#: builtin/tag.c:226
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:332
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr ""
-#: builtin/tag.c:368
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:374
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:423
-msgid "switch 'points-at' requires an object"
-msgstr ""
-
-#: builtin/tag.c:425
-#, c-format
-msgid "malformed object name '%s'"
-msgstr ""
-
-#: builtin/tag.c:445
+#: builtin/tag.c:339
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:447
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:449
+#: builtin/tag.c:343
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:450
+#: builtin/tag.c:344
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:452
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:454
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:456
+#: builtin/tag.c:350
msgid "tag message"
msgstr ""
-#: builtin/tag.c:458
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:462
-msgid "use another key to sign the tag"
+#: builtin/tag.c:356
+msgid "use another key to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:357
+msgid "replace the tag if exists"
+msgstr ""
+
+#: builtin/tag.c:358 builtin/update-ref.c:368
+msgid "create a reflog"
+msgstr ""
+
+#: builtin/tag.c:360
+msgid "Tag listing options"
+msgstr ""
+
+#: builtin/tag.c:361
+msgid "show tag list in columns"
+msgstr ""
+
+#: builtin/tag.c:362 builtin/tag.c:363
+msgid "print only tags that contain the commit"
+msgstr ""
+
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr ""
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr ""
+
+#: builtin/tag.c:370
+msgid "print only tags of the object"
+msgstr ""
+
+#: builtin/tag.c:399
+msgid "--column and -n are incompatible"
+msgstr ""
+
+#: builtin/tag.c:419
+msgid "-n option is only allowed with -l."
+msgstr ""
+
+#: builtin/tag.c:421
+msgid "--contains option is only allowed with -l."
+msgstr ""
+
+#: builtin/tag.c:423
+msgid "--points-at option is only allowed with -l."
+msgstr ""
+
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr ""
+
+#: builtin/tag.c:433
+msgid "only one -F or -m option is allowed."
+msgstr ""
+
+#: builtin/tag.c:453
+msgid "too many params"
+msgstr ""
+
+#: builtin/tag.c:459
+#, c-format
+msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:463
-msgid "replace the tag if exists"
+#: builtin/tag.c:464
+#, c-format
+msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:464
-msgid "show tag list in columns"
+#: builtin/tag.c:489
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:466
-msgid "Tag listing options"
+#: builtin/unpack-objects.c:490
+msgid "Unpacking objects"
msgstr ""
-#: builtin/tag.c:469
-msgid "print only tags that contain the commit"
+#: builtin/update-index.c:70
+#, c-format
+msgid "failed to create directory %s"
msgstr ""
-#: builtin/tag.c:475
-msgid "print only tags of the object"
+#: builtin/update-index.c:76
+#, c-format
+msgid "failed to stat %s"
msgstr ""
-#: builtin/tag.c:501
-msgid "--column and -n are incompatible"
+#: builtin/update-index.c:86
+#, c-format
+msgid "failed to create file %s"
msgstr ""
-#: builtin/tag.c:518
-msgid "-n option is only allowed with -l."
+#: builtin/update-index.c:94
+#, c-format
+msgid "failed to delete file %s"
msgstr ""
-#: builtin/tag.c:520
-msgid "--contains option is only allowed with -l."
+#: builtin/update-index.c:101 builtin/update-index.c:203
+#, c-format
+msgid "failed to delete directory %s"
msgstr ""
-#: builtin/tag.c:522
-msgid "--points-at option is only allowed with -l."
+#: builtin/update-index.c:124
+#, c-format
+msgid "Testing "
msgstr ""
-#: builtin/tag.c:530
-msgid "only one -F or -m option is allowed."
+#: builtin/update-index.c:136
+msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/tag.c:550
-msgid "too many params"
+#: builtin/update-index.c:149
+msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/tag.c:556
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: builtin/update-index.c:162
+msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/tag.c:561
-#, c-format
-msgid "tag '%s' already exists"
+#: builtin/update-index.c:173
+msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/tag.c:579
-#, c-format
-msgid "%s: cannot lock the ref"
+#: builtin/update-index.c:184
+msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/tag.c:581
-#, c-format
-msgid "%s: cannot update the ref"
+#: builtin/update-index.c:197
+msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/tag.c:583
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+#: builtin/update-index.c:204
+msgid " OK"
msgstr ""
-#: builtin/update-index.c:402
-msgid "git update-index [options] [--] [<file>...]"
+#: builtin/update-index.c:564
+msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:720
+#: builtin/update-index.c:918
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:723
+#: builtin/update-index.c:921
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:726
+#: builtin/update-index.c:924
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:728
+#: builtin/update-index.c:926
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:730
+#: builtin/update-index.c:928
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:732
+#: builtin/update-index.c:930
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:735
+#: builtin/update-index.c:933
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:739
+#: builtin/update-index.c:937
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:743
-msgid "<mode>
<object> <path>"
+#: builtin/update-index.c:941
+msgid "<mode>
,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:744
+#: builtin/update-index.c:942
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:748
+#: builtin/update-index.c:946
msgid "(+/-)x"
msgstr ""
-#: builtin/update-index.c:749
+#: builtin/update-index.c:947
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/update-index.c:753
+#: builtin/update-index.c:951
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:756
+#: builtin/update-index.c:954
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:759
+#: builtin/update-index.c:957
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:762
+#: builtin/update-index.c:960
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:765
+#: builtin/update-index.c:963
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:767
+#: builtin/update-index.c:965
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:769
+#: builtin/update-index.c:967
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:771
+#: builtin/update-index.c:969
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:775
+#: builtin/update-index.c:973
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:779
+#: builtin/update-index.c:977
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:783
+#: builtin/update-index.c:981
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:787
+#: builtin/update-index.c:985
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:790
+#: builtin/update-index.c:988
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:792
+#: builtin/update-index.c:990
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:796
+#: builtin/update-index.c:994
msgid "write index in this format"
msgstr ""
+#: builtin/update-index.c:996
+msgid "enable or disable split index"
+msgstr ""
+
+#: builtin/update-index.c:998
+msgid "enable/disable untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1000
+msgid "enable untracked cache without testing the filesystem"
+msgstr ""
+
#: builtin/update-ref.c:9
-msgid "git update-ref [options] -d <refname> [<oldval>]"
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
#: builtin/update-ref.c:10
-msgid "git update-ref [options] <refname> <newval> [<oldval>]"
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
#: builtin/update-ref.c:11
-msgid "git update-ref [options] --stdin [-z]"
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/update-ref.c:255
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:257
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/update-ref.c:258
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/update-ref.c:259
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr ""
msgid "update the info files from scratch"
msgstr ""
-#: builtin/verify-pack.c:56
-msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
-msgstr ""
-
-#: builtin/verify-pack.c:66
-msgid "verbose"
-msgstr ""
-
-#: builtin/verify-pack.c:68
-msgid "show statistics only"
-msgstr ""
-
-#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v|--verbose] <tag>..."
+#: builtin/verify-commit.c:17
+msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/verify-tag.c:73
-msgid "print tag contents"
+#: builtin/verify-commit.c:72
+msgid "print commit contents"
msgstr ""
-#: builtin/write-tree.c:13
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+msgid "print raw gpg status output"
msgstr ""
-#: builtin/write-tree.c:26
-msgid "<prefix>/"
+#: builtin/verify-pack.c:54
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
-#: builtin/write-tree.c:27
-msgid "write tree object for a subdirectory <prefix>"
+#: builtin/verify-pack.c:64
+msgid "verbose"
msgstr ""
-#: builtin/write-tree.c:30
-msgid "only useful for debugging"
+#: builtin/verify-pack.c:66
+msgid "show statistics only"
msgstr ""
-#: git.c:17
-msgid ""
-"'git help -a' and 'git help -g' lists available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+#: builtin/verify-tag.c:17
+msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr ""
-#: parse-options.h:146
-msgid "expiry date"
+#: builtin/verify-tag.c:83
+msgid "print tag contents"
msgstr ""
-#: parse-options.h:161
-msgid "no-op (backward compatibility)"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
msgstr ""
-#: parse-options.h:235
-msgid "be more verbose"
+#: builtin/worktree.c:16
+msgid "git worktree prune [<options>]"
msgstr ""
-#: parse-options.h:237
-msgid "be more quiet"
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
msgstr ""
-#: parse-options.h:243
-msgid "use <n> digits to display SHA-1s"
+#: builtin/worktree.c:39
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: common-cmds.h:8
-msgid "Add file contents to the index"
+#: builtin/worktree.c:45
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: common-cmds.h:9
-msgid "Find by binary search the change that introduced a bug"
+#: builtin/worktree.c:50
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: common-cmds.h:10
-msgid "List, create, or delete branches"
+#: builtin/worktree.c:61
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: common-cmds.h:11
-msgid "Checkout a branch or paths to the working tree"
+#: builtin/worktree.c:77
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: common-cmds.h:12
-msgid "Clone a repository into a new directory"
+#: builtin/worktree.c:112
+#, c-format
+msgid "failed to remove: %s"
msgstr ""
-#: common-cmds.h:13
-msgid "Record changes to the repository"
+#: builtin/worktree.c:201
+#, c-format
+msgid "'%s' already exists"
msgstr ""
-#: common-cmds.h:14
-msgid "Show changes between commits, commit and working tree, etc"
+#: builtin/worktree.c:235
+#, c-format
+msgid "could not create directory of '%s'"
msgstr ""
-#: common-cmds.h:15
-msgid "Download objects and refs from another repository"
+#: builtin/worktree.c:271
+#, c-format
+msgid "Preparing %s (identifier %s)"
msgstr ""
-#: common-cmds.h:16
-msgid "Print lines matching a pattern"
+#: builtin/worktree.c:319
+msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: common-cmds.h:17
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: builtin/worktree.c:321
+msgid "create a new branch"
msgstr ""
-#: common-cmds.h:18
-msgid "Show commit logs"
+#: builtin/worktree.c:323
+msgid "create or reset a branch"
msgstr ""
-#: common-cmds.h:19
-msgid "Join two or more development histories together"
+#: builtin/worktree.c:324
+msgid "detach HEAD at named commit"
msgstr ""
-#: common-cmds.h:20
-msgid "Move or rename a file, a directory, or a symlink"
+#: builtin/worktree.c:331
+msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: common-cmds.h:21
-msgid "Fetch from and integrate with another repository or a local branch"
+#: builtin/write-tree.c:13
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: common-cmds.h:22
-msgid "Update remote refs along with associated objects"
+#: builtin/write-tree.c:26
+msgid "<prefix>/"
msgstr ""
-#: common-cmds.h:23
-msgid "Forward-port local commits to the updated upstream head"
+#: builtin/write-tree.c:27
+msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: common-cmds.h:24
-msgid "Reset current HEAD to the specified state"
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
msgstr ""
-#: common-cmds.h:25
-msgid "Remove files from the working tree and from the index"
+#: credential-cache--daemon.c:255
+msgid "print debugging messages to stderr"
msgstr ""
-#: common-cmds.h:26
-msgid "Show various types of objects"
+#: git.c:14
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
msgstr ""
-#: common-cmds.h:27
-msgid "Show the working tree status"
+#: common-cmds.h:9
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: common-cmds.h:28
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: common-cmds.h:10
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: git-am.sh:50
-msgid "You need to set your committer info first"
+#: common-cmds.h:11
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: git-am.sh:95
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: common-cmds.h:12
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: git-am.sh:105
-#, sh-format
-msgid ""
-"When you have resolved this problem, run \"$cmdline --continue\".\n"
-"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-"To restore the original branch and stop patching, run \"$cmdline --abort\"."
+#: common-cmds.h:13
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: git-am.sh:121
-msgid "Cannot fall back to three-way merge."
+#: common-cmds.h:17
+msgid "Add file contents to the index"
msgstr ""
-#: git-am.sh:137
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: common-cmds.h:18
+msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
-#: git-am.sh:139
-msgid "Using index info to reconstruct a base tree..."
+#: common-cmds.h:19
+msgid "List, create, or delete branches"
msgstr ""
-#: git-am.sh:154
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: common-cmds.h:20
+msgid "Switch branches or restore working tree files"
msgstr ""
-#: git-am.sh:163
-msgid "Falling back to patching base and 3-way merge..."
+#: common-cmds.h:21
+msgid "Clone a repository into a new directory"
msgstr ""
-#: git-am.sh:179
-msgid "Failed to merge in the changes."
+#: common-cmds.h:22
+msgid "Record changes to the repository"
msgstr ""
-#: git-am.sh:274
-msgid "Only one StGIT patch series can be applied at once"
+#: common-cmds.h:23
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: git-am.sh:361
-#, sh-format
-msgid "Patch format $patch_format is not supported."
+#: common-cmds.h:24
+msgid "Download objects and refs from another repository"
msgstr ""
-#: git-am.sh:363
-msgid "Patch format detection failed."
+#: common-cmds.h:25
+msgid "Print lines matching a pattern"
msgstr ""
-#: git-am.sh:389
-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."
+#: common-cmds.h:26
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: git-am.sh:479
-#, sh-format
-msgid "previous rebase directory $dotest still exists but mbox given."
+#: common-cmds.h:27
+msgid "Show commit logs"
msgstr ""
-#: git-am.sh:484
-msgid "Please make up your mind. --skip or --abort?"
+#: common-cmds.h:28
+msgid "Join two or more development histories together"
msgstr ""
-#: git-am.sh:520
-#, sh-format
-msgid ""
-"Stray $dotest directory found.\n"
-"Use \"git am --abort\" to remove it."
+#: common-cmds.h:29
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: git-am.sh:528
-msgid "Resolve operation not in progress, we are not resuming."
+#: common-cmds.h:30
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: git-am.sh:594
-#, sh-format
-msgid "Dirty index: cannot apply patches (dirty: $files)"
+#: common-cmds.h:31
+msgid "Update remote refs along with associated objects"
msgstr ""
-#: git-am.sh:698
-#, sh-format
-msgid ""
-"Patch is empty. Was it split wrong?\n"
-"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-"To restore the original branch and stop patching run \"$cmdline --abort\"."
+#: common-cmds.h:32
+msgid "Forward-port local commits to the updated upstream head"
msgstr ""
-#: git-am.sh:725
-msgid "Patch does not have a valid e-mail address."
+#: common-cmds.h:33
+msgid "Reset current HEAD to the specified state"
msgstr ""
-#: git-am.sh:772
-msgid "cannot be interactive without stdin connected to a terminal."
+#: common-cmds.h:34
+msgid "Remove files from the working tree and from the index"
msgstr ""
-#: git-am.sh:776
-msgid "Commit Body is:"
+#: common-cmds.h:35
+msgid "Show various types of objects"
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
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
+#: common-cmds.h:36
+msgid "Show the working tree status"
msgstr ""
-#: git-am.sh:819
-#, sh-format
-msgid "Applying: $FIRSTLINE"
+#: common-cmds.h:37
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: git-am.sh:840
-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."
+#: parse-options.h:145
+msgid "expiry-date"
msgstr ""
-#: git-am.sh:848
-msgid ""
-"You still have unmerged paths in your index\n"
-"did you forget to use 'git add'?"
+#: parse-options.h:160
+msgid "no-op (backward compatibility)"
msgstr ""
-#: git-am.sh:864
-msgid "No changes -- Patch already applied."
+#: parse-options.h:237
+msgid "be more verbose"
msgstr ""
-#: git-am.sh:874
-#, sh-format
-msgid "Patch failed at $msgnum $FIRSTLINE"
+#: parse-options.h:239
+msgid "be more quiet"
msgstr ""
-#: git-am.sh:877
-#, sh-format
-msgid ""
-"The copy of the patch that failed is found in:\n"
-" $dotest/patch"
+#: parse-options.h:245
+msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: git-am.sh:895
-msgid "applying to an empty history"
+#: rerere.h:38
+msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: git-bisect.sh:48
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:54
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-bisect.sh:95
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr ""
-#: git-bisect.sh:99
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr ""
-#: git-bisect.sh:117
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr ""
-#: git-bisect.sh:130
+#: git-bisect.sh:168
#, sh-format
msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr ""
-#: git-bisect.sh:140
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: git-bisect.sh:144
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr ""
-#: git-bisect.sh:189
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr ""
-#: git-bisect.sh:218
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:232
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr ""
-#: git-bisect.sh:244
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:250
-msgid "'git bisect bad' can take only one argument."
+#: git-bisect.sh:299
+#, sh-format
+msgid "'git bisect $TERM_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."
+#: git-bisect.sh:322
+#, sh-format
+msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:279
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr ""
-#: git-bisect.sh:289
+#: git-bisect.sh:340
+#, sh-format
msgid ""
-"You need to give me at least one good and one bad revisions.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
+"You need to give me at least one $bad_syn and one $good_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: git-bisect.sh:292
+#: git-bisect.sh:343
+#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one good and one bad revisions.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
+"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: git-bisect.sh:363 git-bisect.sh:490
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr ""
-#: git-bisect.sh:370
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr ""
-#: git-bisect.sh:379
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
-#: git-bisect.sh:406
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:407
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:424
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:436
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:443
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:469
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:475
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:482
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr ""
-#: git-pull.sh:21
-msgid ""
-"Pull is not possible because you have unmerged files.\n"
-"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-"as appropriate to mark resolution, or use 'git commit -a'."
+#: git-bisect.sh:565
+msgid "please use two different terms"
msgstr ""
-#: git-pull.sh:25
-msgid "Pull is not possible because you have unmerged files."
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
msgstr ""
-#: git-pull.sh:223
-msgid "updating an unborn branch with changes added to the index"
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
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:247
+#: git-bisect.sh:587 git-bisect.sh:593
#, sh-format
-msgid ""
-"Warning: fetch updated the current branch head.\n"
-"Warning: fast-forwarding your working tree from\n"
-"Warning: commit $orig_head."
+msgid "can't change the meaning of term '$term'"
+msgstr ""
+
+#: git-bisect.sh:606
+#, sh-format
+msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
-#: git-pull.sh:272
-msgid "Cannot merge multiple branches into empty head"
+#: git-bisect.sh:636
+msgid "no terms defined"
msgstr ""
-#: git-pull.sh:276
-msgid "Cannot rebase onto multiple branches"
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: git-rebase.sh:55
+#: 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:158
+#: git-rebase.sh:165
msgid "Applied autostash."
msgstr ""
-#: git-rebase.sh:161
+#: git-rebase.sh:168
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:162
+#: git-rebase.sh:169
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:201
+#: git-rebase.sh:208
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:206
+#: git-rebase.sh:213
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:346
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr ""
-#: git-rebase.sh:351
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:362
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:369
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:372
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:390
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:409
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:456
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:480
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:483 git-rebase.sh:487
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:492
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:515
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:548
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:553
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:557
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:577
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:581
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:592
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#. Detach HEAD and reset the tree
-#: git-rebase.sh:601
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:611
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:124 git-stash.sh:137
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:140
+#: git-stash.sh:141
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:143
+#: git-stash.sh:144
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:156
+#: git-stash.sh:157
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:190
+#: git-stash.sh:189
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
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:237
+#: git-stash.sh:239
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: git-stash.sh:258
+#: git-stash.sh:260
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:262
+#: git-stash.sh:264
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:266
+#: git-stash.sh:268
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:284
+#: git-stash.sh:286
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:383
+#: git-stash.sh:405
+#, sh-format
+msgid "unknown option: $opt"
+msgstr ""
+
+#: git-stash.sh:415
msgid "No stash found."
msgstr ""
-#: git-stash.sh:390
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:396
+#: git-stash.sh:428
#, sh-format
-msgid "$reference is not valid reference"
+msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:424
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:435
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:443
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:447
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:455
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:457
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:491
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:506
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:523
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:524
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:531
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:603
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr ""
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr ""
-
#: git-submodule.sh:281
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr ""
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr ""
-
-#: git-submodule.sh:403
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:413
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:430
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:434
+#: git-submodule.sh:312
#, 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:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:454
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:462
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:464
+#: git-submodule.sh:342
#, 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:344
#, 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:345
#, 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:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:481
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:486
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:495
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:539
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr ""
-#: git-submodule.sh:559
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:605
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
-#: git-submodule.sh:614
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:616
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:633
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:671
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr ""
-#: git-submodule.sh:688
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
-#: git-submodule.sh:689
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: git-submodule.sh:695
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-#: git-submodule.sh:698
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:699
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: git-submodule.sh:702
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:711
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:834
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-#: git-submodule.sh:847
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:856
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:880
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:894
+#: git-submodule.sh:765
#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:895
+#: git-submodule.sh:766
#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:900
+#: git-submodule.sh:770
#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:901
+#: git-submodule.sh:771
#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:906
+#: git-submodule.sh:776
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:907
+#: git-submodule.sh:777
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:912
+#: git-submodule.sh:782
#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgid ""
+"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr ""
-#: git-submodule.sh:913
+#: git-submodule.sh:783
#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:940
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:1048
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#. unexpected type
-#: git-submodule.sh:1096
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:1116
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:1119
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:1122
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1147
+#: git-submodule.sh:1024
msgid "blob"
msgstr ""
-#: git-submodule.sh:1261
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1325
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""