diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 1659 |
1 files changed, 847 insertions, 812 deletions
diff --git a/po/git.pot b/po/git.pot index 91fa5a1be6..c94a95591f 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" +"POT-Creation-Date: 2015-04-03 08:13+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" @@ -30,7 +30,7 @@ msgid "" msgstr "" #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" #: archive.c:12 @@ -39,7 +39,7 @@ msgstr "" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" #: archive.c:14 @@ -67,10 +67,10 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "" @@ -119,7 +119,7 @@ msgstr "" msgid "path to the remote git-upload-archive command" msgstr "" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -236,7 +236,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "" @@ -245,8 +245,8 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -287,21 +287,21 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "" @@ -324,55 +324,55 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "" @@ -464,7 +464,7 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "" @@ -490,23 +490,23 @@ msgid "" "%s" msgstr "" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" @@ -841,27 +841,27 @@ msgstr "" msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1898 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "" -#: merge-recursive.c:1911 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1948 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2005 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2016 builtin/merge.c:667 +#: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "" @@ -984,14 +984,14 @@ msgstr "" msgid "done" msgstr "" -#: read-cache.c:1267 +#: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1277 +#: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1069,23 +1069,31 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "" +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1111,7 +1119,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "" @@ -1147,184 +1155,184 @@ msgstr "" msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:508 +#: sequencer.c:513 #, 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:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "" -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "" @@ -1383,38 +1391,38 @@ msgstr "" msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "" @@ -1451,26 +1459,26 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "" @@ -1499,11 +1507,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "" @@ -1611,193 +1619,193 @@ msgstr "" msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "" -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "" -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1805,74 +1813,74 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "" -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "" @@ -1882,7 +1890,7 @@ msgid "failed to unlink '%s'" msgstr "" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." +msgid "git add [<options>] [--] <pathspec>..." msgstr "" #: builtin/add.c:65 @@ -1890,7 +1898,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:70 builtin/commit.c:275 +#: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "" @@ -1934,14 +1942,14 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "" @@ -2017,75 +2025,75 @@ msgstr "" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" msgstr "" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2096,394 +2104,413 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2872 +#: builtin/apply.c:2897 #, 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:2884 +#: builtin/apply.c:2909 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2890 +#: builtin/apply.c:2915 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2909 +#: builtin/apply.c:2935 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:3010 +#: builtin/apply.c:3036 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:3016 +#: builtin/apply.c:3042 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:3037 +#: builtin/apply.c:3063 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3161 +#: builtin/apply.c:3187 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "" + +#: builtin/apply.c:3268 builtin/apply.c:3490 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3349 builtin/apply.c:3504 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3358 builtin/apply.c:3512 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3432 +#: builtin/apply.c:3460 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3501 +#: builtin/apply.c:3529 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3503 +#: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3604 +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "" + +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3607 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3627 +#: builtin/apply.c:3770 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3632 +#: builtin/apply.c:3775 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3640 +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "" + +#: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3653 +#: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3889 +#: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3918 +#: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:3922 +#: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3927 +#: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3963 +#: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:4012 +#: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4099 +#: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4107 +#: builtin/apply.c:4267 msgid "internal error" msgstr "" -#: builtin/apply.c:4110 +#: builtin/apply.c:4270 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4120 +#: builtin/apply.c:4280 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4141 +#: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4144 +#: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4234 +#: builtin/apply.c:4394 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4245 +#: builtin/apply.c:4405 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "" -#: builtin/apply.c:4363 +#: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4366 +#: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4368 +#: builtin/apply.c:4528 msgid "num" msgstr "" -#: builtin/apply.c:4369 +#: builtin/apply.c:4529 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4372 +#: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4374 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4378 +#: builtin/apply.c:4538 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4380 +#: builtin/apply.c:4540 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4382 +#: builtin/apply.c:4542 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4384 +#: builtin/apply.c:4544 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4386 +#: builtin/apply.c:4546 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4388 +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "" + +#: builtin/apply.c:4550 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4390 +#: builtin/apply.c:4552 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4392 +#: builtin/apply.c:4554 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4397 +#: builtin/apply.c:4559 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4398 +#: builtin/apply.c:4560 msgid "action" msgstr "" -#: builtin/apply.c:4399 +#: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4408 +#: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4410 +#: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4412 +#: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4414 +#: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4417 +#: builtin/apply.c:4579 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4420 +#: builtin/apply.c:4582 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4422 +#: builtin/apply.c:4584 msgid "root" msgstr "" -#: builtin/apply.c:4423 +#: builtin/apply.c:4585 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4445 +#: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4453 +#: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4456 +#: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4472 +#: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4486 +#: builtin/apply.c:4651 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4657 builtin/apply.c:4667 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2538,102 +2565,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" msgstr "" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -2643,24 +2670,24 @@ msgstr "" #. 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:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" #: builtin/branch.c:152 @@ -2795,239 +2822,244 @@ msgstr "" msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" +msgid "(HEAD detached at %s)" msgstr "" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, 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:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3035,12 +3067,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -3058,52 +3090,52 @@ msgstr "" 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:326 +msgid "git cat-file (-t | -s | -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:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" msgstr "" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" 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>...] < <list-of-paths>" msgstr "" #: builtin/check-attr.c:19 @@ -3159,7 +3191,7 @@ msgid "--non-matching is only valid with --verbose" msgstr "" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." +msgid "git check-mailmap [<options>] <contact>..." msgstr "" #: builtin/check-mailmap.c:13 @@ -3176,7 +3208,7 @@ msgid "no contacts specified" msgstr "" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" #: builtin/checkout-index.c:188 @@ -3220,11 +3252,11 @@ 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:132 builtin/checkout.c:165 @@ -3346,7 +3378,7 @@ msgid "" "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 "" @@ -3463,7 +3495,7 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" +msgid "second guess 'git checkout <no-such-branch>'" msgstr "" #: builtin/checkout.c:1153 @@ -3569,16 +3601,17 @@ msgstr "" msgid "Select items to delete" msgstr "" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " +msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "" -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3589,79 +3622,79 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "" @@ -3721,7 +3754,7 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "" @@ -3862,7 +3895,7 @@ msgstr "" msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "" @@ -3877,58 +3910,58 @@ msgstr "" msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." +msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:986 +#: builtin/clone.c:987 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 @@ -3960,11 +3993,11 @@ msgid "--command must be the first argument" msgstr "" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." +msgid "git commit [<options>] [--] <pathspec>..." msgstr "" #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." +msgid "git status [<options>] [--] <pathspec>..." msgstr "" #: builtin/commit.c:47 @@ -4026,112 +4059,112 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:302 +#: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:342 +#: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:348 +#: builtin/commit.c:350 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:359 +#: builtin/commit.c:361 msgid "unable to write index file" msgstr "" -#: builtin/commit.c:361 +#: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:363 +#: builtin/commit.c:365 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:443 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:454 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:473 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:584 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:586 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:605 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:613 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "" -#: builtin/commit.c:657 +#: 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:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:706 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:708 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:712 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:734 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:738 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:742 +#: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:789 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:807 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4141,7 +4174,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:812 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4151,14 +4184,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:825 +#: 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:832 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4166,348 +4199,348 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:852 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:860 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:867 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:885 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:942 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:953 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1059 +#: 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:1074 builtin/commit.c:1314 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1111 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1141 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1150 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1153 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1155 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1168 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1178 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1195 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1197 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1199 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1201 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1218 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1334 builtin/commit.c:1613 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1337 builtin/commit.c:1616 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1344 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "" -#: builtin/commit.c:1346 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1348 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1435 +#: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1437 +#: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1482 +#: builtin/commit.c:1478 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1485 +#: builtin/commit.c:1481 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1577 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "author" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1580 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1581 msgid "commit message" msgstr "" -#: builtin/commit.c:1586 +#: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1586 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1593 +#: builtin/commit.c:1589 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "default" msgstr "" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1590 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1595 +#: builtin/commit.c:1591 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1600 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1626 +#: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1655 +#: builtin/commit.c:1651 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1690 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1701 +#: builtin/commit.c:1697 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1708 +#: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1727 +#: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1738 +#: builtin/commit.c:1734 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1743 +#: builtin/commit.c:1739 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1791 +#: builtin/commit.c:1787 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4515,7 +4548,7 @@ msgid "" msgstr "" #: builtin/config.c:8 -msgid "git config [options]" +msgid "git config [<options>]" msgstr "" #: builtin/config.c:53 @@ -4666,11 +4699,11 @@ msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" +msgid "git describe [<options>] [<commit-ish>...]" msgstr "" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" +msgid "git describe [<options>] --dirty" msgstr "" #: builtin/describe.c:217 @@ -4880,268 +4913,269 @@ msgstr "" msgid "anonymize output" msgstr "" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, 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:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 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:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 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>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 @@ -5171,51 +5205,51 @@ msgstr "" msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "" @@ -5224,7 +5258,7 @@ msgid "Checking object directories" msgstr "" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" +msgid "git fsck [<options>] [<object>...]" msgstr "" #: builtin/fsck.c:609 @@ -5272,7 +5306,7 @@ msgid "Checking objects" msgstr "" #: builtin/gc.c:24 -msgid "git gc [options]" +msgid "git gc [<options>]" msgstr "" #: builtin/gc.c:79 @@ -5328,7 +5362,7 @@ msgid "" 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 @@ -5369,7 +5403,7 @@ msgid "search in both tracked and untracked files" msgstr "" #: builtin/grep.c:644 -msgid "search also in ignored files" +msgid "ignore files specified via '.gitignore'" msgstr "" #: builtin/grep.c:647 @@ -5554,15 +5588,15 @@ msgstr "" #: builtin/hash-object.c:82 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:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "" @@ -5612,7 +5646,7 @@ msgid "show info page" 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 @@ -5817,8 +5851,8 @@ msgstr "" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "" @@ -5905,97 +5939,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "" @@ -6107,7 +6141,7 @@ msgstr "" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" #: builtin/init-db.c:498 @@ -6167,7 +6201,7 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "" #: builtin/log.c:42 -msgid "git show [options] <object>..." +msgid "git show [<options>] <object>..." msgstr "" #: builtin/log.c:81 @@ -6246,7 +6280,7 @@ msgid "insane in-reply-to: %s" msgstr "" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" #: builtin/log.c:1071 @@ -6443,95 +6477,95 @@ msgstr "" msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "" @@ -6572,11 +6606,11 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" +msgid "git merge [<options>] [<commit>...]" msgstr "" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" +msgid "git merge [<options>] <msg> HEAD <commit>" msgstr "" #: builtin/merge.c:47 @@ -6908,11 +6942,11 @@ 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 @@ -6949,8 +6983,8 @@ msgstr "" #: 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 @@ -6982,7 +7016,7 @@ msgid "do not warn about conflicts" 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:64 @@ -7002,7 +7036,7 @@ 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:69 @@ -7088,21 +7122,21 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." +msgid "git name-rev [<options>] <commit>..." msgstr "" #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" +msgid "git name-rev [<options>] --all" msgstr "" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" +msgid "git name-rev [<options>] --stdin" msgstr "" #: builtin/name-rev.c:309 @@ -7134,36 +7168,36 @@ msgid "dereference tags in the input (internal use)" msgstr "" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" #: builtin/notes.c:31 @@ -7175,15 +7209,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "" #: builtin/notes.c:40 @@ -7215,7 +7249,7 @@ msgid "git notes show [<object>]" msgstr "" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "" #: builtin/notes.c:72 @@ -7444,7 +7478,7 @@ msgid "notes-ref" msgstr "" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" +msgid "use notes from <notes-ref>" msgstr "" #: builtin/notes.c:989 builtin/remote.c:1621 @@ -7460,185 +7494,185 @@ msgstr "" msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 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 @@ -7650,7 +7684,7 @@ msgid "prune loose refs (default)" 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 @@ -7852,75 +7886,79 @@ msgstr "" msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -7995,12 +8033,12 @@ msgstr "" msgid "debug unpack-trees" msgstr "" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" @@ -8011,7 +8049,7 @@ 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 "" @@ -8023,8 +8061,8 @@ msgstr "" 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:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" #: builtin/remote.c:17 @@ -8060,10 +8098,6 @@ msgstr "" 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 msgid "git remote set-branches <name> <branch>..." msgstr "" @@ -8487,7 +8521,7 @@ msgid "be verbose; must be placed before a subcommand" msgstr "" #: builtin/repack.c:17 -msgid "git repack [options]" +msgid "git repack [<options>]" msgstr "" #: builtin/repack.c:159 @@ -8554,7 +8588,7 @@ msgstr "" msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "" @@ -8644,7 +8678,7 @@ 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 @@ -8782,7 +8816,7 @@ msgid "Could not write new index file." msgstr "" #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" #: builtin/rev-parse.c:366 @@ -8799,15 +8833,15 @@ msgstr "" #: 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 @@ -8815,7 +8849,7 @@ msgid "git revert <subcommand>" msgstr "" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." +msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "" #: builtin/revert.c:29 @@ -8896,7 +8930,7 @@ msgid "cherry-pick failed" msgstr "" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." +msgid "git rm [<options>] [--] <file>..." msgstr "" #: builtin/rm.c:65 @@ -8984,7 +9018,7 @@ msgid "git rm: unable to remove %s" msgstr "" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "" #: builtin/shortlog.c:131 @@ -9014,14 +9048,14 @@ msgstr "" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"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:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" #: builtin/show-branch.c:652 @@ -9090,8 +9124,8 @@ 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 @@ -9131,11 +9165,11 @@ msgid "show refs from stdin that aren't in local repository" 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 @@ -9160,7 +9194,8 @@ msgstr "" #: builtin/tag.c:22 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 @@ -9169,7 +9204,7 @@ msgstr "" #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" @@ -9305,16 +9340,16 @@ msgstr "" msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:608 -msgid "show tag list in columns" +#: builtin/tag.c:609 +msgid "Tag listing options" msgstr "" #: builtin/tag.c:610 -msgid "sort tags" +msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:614 -msgid "Tag listing options" +#: builtin/tag.c:612 +msgid "sort tags" msgstr "" #: builtin/tag.c:617 builtin/tag.c:623 @@ -9373,131 +9408,131 @@ msgid "Unpacking objects" msgstr "" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" +msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:771 +#: builtin/update-index.c:772 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:775 +#: builtin/update-index.c:776 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "(+/-)x" msgstr "" -#: builtin/update-index.c:785 +#: builtin/update-index.c:786 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:792 +#: builtin/update-index.c:793 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:795 +#: builtin/update-index.c:796 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:798 +#: builtin/update-index.c:799 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:801 +#: builtin/update-index.c:802 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:803 +#: builtin/update-index.c:804 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:805 +#: builtin/update-index.c:806 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:807 +#: builtin/update-index.c:808 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:811 +#: builtin/update-index.c:812 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:815 +#: builtin/update-index.c:816 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:819 +#: builtin/update-index.c:820 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:823 +#: builtin/update-index.c:824 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:826 +#: builtin/update-index.c:827 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:828 +#: builtin/update-index.c:829 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:832 +#: builtin/update-index.c:833 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:834 +#: builtin/update-index.c:835 msgid "enable or disable split index" 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:359 @@ -9525,7 +9560,7 @@ msgid "update the info files from scratch" msgstr "" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." +msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "" #: builtin/verify-commit.c:75 @@ -9533,7 +9568,7 @@ msgid "print commit contents" msgstr "" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "" #: builtin/verify-pack.c:64 @@ -9545,7 +9580,7 @@ msgid "show statistics only" msgstr "" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." +msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "" #: builtin/verify-tag.c:73 @@ -9868,7 +9903,7 @@ msgstr "" #: git-bisect.sh:130 #, 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 |