diff options
| -rw-r--r-- | po/git.pot | 3072 | ||||
| -rw-r--r-- | po/vi.po | 3383 | ||||
| -rw-r--r-- | po/zh_CN.po | 3300 |
3 files changed, 5403 insertions, 4352 deletions
diff --git a/po/git.pot b/po/git.pot index 4a9d4efed9..aacf98cb13 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: 2013-04-30 08:25+0800\n" +"POT-Creation-Date: 2013-07-26 14:19+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" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:53 +#: advice.c:57 #, c-format msgid "hint: %.*s\n" msgstr "" @@ -27,7 +27,7 @@ msgstr "" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:83 +#: advice.c:87 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -60,7 +60,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:324 builtin/log.c:1126 +#: archive.c:324 builtin/log.c:1173 msgid "prefix" msgstr "" @@ -68,11 +68,11 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371 -#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 -#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 -#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292 +#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673 +#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77 +#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152 msgid "file" msgstr "" @@ -104,7 +104,7 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "" @@ -112,7 +112,7 @@ msgstr "" msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615 +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487 msgid "command" msgstr "" @@ -195,17 +195,17 @@ msgstr "" msgid "Cannot force update the current branch." msgstr "" -#: branch.c:201 +#: branch.c:216 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:203 +#: branch.c:218 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:205 +#: branch.c:220 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -217,26 +217,26 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:250 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:270 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:275 +#: branch.c:290 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:281 +#: branch.c:296 msgid "Failed to lock ref for update" msgstr "" -#: branch.c:299 +#: branch.c:314 msgid "Failed to write ref" msgstr "" @@ -250,7 +250,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:676 +#: bundle.c:89 builtin/commit.c:683 #, c-format msgid "could not open '%s'" msgstr "" @@ -259,9 +259,9 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300 -#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 -#: builtin/shortlog.c:155 +#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331 +#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364 +#: builtin/shortlog.c:156 msgid "revision walk setup failed" msgstr "" @@ -287,7 +287,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258 +#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -318,12 +318,12 @@ msgstr "" msgid "index-pack died" msgstr "" -#: commit.c:50 +#: commit.c:53 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:52 +#: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "" @@ -332,16 +332,16 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: connected.c:39 +#: connected.c:60 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:48 +#: connected.c:80 #, c-format msgid "failed write to rev-list: %s" msgstr "" -#: connected.c:56 +#: connected.c:88 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" @@ -435,14 +435,14 @@ msgid "" "%s" msgstr "" -#: diff.c:3481 +#: diff.c:3487 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3495 +#: diff.c:3501 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" @@ -484,48 +484,48 @@ msgstr "" msgid "'%s': short read %s" msgstr "" -#: help.c:212 +#: help.c:213 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:219 +#: help.c:220 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:235 +#: help.c:236 msgid "The most commonly used git commands are:" msgstr "" -#: help.c:292 +#: help.c:293 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:349 +#: help.c:350 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:371 +#: help.c:372 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" -#: help.c:376 +#: help.c:377 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:383 +#: help.c:384 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:387 +#: help.c:388 help.c:447 msgid "" "\n" "Did you mean this?" @@ -535,12 +535,17 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#: help.c:443 +#, c-format +msgid "%s: %s - %s" +msgstr "" + #: merge.c:56 msgid "failed to read the cache" msgstr "" #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 -#: builtin/clone.c:645 +#: builtin/clone.c:656 msgid "unable to write new index file" msgstr "" @@ -554,243 +559,264 @@ msgstr "" msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:268 +#: merge-recursive.c:269 msgid "error building trees" msgstr "" -#: merge-recursive.c:672 +#: merge-recursive.c:673 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:683 +#: merge-recursive.c:684 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:697 merge-recursive.c:718 +#: merge-recursive.c:698 merge-recursive.c:719 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:708 +#: merge-recursive.c:709 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:748 +#: merge-recursive.c:749 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:750 +#: merge-recursive.c:751 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:773 builtin/clone.c:313 +#: merge-recursive.c:774 builtin/clone.c:312 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:781 +#: merge-recursive.c:782 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:784 +#: merge-recursive.c:785 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:922 +#: merge-recursive.c:923 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:926 +#: merge-recursive.c:927 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:942 +#: merge-recursive.c:943 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1021 merge-recursive.c:1035 +#: merge-recursive.c:1022 merge-recursive.c:1036 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1027 merge-recursive.c:1040 +#: merge-recursive.c:1028 merge-recursive.c:1041 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1081 +#: merge-recursive.c:1082 msgid "rename" msgstr "" -#: merge-recursive.c:1081 +#: merge-recursive.c:1082 msgid "renamed" msgstr "" -#: merge-recursive.c:1137 +#: merge-recursive.c:1138 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1159 +#: merge-recursive.c:1160 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1164 +#: merge-recursive.c:1165 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1218 +#: merge-recursive.c:1219 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1248 +#: merge-recursive.c:1249 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1447 +#: merge-recursive.c:1448 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1457 +#: merge-recursive.c:1458 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1462 merge-recursive.c:1660 +#: merge-recursive.c:1463 merge-recursive.c:1661 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1513 +#: merge-recursive.c:1514 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1516 +#: merge-recursive.c:1517 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1564 +#: merge-recursive.c:1565 msgid "modify" msgstr "" -#: merge-recursive.c:1564 +#: merge-recursive.c:1565 msgid "modified" msgstr "" -#: merge-recursive.c:1574 +#: merge-recursive.c:1575 msgid "content" msgstr "" -#: merge-recursive.c:1581 +#: merge-recursive.c:1582 msgid "add/add" msgstr "" -#: merge-recursive.c:1615 +#: merge-recursive.c:1616 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1629 +#: merge-recursive.c:1630 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1633 git-submodule.sh:1029 +#: merge-recursive.c:1634 git-submodule.sh:1118 msgid "submodule" msgstr "" -#: merge-recursive.c:1634 +#: merge-recursive.c:1635 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1724 +#: merge-recursive.c:1725 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1749 +#: merge-recursive.c:1750 msgid "file/directory" msgstr "" -#: merge-recursive.c:1755 +#: merge-recursive.c:1756 msgid "directory/file" msgstr "" -#: merge-recursive.c:1760 +#: merge-recursive.c:1761 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1770 +#: merge-recursive.c:1771 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1787 +#: merge-recursive.c:1788 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1806 +#: merge-recursive.c:1807 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1815 +#: merge-recursive.c:1816 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1845 +#: merge-recursive.c:1846 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1890 +#: merge-recursive.c:1891 msgid "Merging:" msgstr "" -#: merge-recursive.c:1903 +#: merge-recursive.c:1904 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1940 +#: merge-recursive.c:1941 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:1997 +#: merge-recursive.c:1998 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2009 builtin/merge.c:658 +#: merge-recursive.c:2010 builtin/merge.c:672 msgid "Unable to write index." msgstr "" -#: object.c:195 +#: notes-utils.c:40 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: notes-utils.c:81 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: notes-utils.c:91 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: notes-utils.c:118 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: object.c:204 #, c-format msgid "unable to parse object: %s" msgstr "" @@ -830,18 +856,18 @@ msgstr "" msgid "'%s' is beyond a symbolic link" msgstr "" -#: remote.c:1781 +#: remote.c:1788 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:1787 +#: remote.c:1794 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:1790 +#: remote.c:1797 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -849,11 +875,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1798 +#: remote.c:1805 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:1801 +#: remote.c:1808 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -864,18 +890,27 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1811 +#: remote.c:1818 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 -#: builtin/merge.c:1009 +#: run-command.c:80 +msgid "open /dev/null failed" +msgstr "" + +#: run-command.c:82 +#, c-format +msgid "dup2(%d,%d) failed" +msgstr "" + +#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 +#: builtin/merge.c:1013 builtin/merge.c:1023 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 -#: builtin/merge.c:1001 builtin/merge.c:1014 +#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 +#: builtin/merge.c:1015 builtin/merge.c:1028 #, c-format msgid "Could not write to '%s'" msgstr "" @@ -893,7 +928,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:245 sequencer.c:859 sequencer.c:942 +#: sequencer.c:245 sequencer.c:869 sequencer.c:952 #, c-format msgid "Could not write to %s" msgstr "" @@ -916,215 +951,228 @@ msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:319 +#: sequencer.c:324 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:350 +#: sequencer.c:355 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:371 +#: sequencer.c:377 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:416 +#: sequencer.c:422 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:421 +#: sequencer.c:427 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:487 +#: sequencer.c:493 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:506 +#: sequencer.c:512 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:514 +#: sequencer.c:520 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:518 +#: sequencer.c:524 #, 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:531 +#: sequencer.c:537 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:535 +#: sequencer.c:541 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:621 +#: sequencer.c:627 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:622 +#: sequencer.c:628 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:654 +#: sequencer.c:664 msgid "empty commit set passed" msgstr "" -#: sequencer.c:662 +#: sequencer.c:672 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:667 +#: sequencer.c:677 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:725 +#: sequencer.c:735 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:747 +#: sequencer.c:757 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:752 +#: sequencer.c:762 msgid "No commits parsed." msgstr "" -#: sequencer.c:765 +#: sequencer.c:775 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:769 +#: sequencer.c:779 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:776 +#: sequencer.c:786 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:804 +#: sequencer.c:814 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:807 +#: sequencer.c:817 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:819 +#: sequencer.c:829 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:840 +#: sequencer.c:850 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:841 +#: sequencer.c:851 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:845 +#: sequencer.c:855 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:861 sequencer.c:946 +#: sequencer.c:871 sequencer.c:956 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:880 sequencer.c:1014 +#: sequencer.c:890 sequencer.c:1024 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:882 +#: sequencer.c:892 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:884 +#: sequencer.c:894 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:906 builtin/apply.c:4060 +#: sequencer.c:916 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:909 +#: sequencer.c:919 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:910 +#: sequencer.c:920 msgid "unexpected end of file" msgstr "" -#: sequencer.c:916 +#: sequencer.c:926 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:939 +#: sequencer.c:949 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1083 +#: sequencer.c:1092 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1085 +#: sequencer.c:1095 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1119 +#: sequencer.c:1129 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1120 +#: sequencer.c:1130 msgid "Can't cherry-pick into empty head" msgstr "" -#: sha1_name.c:1036 +#: sha1_name.c:440 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.object_name_warning false\"" +msgstr "" + +#: sha1_name.c:1097 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:1039 +#: sha1_name.c:1100 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:1041 +#: sha1_name.c:1102 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:1044 +#: sha1_name.c:1106 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -1134,160 +1182,160 @@ msgstr "" msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:423 +#: wrapper.c:429 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:434 +#: wrapper.c:440 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:435 +#: wrapper.c:441 msgid "no such user" msgstr "" -#: wt-status.c:140 +#: wt-status.c:141 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:167 wt-status.c:194 +#: wt-status.c:168 wt-status.c:195 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:169 wt-status.c:196 +#: wt-status.c:170 wt-status.c:197 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:173 +#: wt-status.c:174 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:175 wt-status.c:179 +#: wt-status.c:176 wt-status.c:180 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:177 +#: wt-status.c:178 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:188 +#: wt-status.c:189 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:206 +#: wt-status.c:207 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:210 +#: wt-status.c:211 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:212 +#: wt-status.c:213 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:213 +#: wt-status.c:214 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:215 +#: wt-status.c:216 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:227 +#: wt-status.c:228 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:244 +#: wt-status.c:245 msgid "bug" msgstr "" -#: wt-status.c:249 +#: wt-status.c:250 msgid "both deleted:" msgstr "" -#: wt-status.c:250 +#: wt-status.c:251 msgid "added by us:" msgstr "" -#: wt-status.c:251 +#: wt-status.c:252 msgid "deleted by them:" msgstr "" -#: wt-status.c:252 +#: wt-status.c:253 msgid "added by them:" msgstr "" -#: wt-status.c:253 +#: wt-status.c:254 msgid "deleted by us:" msgstr "" -#: wt-status.c:254 +#: wt-status.c:255 msgid "both added:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:256 msgid "both modified:" msgstr "" -#: wt-status.c:285 +#: wt-status.c:286 msgid "new commits, " msgstr "" -#: wt-status.c:287 +#: wt-status.c:288 msgid "modified content, " msgstr "" -#: wt-status.c:289 +#: wt-status.c:290 msgid "untracked content, " msgstr "" -#: wt-status.c:306 +#: wt-status.c:307 #, c-format msgid "new file: %s" msgstr "" -#: wt-status.c:309 +#: wt-status.c:310 #, c-format msgid "copied: %s -> %s" msgstr "" -#: wt-status.c:312 +#: wt-status.c:313 #, c-format msgid "deleted: %s" msgstr "" -#: wt-status.c:315 +#: wt-status.c:316 #, c-format msgid "modified: %s" msgstr "" -#: wt-status.c:318 +#: wt-status.c:319 #, c-format msgid "renamed: %s -> %s" msgstr "" -#: wt-status.c:321 +#: wt-status.c:322 #, c-format msgid "typechange: %s" msgstr "" -#: wt-status.c:324 +#: wt-status.c:325 #, c-format msgid "unknown: %s" msgstr "" -#: wt-status.c:327 +#: wt-status.c:328 #, c-format msgid "unmerged: %s" msgstr "" -#: wt-status.c:330 +#: wt-status.c:331 #, c-format msgid "bug: unhandled diff status %c" msgstr "" @@ -1296,7 +1344,7 @@ msgstr "" msgid "You have unmerged paths." msgstr "" -#: wt-status.c:806 wt-status.c:958 +#: wt-status.c:806 msgid " (fix conflicts and run \"git commit\")" msgstr "" @@ -1317,7 +1365,7 @@ msgid "The current patch is empty." msgstr "" #: wt-status.c:829 -msgid " (fix conflicts and then run \"git am --resolved\")" +msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" #: wt-status.c:831 @@ -1389,37 +1437,45 @@ msgstr "" msgid "You are currently cherry-picking." msgstr "" +#: wt-status.c:958 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr "" + #: wt-status.c:961 -msgid " (all conflicts fixed: run \"git commit\")" +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr "" + +#: wt-status.c:963 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:970 +#: wt-status.c:972 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:975 +#: wt-status.c:977 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:980 +#: wt-status.c:982 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:991 +#: wt-status.c:993 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:995 +#: wt-status.c:997 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:998 +#: wt-status.c:1000 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" @@ -1427,31 +1483,35 @@ msgstr "" msgid "On branch " msgstr "" -#: wt-status.c:1184 +#: wt-status.c:1180 +msgid "rebase in progress; onto " +msgstr "" + +#: wt-status.c:1187 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1186 +#: wt-status.c:1189 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1189 +#: wt-status.c:1192 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1206 +#: wt-status.c:1209 msgid "Initial commit" msgstr "" -#: wt-status.c:1220 +#: wt-status.c:1223 msgid "Untracked files" msgstr "" -#: wt-status.c:1222 +#: wt-status.c:1225 msgid "Ignored files" msgstr "" -#: wt-status.c:1226 +#: wt-status.c:1229 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1459,82 +1519,82 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1232 +#: wt-status.c:1235 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1234 +#: wt-status.c:1237 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1240 +#: wt-status.c:1243 msgid "No changes" msgstr "" -#: wt-status.c:1245 +#: wt-status.c:1248 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1248 +#: wt-status.c:1251 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1251 +#: wt-status.c:1254 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1254 +#: wt-status.c:1257 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1257 +#: wt-status.c:1260 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1260 wt-status.c:1265 +#: wt-status.c:1263 wt-status.c:1268 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1263 +#: wt-status.c:1266 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1267 +#: wt-status.c:1270 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1375 +#: wt-status.c:1378 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1381 +#: wt-status.c:1384 msgid "Initial commit on " msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1399 msgid "behind " msgstr "" -#: wt-status.c:1399 wt-status.c:1402 +#: wt-status.c:1402 wt-status.c:1405 msgid "ahead " msgstr "" -#: wt-status.c:1404 +#: wt-status.c:1407 msgid ", behind " msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:352 +#: compat/precompose_utf8.c:58 builtin/clone.c:351 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -1594,7 +1654,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:149 builtin/commit.c:233 +#: builtin/add.c:149 builtin/commit.c:238 msgid "updating files failed" msgstr "" @@ -1607,7 +1667,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275 +#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -1616,127 +1676,127 @@ msgstr "" msgid "Could not read the index" msgstr "" -#: builtin/add.c:349 +#: builtin/add.c:350 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:353 +#: builtin/add.c:354 msgid "Could not write patch" msgstr "" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:360 +#: builtin/add.c:361 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:366 +#: builtin/add.c:367 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:376 +#: builtin/add.c:377 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 -#: builtin/rm.c:206 +#: builtin/add.c:394 builtin/clean.c:851 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253 +#: builtin/rm.c:268 msgid "dry run" msgstr "" -#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 -#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 -#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19 +#: builtin/commit.c:1201 builtin/count-objects.c:95 builtin/fsck.c:613 +#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113 msgid "be verbose" msgstr "" -#: builtin/add.c:396 +#: builtin/add.c:397 msgid "interactive picking" msgstr "" -#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 +#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:398 +#: builtin/add.c:399 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:399 +#: builtin/add.c:400 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:400 +#: builtin/add.c:401 msgid "update tracked files" msgstr "" -#: builtin/add.c:401 +#: builtin/add.c:402 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:402 +#: builtin/add.c:403 msgid "add changes from all tracked and untracked files" msgstr "" #. takes no arguments -#: builtin/add.c:405 +#: builtin/add.c:406 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:407 +#: builtin/add.c:408 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:408 +#: builtin/add.c:409 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:409 +#: builtin/add.c:410 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:431 +#: builtin/add.c:432 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:432 +#: builtin/add.c:433 msgid "no files added" msgstr "" -#: builtin/add.c:438 +#: builtin/add.c:439 msgid "adding files failed" msgstr "" -#: builtin/add.c:477 +#: builtin/add.c:478 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:495 +#: builtin/add.c:496 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:525 +#: builtin/add.c:526 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:526 +#: builtin/add.c:527 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 -#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 +#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:895 +#: builtin/commit.c:298 builtin/mv.c:82 builtin/rm.c:297 msgid "index file corrupt" msgstr "" -#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "" @@ -1913,293 +1973,293 @@ msgstr "" msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3173 builtin/apply.c:3395 +#: builtin/apply.c:3174 builtin/apply.c:3396 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3254 builtin/apply.c:3409 +#: builtin/apply.c:3255 builtin/apply.c:3410 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 +#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3263 builtin/apply.c:3417 +#: builtin/apply.c:3264 builtin/apply.c:3418 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3365 +#: builtin/apply.c:3366 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3434 +#: builtin/apply.c:3435 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3436 +#: builtin/apply.c:3437 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3537 +#: builtin/apply.c:3538 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3540 +#: builtin/apply.c:3541 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3560 +#: builtin/apply.c:3561 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3565 +#: builtin/apply.c:3566 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3573 +#: builtin/apply.c:3574 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3586 +#: builtin/apply.c:3587 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 +#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3822 +#: builtin/apply.c:3823 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3850 +#: builtin/apply.c:3851 #, c-format -msgid "corrupt patch for subproject %s" +msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:3854 +#: builtin/apply.c:3855 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3859 +#: builtin/apply.c:3860 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3862 builtin/apply.c:3970 +#: builtin/apply.c:3863 builtin/apply.c:3971 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3895 +#: builtin/apply.c:3896 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3944 +#: builtin/apply.c:3945 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4031 +#: builtin/apply.c:4032 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4039 +#: builtin/apply.c:4040 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:4042 +#: builtin/apply.c:4043 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4052 +#: builtin/apply.c:4053 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4073 +#: builtin/apply.c:4074 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4076 +#: builtin/apply.c:4077 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4226 +#: builtin/apply.c:4227 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4237 +#: builtin/apply.c:4238 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "" -#: builtin/apply.c:4357 +#: builtin/apply.c:4358 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4360 +#: builtin/apply.c:4361 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4362 +#: builtin/apply.c:4363 msgid "num" msgstr "" -#: builtin/apply.c:4363 +#: builtin/apply.c:4364 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4366 +#: builtin/apply.c:4367 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4368 +#: builtin/apply.c:4369 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4372 +#: builtin/apply.c:4373 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4374 +#: builtin/apply.c:4375 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4376 +#: builtin/apply.c:4377 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4378 +#: builtin/apply.c:4379 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4380 +#: builtin/apply.c:4381 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4382 +#: builtin/apply.c:4383 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4384 +#: builtin/apply.c:4385 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4386 +#: builtin/apply.c:4387 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4391 +#: builtin/apply.c:4392 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4392 +#: builtin/apply.c:4393 msgid "action" msgstr "" -#: builtin/apply.c:4393 +#: builtin/apply.c:4394 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4396 builtin/apply.c:4399 +#: builtin/apply.c:4397 builtin/apply.c:4400 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4402 +#: builtin/apply.c:4403 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4404 +#: builtin/apply.c:4405 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4406 +#: builtin/apply.c:4407 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4408 +#: builtin/apply.c:4409 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4411 +#: builtin/apply.c:4412 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4414 +#: builtin/apply.c:4415 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4416 +#: builtin/apply.c:4417 msgid "root" msgstr "" -#: builtin/apply.c:4417 +#: builtin/apply.c:4418 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4439 +#: builtin/apply.c:4440 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4447 +#: builtin/apply.c:4448 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4450 +#: builtin/apply.c:4451 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4466 +#: builtin/apply.c:4467 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4480 +#: builtin/apply.c:4481 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4486 builtin/apply.c:4496 +#: builtin/apply.c:4487 builtin/apply.c:4497 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2253,103 +2313,103 @@ msgstr "" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/blame.c:25 +#: builtin/blame.c:26 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "" -#: builtin/blame.c:30 +#: builtin/blame.c:31 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2355 +#: builtin/blame.c:2276 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2356 +#: builtin/blame.c:2277 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2357 +#: builtin/blame.c:2278 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2358 +#: builtin/blame.c:2279 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2359 +#: builtin/blame.c:2280 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2360 +#: builtin/blame.c:2281 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2361 +#: builtin/blame.c:2282 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2362 +#: builtin/blame.c:2283 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2363 +#: builtin/blame.c:2284 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2364 +#: builtin/blame.c:2285 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2365 +#: builtin/blame.c:2286 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2366 +#: builtin/blame.c:2287 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2367 +#: builtin/blame.c:2288 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2368 +#: builtin/blame.c:2289 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2369 +#: builtin/blame.c:2290 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2370 +#: builtin/blame.c:2291 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2371 +#: builtin/blame.c:2292 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2372 +#: builtin/blame.c:2293 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2373 builtin/blame.c:2374 +#: builtin/blame.c:2294 builtin/blame.c:2295 msgid "score" msgstr "" -#: builtin/blame.c:2373 +#: builtin/blame.c:2294 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2374 +#: builtin/blame.c:2295 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2375 +#: builtin/blame.c:2296 msgid "n,m" msgstr "" -#: builtin/blame.c:2375 +#: builtin/blame.c:2296 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -2575,8 +2635,8 @@ msgid "act on remote-tracking branches" msgstr "" #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 -#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369 -#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 +#: builtin/branch.c:838 builtin/commit.c:1414 builtin/commit.c:1415 +#: builtin/commit.c:1416 builtin/commit.c:1417 builtin/tag.c:468 msgid "commit" msgstr "" @@ -2640,7 +2700,7 @@ msgstr "" msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:860 builtin/clone.c:619 +#: builtin/branch.c:860 builtin/clone.c:630 msgid "HEAD not found below refs/heads!" msgstr "" @@ -2753,43 +2813,43 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:176 +#: builtin/cat-file.c:303 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "" -#: builtin/cat-file.c:177 +#: builtin/cat-file.c:304 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "" -#: builtin/cat-file.c:195 +#: builtin/cat-file.c:341 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:196 +#: builtin/cat-file.c:342 msgid "show object type" msgstr "" -#: builtin/cat-file.c:197 +#: builtin/cat-file.c:343 msgid "show object size" msgstr "" -#: builtin/cat-file.c:199 +#: builtin/cat-file.c:345 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:200 +#: builtin/cat-file.c:346 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:202 +#: builtin/cat-file.c:348 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:204 +#: builtin/cat-file.c:350 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:207 +#: builtin/cat-file.c:353 msgid "show info about objects fed from the standard input" msgstr "" @@ -2817,30 +2877,55 @@ msgstr "" msgid "input paths are terminated by a null character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 +#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177 msgid "suppress progress reporting" msgstr "" -#: builtin/check-ignore.c:146 +#: builtin/check-ignore.c:26 +msgid "show non-matching input paths" +msgstr "" + +#: builtin/check-ignore.c:143 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:149 +#: builtin/check-ignore.c:146 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:151 +#: builtin/check-ignore.c:148 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:155 +#: builtin/check-ignore.c:152 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:154 msgid "cannot have both --quiet and --verbose" msgstr "" +#: builtin/check-ignore.c:157 +msgid "--non-matching is only valid with --verbose" +msgstr "" + +#: builtin/check-mailmap.c:8 +msgid "git check-mailmap [options] <contact>..." +msgstr "" + +#: builtin/check-mailmap.c:13 +msgid "also read contacts from stdin" +msgstr "" + +#: builtin/check-mailmap.c:24 +#, c-format +msgid "unable to parse contact: %s" +msgstr "" + +#: builtin/check-mailmap.c:47 +msgid "no contacts specified" +msgstr "" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "" @@ -2957,42 +3042,42 @@ msgstr "" msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:634 +#: builtin/checkout.c:639 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:641 +#: builtin/checkout.c:646 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:644 +#: builtin/checkout.c:649 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:648 +#: builtin/checkout.c:653 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:650 builtin/checkout.c:987 +#: builtin/checkout.c:655 builtin/checkout.c:997 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:652 +#: builtin/checkout.c:657 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:708 +#: builtin/checkout.c:713 #, c-format msgid " ... and %d more.\n" msgstr "" #. The singular version -#: builtin/checkout.c:714 +#: builtin/checkout.c:719 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3007,7 +3092,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:732 +#: builtin/checkout.c:737 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3017,450 +3102,547 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:762 +#: builtin/checkout.c:767 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:766 +#: builtin/checkout.c:771 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:793 builtin/checkout.c:982 +#: builtin/checkout.c:798 builtin/checkout.c:992 msgid "You are on a branch yet to be born" msgstr "" #. case (1) -#: builtin/checkout.c:918 +#: builtin/checkout.c:928 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree -#: builtin/checkout.c:957 +#: builtin/checkout.c:967 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1006 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:999 builtin/checkout.c:1003 +#: builtin/checkout.c:1009 builtin/checkout.c:1013 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025 +#: builtin/checkout.c:1028 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1033 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90 +#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" msgstr "" -#: builtin/checkout.c:1046 +#: builtin/checkout.c:1056 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1058 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1049 +#: builtin/checkout.c:1059 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1050 +#: builtin/checkout.c:1060 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:1061 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1063 msgid "new branch" msgstr "" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1063 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1054 +#: builtin/checkout.c:1064 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1066 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1068 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1069 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1060 builtin/merge.c:217 +#: builtin/checkout.c:1070 builtin/merge.c:232 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 +#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249 msgid "style" msgstr "" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1072 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1065 +#: builtin/checkout.c:1075 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1067 +#: builtin/checkout.c:1077 msgid "second guess 'git checkout no-such-branch'" msgstr "" -#: builtin/checkout.c:1091 +#: builtin/checkout.c:1101 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1118 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1125 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1172 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:20 -msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +#: builtin/clean.c:25 +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:24 +#: builtin/clean.c:29 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:25 +#: builtin/clean.c:30 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:26 +#: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:27 +#: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:28 +#: builtin/clean.c:33 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:160 +#: builtin/clean.c:293 +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing" +msgstr "" + +#: builtin/clean.c:297 +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting" +msgstr "" + +#: builtin/clean.c:491 +#, c-format +msgid "Huh (%s)?" +msgstr "" + +#: builtin/clean.c:634 +#, c-format +msgid "Input ignore patterns>> " +msgstr "" + +#: builtin/clean.c:671 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "" + +#: builtin/clean.c:692 +msgid "Select items to delete" +msgstr "" + +#: builtin/clean.c:732 +#, c-format +msgid "remove %s? " +msgstr "" + +#: builtin/clean.c:757 +msgid "Bye." +msgstr "" + +#: builtin/clean.c:765 +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "" + +#: builtin/clean.c:792 +msgid "*** Commands ***" +msgstr "" + +#: builtin/clean.c:793 +msgid "What now" +msgstr "" + +#: builtin/clean.c:801 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/clean.c:818 +msgid "No more files to clean, exiting." +msgstr "" + +#: builtin/clean.c:850 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:162 +#: builtin/clean.c:852 msgid "force" msgstr "" -#: builtin/clean.c:164 +#: builtin/clean.c:853 +msgid "interactive cleaning" +msgstr "" + +#: builtin/clean.c:855 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 -#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:856 builtin/describe.c:420 builtin/grep.c:716 +#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186 msgid "pattern" msgstr "" -#: builtin/clean.c:166 +#: builtin/clean.c:857 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:167 +#: builtin/clean.c:858 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:169 +#: builtin/clean.c:860 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:187 +#: builtin/clean.c:878 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:191 +#: builtin/clean.c:882 msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean" msgstr "" -#: builtin/clean.c:194 +#: builtin/clean.c:885 msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" +"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"refusing to clean" msgstr "" -#: builtin/clone.c:37 +#: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 -#: builtin/push.c:436 +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229 +#: builtin/push.c:462 msgid "force progress reporting" msgstr "" -#: builtin/clone.c:67 +#: builtin/clone.c:66 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:73 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:75 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:77 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:79 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:84 builtin/init-db.c:485 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "" -#: builtin/clone.c:85 builtin/init-db.c:486 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:86 msgid "reference repository" msgstr "" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:89 +#: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:91 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:93 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661 msgid "depth" msgstr "" -#: builtin/clone.c:95 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:97 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:98 builtin/init-db.c:494 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "" -#: builtin/clone.c:99 builtin/init-db.c:495 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "key=value" msgstr "" -#: builtin/clone.c:101 +#: builtin/clone.c:100 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:254 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: builtin/clone.c:317 +#: builtin/clone.c:316 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:319 builtin/diff.c:77 +#: builtin/clone.c:318 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:321 +#: builtin/clone.c:320 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:335 +#: builtin/clone.c:334 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:357 +#: builtin/clone.c:356 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:361 +#: builtin/clone.c:360 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:397 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:476 +#: builtin/clone.c:475 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:550 +#: builtin/clone.c:555 +#, c-format +msgid "Checking connectivity... " +msgstr "" + +#: builtin/clone.c:558 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:610 +#: builtin/clone.c:560 +#, c-format +msgid "done\n" +msgstr "" + +#: builtin/clone.c:621 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:641 +#: builtin/clone.c:652 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:749 +#: builtin/clone.c:760 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:753 +#: builtin/clone.c:764 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:764 +#: builtin/clone.c:775 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:767 +#: builtin/clone.c:778 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:780 +#: builtin/clone.c:791 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:785 +#: builtin/clone.c:796 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:795 +#: builtin/clone.c:798 +msgid "--local is ignored" +msgstr "" + +#: builtin/clone.c:808 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:805 +#: builtin/clone.c:818 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:818 builtin/clone.c:830 +#: builtin/clone.c:831 builtin/clone.c:843 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:821 +#: builtin/clone.c:834 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:840 +#: builtin/clone.c:853 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:842 +#: builtin/clone.c:855 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:877 +#: builtin/clone.c:890 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:926 +#: builtin/clone.c:942 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:933 +#: builtin/clone.c:949 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3496,15 +3678,15 @@ msgstr "" msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:34 +#: builtin/commit.c:35 msgid "git commit [options] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:39 +#: builtin/commit.c:40 msgid "git status [options] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:44 +#: builtin/commit.c:45 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3518,14 +3700,14 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:56 +#: builtin/commit.c:57 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -3535,93 +3717,93 @@ msgid "" "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:260 +#: builtin/commit.c:265 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:302 +#: builtin/commit.c:307 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:308 +#: builtin/commit.c:313 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 +#: builtin/commit.c:346 builtin/commit.c:367 builtin/commit.c:417 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:393 +#: builtin/commit.c:398 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:395 +#: builtin/commit.c:400 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:405 +#: builtin/commit.c:410 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:425 +#: builtin/commit.c:430 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:513 builtin/commit.c:519 +#: builtin/commit.c:521 builtin/commit.c:527 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:542 +#: builtin/commit.c:549 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:562 +#: builtin/commit.c:569 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 +#: builtin/commit.c:607 builtin/commit.c:640 builtin/commit.c:963 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:612 builtin/shortlog.c:270 +#: builtin/commit.c:619 builtin/shortlog.c:271 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:614 +#: builtin/commit.c:621 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:618 +#: builtin/commit.c:625 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:624 +#: builtin/commit.c:631 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:640 +#: builtin/commit.c:647 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:644 +#: builtin/commit.c:651 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:648 +#: builtin/commit.c:655 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:709 +#: builtin/commit.c:716 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:720 +#: builtin/commit.c:727 #, c-format msgid "" "\n" @@ -3631,7 +3813,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:725 +#: builtin/commit.c:732 #, c-format msgid "" "\n" @@ -3641,14 +3823,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:737 +#: builtin/commit.c:744 #, 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:742 +#: builtin/commit.c:749 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -3656,351 +3838,351 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:755 +#: builtin/commit.c:762 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:762 +#: builtin/commit.c:769 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:782 +#: builtin/commit.c:789 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:819 +#: builtin/commit.c:826 msgid "Error building trees" msgstr "" -#: builtin/commit.c:834 builtin/tag.c:359 +#: builtin/commit.c:841 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:931 +#: builtin/commit.c:938 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:946 builtin/commit.c:1140 +#: builtin/commit.c:953 builtin/commit.c:1189 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:976 +#: builtin/commit.c:990 +msgid "--long and -z are incompatible" +msgstr "" + +#: builtin/commit.c:1020 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:987 +#: builtin/commit.c:1031 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:990 +#: builtin/commit.c:1034 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:992 +#: builtin/commit.c:1036 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:995 +#: builtin/commit.c:1039 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1005 +#: builtin/commit.c:1049 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1007 +#: builtin/commit.c:1051 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1015 +#: builtin/commit.c:1059 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1032 +#: builtin/commit.c:1076 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1034 +#: builtin/commit.c:1078 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1036 +#: builtin/commit.c:1080 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1038 +#: builtin/commit.c:1082 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1048 builtin/tag.c:575 +#: builtin/commit.c:1092 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1053 +#: builtin/commit.c:1097 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1059 builtin/commit.c:1194 -msgid "--long and -z are incompatible" -msgstr "" - -#: builtin/commit.c:1154 builtin/commit.c:1390 +#: builtin/commit.c:1203 builtin/commit.c:1436 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1156 builtin/commit.c:1392 +#: builtin/commit.c:1205 builtin/commit.c:1438 msgid "show branch information" msgstr "" -#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 +#: builtin/commit.c:1207 builtin/commit.c:1440 builtin/push.c:452 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1161 builtin/commit.c:1396 +#: builtin/commit.c:1210 builtin/commit.c:1442 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1164 builtin/commit.c:1399 +#: builtin/commit.c:1213 builtin/commit.c:1445 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 -#: builtin/fast-export.c:662 builtin/tag.c:459 +#: builtin/commit.c:1215 builtin/commit.c:1448 builtin/fast-export.c:667 +#: builtin/fast-export.c:670 builtin/tag.c:459 msgid "mode" msgstr "" -#: builtin/commit.c:1167 builtin/commit.c:1402 +#: builtin/commit.c:1216 builtin/commit.c:1448 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1219 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1171 parse-options.h:151 +#: builtin/commit.c:1220 parse-options.h:154 msgid "when" msgstr "" -#: builtin/commit.c:1172 +#: builtin/commit.c:1221 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1174 +#: builtin/commit.c:1223 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1248 +#: builtin/commit.c:1294 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1250 +#: builtin/commit.c:1296 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1291 +#: builtin/commit.c:1337 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1293 +#: builtin/commit.c:1339 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1406 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1361 +#: builtin/commit.c:1407 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1409 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1364 builtin/tag.c:457 +#: builtin/commit.c:1410 builtin/tag.c:457 msgid "read message from file" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1411 msgid "author" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1411 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1366 builtin/gc.c:178 +#: builtin/commit.c:1412 builtin/gc.c:178 msgid "date" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1412 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 -#: builtin/notes.c:690 builtin/tag.c:455 +#: builtin/commit.c:1413 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "" -#: builtin/commit.c:1367 +#: builtin/commit.c:1413 msgid "commit message" msgstr "" -#: builtin/commit.c:1368 +#: builtin/commit.c:1414 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1369 +#: builtin/commit.c:1415 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1370 +#: builtin/commit.c:1416 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1371 +#: builtin/commit.c:1417 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1372 +#: builtin/commit.c:1418 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109 +#: builtin/commit.c:1419 builtin/log.c:1160 builtin/revert.c:111 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1374 +#: builtin/commit.c:1420 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1375 +#: builtin/commit.c:1421 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1376 +#: builtin/commit.c:1422 msgid "default" msgstr "" -#: builtin/commit.c:1376 builtin/tag.c:460 +#: builtin/commit.c:1422 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1377 +#: builtin/commit.c:1423 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 +#: builtin/commit.c:1424 builtin/merge.c:230 builtin/tag.c:461 msgid "key id" msgstr "" -#: builtin/commit.c:1379 builtin/merge.c:216 +#: builtin/commit.c:1425 builtin/merge.c:231 msgid "GPG sign commit" msgstr "" #. end commit message options -#: builtin/commit.c:1382 +#: builtin/commit.c:1428 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1429 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1384 +#: builtin/commit.c:1430 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1385 +#: builtin/commit.c:1431 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1386 +#: builtin/commit.c:1432 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1387 +#: builtin/commit.c:1433 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1434 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1389 +#: builtin/commit.c:1435 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1400 +#: builtin/commit.c:1446 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1401 +#: builtin/commit.c:1447 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1406 +#: builtin/commit.c:1452 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1409 +#: builtin/commit.c:1455 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1441 +#: builtin/commit.c:1488 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1479 builtin/merge.c:510 +#: builtin/commit.c:1526 builtin/merge.c:525 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1486 +#: builtin/commit.c:1533 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1540 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1512 +#: builtin/commit.c:1559 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1526 +#: builtin/commit.c:1573 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1531 +#: builtin/commit.c:1578 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 +#: builtin/commit.c:1593 builtin/merge.c:861 builtin/merge.c:886 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1567 +#: builtin/commit.c:1614 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1571 +#: builtin/commit.c:1618 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1629 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4011,115 +4193,123 @@ msgstr "" msgid "git config [options]" msgstr "" -#: builtin/config.c:51 +#: builtin/config.c:52 msgid "Config file location" msgstr "" -#: builtin/config.c:52 +#: builtin/config.c:53 msgid "use global config file" msgstr "" -#: builtin/config.c:53 +#: builtin/config.c:54 msgid "use system config file" msgstr "" -#: builtin/config.c:54 +#: builtin/config.c:55 msgid "use repository config file" msgstr "" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "use given config file" msgstr "" -#: builtin/config.c:56 -msgid "Action" +#: builtin/config.c:57 +msgid "blob-id" msgstr "" #: builtin/config.c:57 -msgid "get value: name [value-regex]" +msgid "read config from given blob object" msgstr "" #: builtin/config.c:58 -msgid "get all values: key [value-regex]" +msgid "Action" msgstr "" #: builtin/config.c:59 -msgid "get values for regexp: name-regex [value-regex]" +msgid "get value: name [value-regex]" msgstr "" #: builtin/config.c:60 -msgid "replace all matching variables: name value [value_regex]" +msgid "get all values: key [value-regex]" msgstr "" #: builtin/config.c:61 -msgid "add a new variable: name value" +msgid "get values for regexp: name-regex [value-regex]" msgstr "" #: builtin/config.c:62 -msgid "remove a variable: name [value-regex]" +msgid "replace all matching variables: name value [value_regex]" msgstr "" #: builtin/config.c:63 -msgid "remove all matches: name [value-regex]" +msgid "add a new variable: name value" msgstr "" #: builtin/config.c:64 -msgid "rename section: old-name new-name" +msgid "remove a variable: name [value-regex]" msgstr "" #: builtin/config.c:65 -msgid "remove a section: name" +msgid "remove all matches: name [value-regex]" msgstr "" #: builtin/config.c:66 -msgid "list all" +msgid "rename section: old-name new-name" msgstr "" #: builtin/config.c:67 +msgid "remove a section: name" +msgstr "" + +#: builtin/config.c:68 +msgid "list all" +msgstr "" + +#: builtin/config.c:69 msgid "open an editor" msgstr "" -#: builtin/config.c:68 builtin/config.c:69 +#: builtin/config.c:70 builtin/config.c:71 msgid "slot" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:70 msgid "find the color configured: [default]" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:71 msgid "find the color setting: [stdout-is-tty]" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:72 msgid "Type" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:73 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:74 msgid "value is decimal number" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:75 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:76 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:77 msgid "Other" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:78 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:79 msgid "respect include directives on lookup" msgstr "" @@ -4131,133 +4321,137 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:15 +#: builtin/describe.c:16 msgid "git describe [options] <committish>*" msgstr "" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] --dirty" msgstr "" -#: builtin/describe.c:233 +#: builtin/describe.c:237 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:237 +#: builtin/describe.c:241 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:239 +#: builtin/describe.c:243 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:266 +#: builtin/describe.c:270 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:269 +#: builtin/describe.c:273 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:286 +#: builtin/describe.c:290 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:288 +#: builtin/describe.c:292 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:328 +#: builtin/describe.c:332 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:352 +#: builtin/describe.c:359 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:356 +#: builtin/describe.c:363 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:377 +#: builtin/describe.c:384 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:380 +#: builtin/describe.c:387 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:402 +#: builtin/describe.c:409 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:403 +#: builtin/describe.c:410 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:404 +#: builtin/describe.c:411 msgid "use any ref" msgstr "" -#: builtin/describe.c:405 +#: builtin/describe.c:412 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:406 +#: builtin/describe.c:413 msgid "always use long format" msgstr "" -#: builtin/describe.c:409 +#: builtin/describe.c:414 +msgid "only follow first parent" +msgstr "" + +#: builtin/describe.c:417 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:411 +#: builtin/describe.c:419 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:413 +#: builtin/describe.c:421 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:415 builtin/name-rev.c:238 +#: builtin/describe.c:423 builtin/name-rev.c:322 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:416 +#: builtin/describe.c:424 msgid "mark" msgstr "" -#: builtin/describe.c:417 +#: builtin/describe.c:425 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:435 +#: builtin/describe.c:443 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:461 +#: builtin/describe.c:469 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:481 +#: builtin/describe.c:489 msgid "--dirty is incompatible with committishes" msgstr "" @@ -4266,31 +4460,26 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:228 +#: builtin/diff.c:230 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:305 +#: builtin/diff.c:307 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:348 +#: builtin/diff.c:350 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:353 -#, c-format -msgid "more than %d trees given: '%s'" -msgstr "" - -#: builtin/diff.c:363 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:371 +#: builtin/diff.c:366 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -4299,39 +4488,39 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:658 +#: builtin/fast-export.c:666 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:660 +#: builtin/fast-export.c:668 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:663 +#: builtin/fast-export.c:671 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:666 +#: builtin/fast-export.c:674 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:668 +#: builtin/fast-export.c:676 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:670 +#: builtin/fast-export.c:678 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:672 +#: builtin/fast-export.c:680 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:674 +#: builtin/fast-export.c:682 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:675 +#: builtin/fast-export.c:683 msgid "Skip output of blob data" msgstr "" @@ -4407,7 +4596,7 @@ msgstr "" msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:88 builtin/log.c:1130 +#: builtin/fetch.c:88 builtin/log.c:1177 msgid "dir" msgstr "" @@ -4419,162 +4608,162 @@ msgstr "" msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:204 +#: builtin/fetch.c:220 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:257 +#: builtin/fetch.c:273 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:262 +#: builtin/fetch.c:278 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:276 +#: builtin/fetch.c:292 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:277 builtin/fetch.c:363 +#: builtin/fetch.c:293 builtin/fetch.c:379 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:288 +#: builtin/fetch.c:304 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 +#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:308 +#: builtin/fetch.c:324 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:311 +#: builtin/fetch.c:327 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:314 +#: builtin/fetch.c:330 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:359 +#: builtin/fetch.c:375 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:359 +#: builtin/fetch.c:375 msgid "forced update" msgstr "" -#: builtin/fetch.c:365 +#: builtin/fetch.c:381 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:396 builtin/fetch.c:688 +#: builtin/fetch.c:412 builtin/fetch.c:718 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:405 +#: builtin/fetch.c:421 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:491 +#: builtin/fetch.c:520 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:502 +#: builtin/fetch.c:531 #, 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:552 +#: builtin/fetch.c:581 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:553 +#: builtin/fetch.c:582 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:560 +#: builtin/fetch.c:589 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:561 builtin/remote.c:1055 +#: builtin/fetch.c:590 builtin/remote.c:1055 msgid "(none)" msgstr "" -#: builtin/fetch.c:678 +#: builtin/fetch.c:708 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:712 +#: builtin/fetch.c:742 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:823 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:792 +#: builtin/fetch.c:826 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:894 +#: builtin/fetch.c:928 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:896 builtin/remote.c:100 +#: builtin/fetch.c:930 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:915 +#: builtin/fetch.c:949 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:935 +#: builtin/fetch.c:969 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:981 +#: builtin/fetch.c:1015 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:983 +#: builtin/fetch.c:1017 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1036 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1004 +#: builtin/fetch.c:1038 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1049 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1023 +#: builtin/fetch.c:1057 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -4582,9 +4771,9 @@ msgstr "" msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701 -#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243 msgid "n" msgstr "" @@ -4739,220 +4928,220 @@ msgstr "" msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:365 +#: builtin/grep.c:364 #, c-format msgid "Failed to chdir: %s" msgstr "" -#: builtin/grep.c:443 builtin/grep.c:478 +#: builtin/grep.c:442 builtin/grep.c:477 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:493 +#: builtin/grep.c:492 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:551 +#: builtin/grep.c:550 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:568 +#: builtin/grep.c:567 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:643 +#: builtin/grep.c:642 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:645 +#: builtin/grep.c:644 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:647 +#: builtin/grep.c:646 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:649 +#: builtin/grep.c:648 msgid "search also in ignored files" msgstr "" -#: builtin/grep.c:652 +#: builtin/grep.c:651 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:654 +#: builtin/grep.c:653 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:656 +#: builtin/grep.c:655 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:658 +#: builtin/grep.c:657 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:660 +#: builtin/grep.c:659 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:663 +#: builtin/grep.c:662 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:667 +#: builtin/grep.c:666 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:670 +#: builtin/grep.c:669 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:673 +#: builtin/grep.c:672 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:676 +#: builtin/grep.c:675 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:679 +#: builtin/grep.c:678 msgid "show line numbers" msgstr "" -#: builtin/grep.c:680 +#: builtin/grep.c:679 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:681 +#: builtin/grep.c:680 msgid "show filenames" msgstr "" -#: builtin/grep.c:683 +#: builtin/grep.c:682 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:685 +#: builtin/grep.c:684 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:687 +#: builtin/grep.c:686 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:690 +#: builtin/grep.c:689 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:692 +#: builtin/grep.c:691 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:694 +#: builtin/grep.c:693 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:695 +#: builtin/grep.c:694 msgid "highlight matches" msgstr "" -#: builtin/grep.c:697 +#: builtin/grep.c:696 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:699 +#: builtin/grep.c:698 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:702 +#: builtin/grep.c:701 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:705 +#: builtin/grep.c:704 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:707 +#: builtin/grep.c:706 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:707 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:711 +#: builtin/grep.c:710 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:713 +#: builtin/grep.c:712 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:716 +#: builtin/grep.c:715 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:718 +#: builtin/grep.c:717 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:720 +#: builtin/grep.c:719 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:732 +#: builtin/grep.c:731 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:734 +#: builtin/grep.c:733 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:736 +#: builtin/grep.c:735 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:739 msgid "pager" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:739 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:743 +#: builtin/grep.c:742 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:744 builtin/show-ref.c:184 +#: builtin/grep.c:743 builtin/show-ref.c:188 msgid "show usage" msgstr "" -#: builtin/grep.c:811 +#: builtin/grep.c:810 msgid "no pattern given." msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:865 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:905 +#: builtin/grep.c:904 msgid "both --cached and trees are given." msgstr "" @@ -4990,396 +5179,396 @@ msgstr "" msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:43 +#: builtin/help.c:41 msgid "print all available commands" msgstr "" -#: builtin/help.c:44 +#: builtin/help.c:42 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:45 +#: builtin/help.c:43 msgid "show man page" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:44 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:46 msgid "show info page" msgstr "" -#: builtin/help.c:54 +#: builtin/help.c:52 msgid "git help [--all] [--guides] [--man|--web|--info] [command]" msgstr "" -#: builtin/help.c:66 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:94 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:107 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:115 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:218 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:230 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:351 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:368 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:376 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:422 +#: builtin/help.c:420 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:423 +#: builtin/help.c:421 msgid "A Git glossary" msgstr "" -#: builtin/help.c:424 +#: builtin/help.c:422 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: builtin/help.c:425 +#: builtin/help.c:423 msgid "Defining submodule properties" msgstr "" -#: builtin/help.c:426 +#: builtin/help.c:424 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:427 +#: builtin/help.c:425 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: builtin/help.c:428 +#: builtin/help.c:426 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:440 +#: builtin/help.c:438 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:462 builtin/help.c:478 +#: builtin/help.c:460 builtin/help.c:476 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:494 +#: builtin/help.c:492 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:182 +#: builtin/index-pack.c:184 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:202 +#: builtin/index-pack.c:204 msgid "object of unexpected type" msgstr "" -#: builtin/index-pack.c:239 +#: builtin/index-pack.c:244 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:254 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c:255 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:262 +#: builtin/index-pack.c:267 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:274 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:285 +#: builtin/index-pack.c:290 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:295 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:309 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:306 +#: builtin/index-pack.c:311 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:329 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:446 +#: builtin/index-pack.c:451 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:495 +#: builtin/index-pack.c:500 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:503 +#: builtin/index-pack.c:508 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:516 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:542 +#: builtin/index-pack.c:547 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:549 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:570 +#: builtin/index-pack.c:575 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 -#: builtin/index-pack.c:724 builtin/index-pack.c:733 +#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 +#: builtin/index-pack.c:729 builtin/index-pack.c:738 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:664 builtin/pack-objects.c:170 +#: builtin/index-pack.c:669 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:730 +#: builtin/index-pack.c:735 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:744 +#: builtin/index-pack.c:749 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:759 +#: builtin/index-pack.c:763 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:761 +#: builtin/index-pack.c:766 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:763 +#: builtin/index-pack.c:768 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:833 builtin/index-pack.c:863 +#: builtin/index-pack.c:838 builtin/index-pack.c:868 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1004 +#: builtin/index-pack.c:1009 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1004 +#: builtin/index-pack.c:1009 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1030 +#: builtin/index-pack.c:1035 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1035 +#: builtin/index-pack.c:1040 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1038 +#: builtin/index-pack.c:1043 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1049 +#: builtin/index-pack.c:1054 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1072 +#: builtin/index-pack.c:1077 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1082 +#: builtin/index-pack.c:1087 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1129 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1132 +#: builtin/index-pack.c:1137 #, c-format msgid "completed with %d local objects" msgstr "" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1147 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1151 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1176 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1255 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1279 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1292 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1300 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1308 +#: builtin/index-pack.c:1313 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1319 +#: builtin/index-pack.c:1324 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1352 +#: builtin/index-pack.c:1357 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1358 +#: builtin/index-pack.c:1363 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1362 builtin/index-pack.c:1535 +#: builtin/index-pack.c:1367 builtin/index-pack.c:1545 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1425 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1422 +#: builtin/index-pack.c:1427 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1474 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1481 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1509 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1547 builtin/index-pack.c:1550 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1566 +#: builtin/index-pack.c:1557 builtin/index-pack.c:1560 +#: builtin/index-pack.c:1572 builtin/index-pack.c:1576 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1580 +#: builtin/index-pack.c:1590 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1584 builtin/index-pack.c:1594 +#: builtin/index-pack.c:1594 builtin/index-pack.c:1604 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1613 msgid "--verify with no packfile name given" msgstr "" @@ -5513,7 +5702,7 @@ msgstr "" msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:493 builtin/prune-packed.c:77 +#: builtin/init-db.c:493 builtin/prune-packed.c:75 msgid "be quiet" msgstr "" @@ -5543,340 +5732,353 @@ msgstr "" msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/log.c:40 +#: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "" -#: builtin/log.c:41 +#: builtin/log.c:42 msgid " or: git show [options] <object>..." msgstr "" -#: builtin/log.c:103 +#: builtin/log.c:124 msgid "suppress diff output" msgstr "" -#: builtin/log.c:104 +#: builtin/log.c:125 msgid "show source" msgstr "" -#: builtin/log.c:105 +#: builtin/log.c:126 msgid "Use mail map file" msgstr "" -#: builtin/log.c:106 +#: builtin/log.c:127 msgid "decorate options" msgstr "" -#: builtin/log.c:199 +#: builtin/log.c:230 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:422 builtin/log.c:514 +#: builtin/log.c:453 builtin/log.c:545 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:538 +#: builtin/log.c:569 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:638 +#: builtin/log.c:669 msgid "format.headers without value" msgstr "" -#: builtin/log.c:720 +#: builtin/log.c:751 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:736 +#: builtin/log.c:767 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:750 +#: builtin/log.c:781 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:758 +#: builtin/log.c:789 msgid "Not a range." msgstr "" -#: builtin/log.c:860 +#: builtin/log.c:891 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:936 +#: builtin/log.c:967 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:964 +#: builtin/log.c:995 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "" -#: builtin/log.c:1009 +#: builtin/log.c:1040 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1108 +#: builtin/log.c:1155 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1111 +#: builtin/log.c:1158 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1115 +#: builtin/log.c:1162 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1117 +#: builtin/log.c:1164 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1119 +#: builtin/log.c:1166 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1120 +#: builtin/log.c:1167 msgid "sfx" msgstr "" -#: builtin/log.c:1121 +#: builtin/log.c:1168 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1123 +#: builtin/log.c:1170 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1125 +#: builtin/log.c:1172 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1127 +#: builtin/log.c:1174 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1130 +#: builtin/log.c:1177 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1133 +#: builtin/log.c:1180 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1136 +#: builtin/log.c:1183 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1138 +#: builtin/log.c:1185 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1140 +#: builtin/log.c:1187 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1142 +#: builtin/log.c:1189 msgid "Messaging" msgstr "" -#: builtin/log.c:1143 +#: builtin/log.c:1190 msgid "header" msgstr "" -#: builtin/log.c:1144 +#: builtin/log.c:1191 msgid "add email header" msgstr "" -#: builtin/log.c:1145 builtin/log.c:1147 +#: builtin/log.c:1192 builtin/log.c:1194 msgid "email" msgstr "" -#: builtin/log.c:1145 +#: builtin/log.c:1192 msgid "add To: header" msgstr "" -#: builtin/log.c:1147 +#: builtin/log.c:1194 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1149 +#: builtin/log.c:1196 +msgid "ident" +msgstr "" + +#: builtin/log.c:1197 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "" + +#: builtin/log.c:1199 msgid "message-id" msgstr "" -#: builtin/log.c:1150 +#: builtin/log.c:1200 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1151 builtin/log.c:1154 +#: builtin/log.c:1201 builtin/log.c:1204 msgid "boundary" msgstr "" -#: builtin/log.c:1152 +#: builtin/log.c:1202 msgid "attach the patch" msgstr "" -#: builtin/log.c:1155 +#: builtin/log.c:1205 msgid "inline the patch" msgstr "" -#: builtin/log.c:1159 +#: builtin/log.c:1209 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1161 +#: builtin/log.c:1211 msgid "signature" msgstr "" -#: builtin/log.c:1162 +#: builtin/log.c:1212 msgid "add a signature" msgstr "" -#: builtin/log.c:1164 +#: builtin/log.c:1214 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1248 +#: builtin/log.c:1288 +#, c-format +msgid "invalid ident line: %s" +msgstr "" + +#: builtin/log.c:1303 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1250 +#: builtin/log.c:1305 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1258 +#: builtin/log.c:1313 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1260 +#: builtin/log.c:1315 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1262 +#: builtin/log.c:1317 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1285 +#: builtin/log.c:1340 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1287 +#: builtin/log.c:1342 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1435 +#: builtin/log.c:1490 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1484 +#: builtin/log.c:1539 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1539 +#: builtin/log.c:1594 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 +#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:402 +#: builtin/ls-files.c:408 msgid "git ls-files [options] [<file>...]" msgstr "" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:465 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:467 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:469 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:471 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:473 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:475 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:477 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:480 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:482 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:484 msgid "show 'other' directories' name only" msgstr "" -#: builtin/ls-files.c:481 +#: builtin/ls-files.c:487 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:484 +#: builtin/ls-files.c:490 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:492 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:494 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:491 +#: builtin/ls-files.c:497 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:494 +#: builtin/ls-files.c:500 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:496 +#: builtin/ls-files.c:502 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:499 +#: builtin/ls-files.c:505 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:508 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:509 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:504 +#: builtin/ls-files.c:510 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:512 msgid "show debugging data" msgstr "" @@ -5928,167 +6130,167 @@ msgstr "" msgid "git merge --abort" msgstr "" -#: builtin/merge.c:90 +#: builtin/merge.c:98 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:127 +#: builtin/merge.c:135 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:128 +#: builtin/merge.c:136 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:133 +#: builtin/merge.c:141 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:183 +#: builtin/merge.c:198 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:186 +#: builtin/merge.c:201 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:187 +#: builtin/merge.c:202 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:189 +#: builtin/merge.c:204 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:192 +#: builtin/merge.c:207 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:194 +#: builtin/merge.c:209 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:196 +#: builtin/merge.c:211 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:198 +#: builtin/merge.c:212 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:200 +#: builtin/merge.c:214 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:203 +#: builtin/merge.c:218 msgid "Verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 +#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:205 +#: builtin/merge.c:220 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:206 +#: builtin/merge.c:221 msgid "option=value" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:222 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:209 +#: builtin/merge.c:224 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:213 +#: builtin/merge.c:228 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:242 +#: builtin/merge.c:257 msgid "could not run stash." msgstr "" -#: builtin/merge.c:247 +#: builtin/merge.c:262 msgid "stash failed" msgstr "" -#: builtin/merge.c:252 +#: builtin/merge.c:267 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:271 builtin/merge.c:288 +#: builtin/merge.c:286 builtin/merge.c:303 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:318 +#: builtin/merge.c:333 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:331 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:363 +#: builtin/merge.c:378 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:365 +#: builtin/merge.c:380 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:388 +#: builtin/merge.c:403 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:438 +#: builtin/merge.c:453 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:550 +#: builtin/merge.c:565 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:643 +#: builtin/merge.c:657 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:671 +#: builtin/merge.c:685 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:685 +#: builtin/merge.c:699 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:699 +#: builtin/merge.c:713 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:788 +#: builtin/merge.c:802 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:797 +#: builtin/merge.c:811 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:803 +#: builtin/merge.c:817 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6098,161 +6300,157 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:827 +#: builtin/merge.c:841 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:839 +#: builtin/merge.c:853 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:904 +#: builtin/merge.c:918 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:920 +#: builtin/merge.c:934 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:961 +#: builtin/merge.c:975 msgid "No current branch." msgstr "" -#: builtin/merge.c:963 +#: builtin/merge.c:977 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:965 +#: builtin/merge.c:979 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:970 +#: builtin/merge.c:984 #, c-format -msgid "No remote tracking branch for %s from %s" +msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1057 builtin/merge.c:1214 -#, c-format -msgid "%s - not something we can merge" -msgstr "" - -#: builtin/merge.c:1125 +#: builtin/merge.c:1140 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1141 git-pull.sh:31 +#: builtin/merge.c:1156 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1144 git-pull.sh:34 +#: builtin/merge.c:1159 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1148 +#: builtin/merge.c:1163 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1151 +#: builtin/merge.c:1166 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1160 +#: builtin/merge.c:1175 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1165 -msgid "You cannot combine --no-ff with --ff-only." -msgstr "" - -#: builtin/merge.c:1172 +#: builtin/merge.c:1184 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1204 +#: builtin/merge.c:1216 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1209 +#: builtin/merge.c:1221 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1265 +#: builtin/merge.c:1226 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1277 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1268 +#: builtin/merge.c:1280 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" #. 'N' -#: builtin/merge.c:1271 +#: builtin/merge.c:1283 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1274 +#: builtin/merge.c:1286 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1358 +#: builtin/merge.c:1370 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1397 +#: builtin/merge.c:1409 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1404 +#: builtin/merge.c:1416 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1436 +#: builtin/merge.c:1448 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1459 builtin/merge.c:1538 +#: builtin/merge.c:1471 builtin/merge.c:1550 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1463 +#: builtin/merge.c:1475 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1529 +#: builtin/merge.c:1541 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1531 +#: builtin/merge.c:1543 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1540 +#: builtin/merge.c:1552 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1552 +#: builtin/merge.c:1564 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6417,369 +6615,352 @@ msgstr "" msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:175 +#: builtin/name-rev.c:259 msgid "git name-rev [options] <commit>..." msgstr "" -#: builtin/name-rev.c:176 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --all" msgstr "" -#: builtin/name-rev.c:177 +#: builtin/name-rev.c:261 msgid "git name-rev [options] --stdin" msgstr "" -#: builtin/name-rev.c:229 +#: builtin/name-rev.c:313 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:230 +#: builtin/name-rev.c:314 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:232 +#: builtin/name-rev.c:316 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:234 +#: builtin/name-rev.c:318 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:235 +#: builtin/name-rev.c:319 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:236 +#: builtin/name-rev.c:320 msgid "allow to print `undefined` names" msgstr "" -#: builtin/notes.c:26 +#: builtin/name-rev.c:326 +msgid "dereference tags in the input (internal use)" +msgstr "" + +#: builtin/notes.c:24 msgid "git notes [--ref <notes_ref>] [list [<object>]]" msgstr "" -#: builtin/notes.c:27 +#: builtin/notes.c:25 msgid "" "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" -#: builtin/notes.c:28 +#: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:29 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" -#: builtin/notes.c:30 +#: builtin/notes.c:28 msgid "git notes [--ref <notes_ref>] edit [<object>]" msgstr "" -#: builtin/notes.c:31 +#: builtin/notes.c:29 msgid "git notes [--ref <notes_ref>] show [<object>]" msgstr "" -#: builtin/notes.c:32 +#: builtin/notes.c:30 msgid "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" msgstr "" -#: builtin/notes.c:33 +#: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" msgstr "" -#: builtin/notes.c:34 +#: builtin/notes.c:32 msgid "git notes merge --abort [-v | -q]" msgstr "" -#: builtin/notes.c:35 +#: builtin/notes.c:33 msgid "git notes [--ref <notes_ref>] remove [<object>...]" msgstr "" -#: builtin/notes.c:36 +#: builtin/notes.c:34 msgid "git notes [--ref <notes_ref>] prune [-n | -v]" msgstr "" -#: builtin/notes.c:37 +#: builtin/notes.c:35 msgid "git notes [--ref <notes_ref>] get-ref" msgstr "" -#: builtin/notes.c:42 +#: builtin/notes.c:40 msgid "git notes [list [<object>]]" msgstr "" -#: builtin/notes.c:47 +#: builtin/notes.c:45 msgid "git notes add [<options>] [<object>]" msgstr "" -#: builtin/notes.c:52 +#: builtin/notes.c:50 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:53 +#: builtin/notes.c:51 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "" -#: builtin/notes.c:58 +#: builtin/notes.c:56 msgid "git notes append [<options>] [<object>]" msgstr "" -#: builtin/notes.c:63 +#: builtin/notes.c:61 msgid "git notes edit [<object>]" msgstr "" -#: builtin/notes.c:68 +#: builtin/notes.c:66 msgid "git notes show [<object>]" msgstr "" -#: builtin/notes.c:73 +#: builtin/notes.c:71 msgid "git notes merge [<options>] <notes_ref>" msgstr "" -#: builtin/notes.c:74 +#: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" msgstr "" -#: builtin/notes.c:75 +#: builtin/notes.c:73 msgid "git notes merge --abort [<options>]" msgstr "" -#: builtin/notes.c:80 +#: builtin/notes.c:78 msgid "git notes remove [<object>]" msgstr "" -#: builtin/notes.c:85 +#: builtin/notes.c:83 msgid "git notes prune [<options>]" msgstr "" -#: builtin/notes.c:90 +#: builtin/notes.c:88 msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:139 +#: builtin/notes.c:137 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:143 +#: builtin/notes.c:141 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:151 +#: builtin/notes.c:149 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:169 builtin/tag.c:341 +#: builtin/notes.c:167 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "" -#: builtin/notes.c:188 +#: builtin/notes.c:186 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:209 builtin/notes.c:972 +#: builtin/notes.c:207 builtin/notes.c:844 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:214 +#: builtin/notes.c:212 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:216 +#: builtin/notes.c:214 #, c-format msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:250 builtin/tag.c:540 +#: builtin/notes.c:248 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:252 builtin/tag.c:543 +#: builtin/notes.c:250 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 -#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 -#: builtin/notes.c:967 builtin/tag.c:556 +#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 +#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 +#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 +#: builtin/notes.c:839 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:274 +#: builtin/notes.c:272 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:298 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "" - -#: builtin/notes.c:339 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "" - -#: builtin/notes.c:349 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "" - -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: builtin/notes.c:376 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "" - -#: builtin/notes.c:440 +#: builtin/notes.c:312 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:455 +#: builtin/notes.c:327 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 -#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 -#: builtin/notes.c:1032 +#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 +#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 +#: builtin/notes.c:904 msgid "too many parameters" msgstr "" -#: builtin/notes.c:512 builtin/notes.c:771 +#: builtin/notes.c:384 builtin/notes.c:643 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:534 builtin/notes.c:691 +#: builtin/notes.c:406 builtin/notes.c:563 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:537 builtin/notes.c:694 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 -#: builtin/notes.c:699 builtin/tag.c:474 +#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 +#: builtin/notes.c:571 builtin/tag.c:474 msgid "object" msgstr "" -#: builtin/notes.c:540 builtin/notes.c:697 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:543 builtin/notes.c:700 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:545 builtin/notes.c:613 +#: builtin/notes.c:417 builtin/notes.c:485 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:579 +#: builtin/notes.c:451 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:584 builtin/notes.c:661 +#: builtin/notes.c:456 builtin/notes.c:533 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:614 +#: builtin/notes.c:486 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:616 +#: builtin/notes.c:488 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:634 +#: builtin/notes.c:506 msgid "too few parameters" msgstr "" -#: builtin/notes.c:655 +#: builtin/notes.c:527 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:667 +#: builtin/notes.c:539 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:716 +#: builtin/notes.c:588 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:863 +#: builtin/notes.c:735 msgid "General options" msgstr "" -#: builtin/notes.c:865 +#: builtin/notes.c:737 msgid "Merge options" msgstr "" -#: builtin/notes.c:867 +#: builtin/notes.c:739 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:869 +#: builtin/notes.c:741 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:871 +#: builtin/notes.c:743 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:873 +#: builtin/notes.c:745 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:875 +#: builtin/notes.c:747 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:970 +#: builtin/notes.c:842 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:982 +#: builtin/notes.c:854 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:985 +#: builtin/notes.c:857 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:1066 +#: builtin/notes.c:938 msgid "notes_ref" msgstr "" -#: builtin/notes.c:1067 +#: builtin/notes.c:939 msgid "use notes from <notes_ref>" msgstr "" -#: builtin/notes.c:1102 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -7002,7 +7183,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:121 +#: builtin/push.c:117 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7012,7 +7193,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:128 +#: builtin/push.c:131 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7021,12 +7202,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:136 +#: builtin/push.c:139 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:139 +#: builtin/push.c:142 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7034,7 +7215,7 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:151 +#: builtin/push.c:165 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7052,20 +7233,20 @@ msgid "" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -#: builtin/push.c:199 +#: builtin/push.c:225 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:206 +#: builtin/push.c:232 msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" -"before pushing again.\n" +"its remote counterpart. Integrate the remote changes (e.g.\n" +"'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:212 +#: builtin/push.c:238 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7073,50 +7254,50 @@ msgid "" "to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" -#: builtin/push.c:218 +#: builtin/push.c:244 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. Check out this branch and merge the remote changes\n" -"(e.g. 'git pull') before pushing again.\n" +"counterpart. Check out this branch and integrate the remote changes\n" +"(e.g. 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:224 +#: builtin/push.c:250 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" -"to the same ref. You may want to first merge the remote changes (e.g.,\n" -"'git pull') before pushing again.\n" +"to the same ref. You may want to first integrate the remote changes\n" +"(e.g., 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:231 +#: builtin/push.c:257 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:234 +#: builtin/push.c:260 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:294 +#: builtin/push.c:320 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:298 +#: builtin/push.c:324 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:331 +#: builtin/push.c:357 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:332 +#: builtin/push.c:358 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7129,87 +7310,87 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:347 +#: builtin/push.c:373 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:348 +#: builtin/push.c:374 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:353 +#: builtin/push.c:379 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:354 +#: builtin/push.c:380 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:359 +#: builtin/push.c:385 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:419 +#: builtin/push.c:445 msgid "repository" msgstr "" -#: builtin/push.c:420 +#: builtin/push.c:446 msgid "push all refs" msgstr "" -#: builtin/push.c:421 +#: builtin/push.c:447 msgid "mirror all refs" msgstr "" -#: builtin/push.c:423 +#: builtin/push.c:449 msgid "delete refs" msgstr "" -#: builtin/push.c:424 +#: builtin/push.c:450 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:427 +#: builtin/push.c:453 msgid "force updates" msgstr "" -#: builtin/push.c:428 +#: builtin/push.c:454 msgid "check" msgstr "" -#: builtin/push.c:429 +#: builtin/push.c:455 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:431 +#: builtin/push.c:457 msgid "use thin pack" msgstr "" -#: builtin/push.c:432 builtin/push.c:433 +#: builtin/push.c:458 builtin/push.c:459 msgid "receive pack program" msgstr "" -#: builtin/push.c:434 +#: builtin/push.c:460 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:437 +#: builtin/push.c:463 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:439 +#: builtin/push.c:465 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:440 +#: builtin/push.c:466 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:450 +#: builtin/push.c:476 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:452 +#: builtin/push.c:478 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -7220,70 +7401,80 @@ msgid "" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -#: builtin/read-tree.c:108 +#: builtin/read-tree.c:109 msgid "write resulting index to <file>" msgstr "" -#: builtin/read-tree.c:111 +#: builtin/read-tree.c:112 msgid "only empty the index" msgstr "" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:114 msgid "Merging" msgstr "" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:116 msgid "perform a merge in addition to a read" msgstr "" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:118 msgid "3-way merge if no file level merging required" msgstr "" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:120 msgid "3-way merge in presence of adds and removes" msgstr "" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:122 msgid "same as -m, but discard unmerged entries" msgstr "" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "<subdirectory>/" msgstr "" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "read the tree into the index under <subdirectory>/" msgstr "" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:127 msgid "update working tree with merge result" msgstr "" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:129 msgid "gitignore" msgstr "" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "allow explicitly ignored files to be overwritten" msgstr "" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:133 msgid "don't check the working tree after merging" msgstr "" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't update the index or the work tree" msgstr "" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:136 msgid "skip applying sparse checkout filter" msgstr "" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:138 msgid "debug unpack-trees" msgstr "" +#: builtin/reflog.c:500 +#, c-format +msgid "%s' for '%s' is not a valid timestamp" +msgstr "" + +#: builtin/reflog.c:616 builtin/reflog.c:621 +#, c-format +msgid "'%s' is not a valid timestamp" +msgstr "" + #: builtin/remote.c:11 msgid "git remote [-v | --verbose]" msgstr "" @@ -7844,95 +8035,95 @@ msgstr "" msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:98 +#: builtin/reset.c:99 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:169 +#: builtin/reset.c:172 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:248 +#: builtin/reset.c:251 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:250 +#: builtin/reset.c:253 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:251 +#: builtin/reset.c:254 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:253 builtin/reset.c:255 +#: builtin/reset.c:256 builtin/reset.c:258 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:257 +#: builtin/reset.c:260 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:275 +#: builtin/reset.c:278 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:278 builtin/reset.c:286 +#: builtin/reset.c:281 builtin/reset.c:289 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:283 +#: builtin/reset.c:286 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:292 +#: builtin/reset.c:295 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:301 +#: builtin/reset.c:304 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:303 +#: builtin/reset.c:306 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:313 +#: builtin/reset.c:316 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:333 +#: builtin/reset.c:336 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:339 +#: builtin/reset.c:342 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:344 +#: builtin/reset.c:347 msgid "Could not write new index file." msgstr "" -#: builtin/rev-parse.c:339 +#: builtin/rev-parse.c:345 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:344 +#: builtin/rev-parse.c:350 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:346 +#: builtin/rev-parse.c:352 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:464 +#: builtin/rev-parse.c:470 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -7957,137 +8148,159 @@ msgstr "" msgid "git cherry-pick <subcommand>" msgstr "" -#: builtin/revert.c:70 builtin/revert.c:92 +#: builtin/revert.c:71 builtin/revert.c:94 #, c-format msgid "%s: %s cannot be used with %s" msgstr "" -#: builtin/revert.c:103 +#: builtin/revert.c:105 msgid "end revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:104 +#: builtin/revert.c:106 msgid "resume revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:105 +#: builtin/revert.c:107 msgid "cancel revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:106 +#: builtin/revert.c:108 msgid "don't automatically commit" msgstr "" -#: builtin/revert.c:107 +#: builtin/revert.c:109 msgid "edit the commit message" msgstr "" -#: builtin/revert.c:110 +#: builtin/revert.c:112 msgid "parent number" msgstr "" -#: builtin/revert.c:112 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "" -#: builtin/revert.c:113 +#: builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/revert.c:114 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "" -#: builtin/revert.c:125 +#: builtin/revert.c:127 msgid "append commit name" msgstr "" -#: builtin/revert.c:126 +#: builtin/revert.c:128 msgid "allow fast-forward" msgstr "" -#: builtin/revert.c:127 +#: builtin/revert.c:129 msgid "preserve initially empty commits" msgstr "" -#: builtin/revert.c:128 +#: builtin/revert.c:130 msgid "allow commits with empty messages" msgstr "" -#: builtin/revert.c:129 +#: builtin/revert.c:131 msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:133 +#: builtin/revert.c:135 msgid "program error" msgstr "" -#: builtin/revert.c:223 +#: builtin/revert.c:225 msgid "revert failed" msgstr "" -#: builtin/revert.c:238 +#: builtin/revert.c:240 msgid "cherry-pick failed" msgstr "" -#: builtin/rm.c:15 +#: builtin/rm.c:16 msgid "git rm [options] [--] <file>..." msgstr "" -#: builtin/rm.c:64 builtin/rm.c:186 -#, c-format +#: builtin/rm.c:64 msgid "" -"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"the following submodule (or one of its nested submodules)\n" +"uses a .git directory:" +msgid_plural "" +"the following submodules (or one of its nested submodules)\n" +"use a .git directory:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/rm.c:70 +msgid "" +"\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: builtin/rm.c:174 -#, c-format +#: builtin/rm.c:230 msgid "" -"'%s' has staged content different from both the file and the HEAD\n" -"(use -f to force removal)" -msgstr "" +"the following file has staged content different from both the\n" +"file and the HEAD:" +msgid_plural "" +"the following files have staged content different from both the\n" +"file and the HEAD:" +msgstr[0] "" +msgstr[1] "" -#: builtin/rm.c:180 -#, c-format +#: builtin/rm.c:235 msgid "" -"'%s' has changes staged in the index\n" -"(use --cached to keep the file, or -f to force removal)" +"\n" +"(use -f to force removal)" msgstr "" -#: builtin/rm.c:191 -#, c-format +#: builtin/rm.c:239 +msgid "the following file has changes staged in the index:" +msgid_plural "the following files have changes staged in the index:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" -"'%s' has local modifications\n" +"\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:207 +#: builtin/rm.c:251 +msgid "the following file has local modifications:" +msgid_plural "the following files have local modifications:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:208 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:209 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:210 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:212 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:283 +#: builtin/rm.c:345 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:322 +#: builtin/rm.c:384 #, c-format msgid "git rm: unable to remove %s" msgstr "" @@ -8101,23 +8314,23 @@ msgstr "" msgid "Missing author: %s" msgstr "" -#: builtin/shortlog.c:227 +#: builtin/shortlog.c:228 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:229 +#: builtin/shortlog.c:230 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:231 +#: builtin/shortlog.c:232 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:232 +#: builtin/shortlog.c:233 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:233 +#: builtin/shortlog.c:234 msgid "Linewrap output" msgstr "" @@ -8177,23 +8390,23 @@ msgstr "" msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:672 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:673 +#: builtin/show-branch.c:674 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:675 -msgid "show commits where no parent comes before its children" +#: builtin/show-branch.c:676 +msgid "topologically sort, maintaining date order where possible" msgstr "" -#: builtin/show-branch.c:677 +#: builtin/show-branch.c:679 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:680 msgid "show <n> most recent ref-log entries starting at base" msgstr "" @@ -8207,35 +8420,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:168 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:169 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:170 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 -msgid "show the HEAD reference" +#: builtin/show-ref.c:173 builtin/show-ref.c:176 +msgid "show the HEAD reference, even if it would be filtered out" msgstr "" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:178 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:180 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:184 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:186 msgid "show refs from stdin that aren't in local repository" msgstr "" @@ -8639,26 +8852,30 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: git.c:16 +#: git.c:17 msgid "" "'git help -a' and 'git help -g' lists available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" -#: parse-options.h:156 +#: parse-options.h:144 +msgid "expiry date" +msgstr "" + +#: parse-options.h:159 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:232 +#: parse-options.h:236 msgid "be more verbose" msgstr "" -#: parse-options.h:234 +#: parse-options.h:238 msgid "be more quiet" msgstr "" -#: parse-options.h:240 +#: parse-options.h:244 msgid "use <n> digits to display SHA-1s" msgstr "" @@ -8715,7 +8932,7 @@ msgid "Move or rename a file, a directory, or a symlink" msgstr "" #: common-cmds.h:21 -msgid "Fetch from and merge with another repository or a local branch" +msgid "Fetch from and integrate with another repository or a local branch" msgstr "" #: common-cmds.h:22 @@ -8759,7 +8976,7 @@ msgstr "" #: git-am.sh:105 #, sh-format msgid "" -"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"When you have resolved this problem, run \"$cmdline --continue\".\n" "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" "To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" @@ -8809,25 +9026,32 @@ msgid "" "it will be removed. Please do not use it anymore." msgstr "" -#: git-am.sh:477 +#: git-am.sh:479 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:482 +#: git-am.sh:484 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:509 +#: git-am.sh:520 +#, sh-format +msgid "" +"Stray $dotest directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" + +#: git-am.sh:528 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:575 +#: git-am.sh:594 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:679 +#: git-am.sh:698 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -8835,60 +9059,60 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:706 +#: git-am.sh:725 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:753 +#: git-am.sh:772 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:757 +#: git-am.sh:776 msgid "Commit Body is:" msgstr "" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:764 +#: git-am.sh:783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:800 +#: git-am.sh:819 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:821 +#: git-am.sh:840 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: git-am.sh:829 +#: git-am.sh:848 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -#: git-am.sh:845 +#: git-am.sh:864 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:855 +#: git-am.sh:874 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:858 +#: git-am.sh:877 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" " $dotest/patch" msgstr "" -#: git-am.sh:876 +#: git-am.sh:895 msgid "applying to an empty history" msgstr "" @@ -9071,7 +9295,7 @@ msgstr "" msgid "Cannot rebase onto multiple branches" msgstr "" -#: git-rebase.sh:53 +#: git-rebase.sh:54 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -9079,42 +9303,58 @@ msgid "" "\"." msgstr "" +#: git-rebase.sh:156 +msgid "Applied autostash." +msgstr "" + +#: git-rebase.sh:159 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "" + #: git-rebase.sh:160 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" it at any time.\n" +msgstr "" + +#: git-rebase.sh:190 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:165 +#: git-rebase.sh:195 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:296 +#: git-rebase.sh:329 msgid "The --exec option must be used with the --interactive option" msgstr "" -#: git-rebase.sh:301 +#: git-rebase.sh:334 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:312 +#: git-rebase.sh:345 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:319 +#: git-rebase.sh:352 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:322 +#: git-rebase.sh:355 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:340 +#: git-rebase.sh:373 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:359 +#: git-rebase.sh:392 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -9127,56 +9367,65 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:404 +#: git-rebase.sh:437 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:428 +#: git-rebase.sh:461 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:431 git-rebase.sh:435 +#: git-rebase.sh:464 git-rebase.sh:468 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:440 +#: git-rebase.sh:473 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:463 +#: git-rebase.sh:496 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:483 +#: git-rebase.sh:519 +msgid "Cannot autostash" +msgstr "" + +#: git-rebase.sh:524 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "" + +#: git-rebase.sh:528 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:501 +#: git-rebase.sh:548 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:504 +#: git-rebase.sh:552 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:515 +#: git-rebase.sh:563 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" #. Detach HEAD and reset the tree -#: git-rebase.sh:524 +#: git-rebase.sh:572 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:532 +#: git-rebase.sh:582 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -9209,6 +9458,11 @@ msgstr "" msgid "Cannot record working tree state" msgstr "" +#: git-stash.sh:190 +#, sh-format +msgid "Cannot update $ref_stash with $w_commit" +msgstr "" + #. TRANSLATORS: $option is an invalid option, like #. `--blah-blah'. The 7 spaces at the beginning of the #. second line correspond to "error: ". So you should line @@ -9219,126 +9473,141 @@ msgstr "" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:202 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" -#: git-stash.sh:223 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "" -#: git-stash.sh:227 +#: git-stash.sh:268 +msgid "" +"The following untracked files would NOT be saved but need to be removed by " +"stash save:" +msgstr "" + +#: git-stash.sh:270 +msgid "" +"Aborting. Consider using either the --force or --include-untracked option." +msgstr "" + +#: git-stash.sh:274 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:235 +#: git-stash.sh:278 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:253 +#: git-stash.sh:296 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:352 +#: git-stash.sh:395 msgid "No stash found." msgstr "" -#: git-stash.sh:359 +#: git-stash.sh:402 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:365 +#: git-stash.sh:408 #, sh-format msgid "$reference is not valid reference" msgstr "" -#: git-stash.sh:393 +#: git-stash.sh:436 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:404 +#: git-stash.sh:447 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:412 +#: git-stash.sh:455 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:416 +#: git-stash.sh:459 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:424 +#: git-stash.sh:467 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:426 +#: git-stash.sh:469 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:460 +#: git-stash.sh:503 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:475 +#: git-stash.sh:518 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:492 +#: git-stash.sh:535 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:493 +#: git-stash.sh:536 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:500 +#: git-stash.sh:543 msgid "No branch name specified" msgstr "" -#: git-stash.sh:571 +#: git-stash.sh:615 msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:91 +#: git-submodule.sh:95 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:196 +#: git-submodule.sh:237 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:239 +#: git-submodule.sh:281 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:251 +#: git-submodule.sh:293 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:349 +#: git-submodule.sh:403 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "" + +#: git-submodule.sh:413 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:366 +#: git-submodule.sh:430 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:370 +#: git-submodule.sh:434 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9346,233 +9615,244 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:388 +#: git-submodule.sh:452 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:390 +#: git-submodule.sh:454 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:398 +#: git-submodule.sh:462 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:400 +#: git-submodule.sh:464 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" -#: git-submodule.sh:402 +#: git-submodule.sh:466 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -#: git-submodule.sh:403 +#: git-submodule.sh:467 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -#: git-submodule.sh:405 +#: git-submodule.sh:469 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:417 +#: git-submodule.sh:481 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:422 +#: git-submodule.sh:486 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:431 +#: git-submodule.sh:495 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:474 +#: git-submodule.sh:539 #, sh-format -msgid "Entering '$prefix$sm_path'" +msgid "Entering '$prefix$displaypath'" msgstr "" -#: git-submodule.sh:488 +#: git-submodule.sh:554 #, sh-format -msgid "Stopping at '$sm_path'; script returned non-zero status." +msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:532 +#: git-submodule.sh:600 #, sh-format -msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" -#: git-submodule.sh:541 +#: git-submodule.sh:609 #, sh-format -msgid "Failed to register url for submodule path '$sm_path'" +msgid "Failed to register url for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:543 +#: git-submodule.sh:611 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" -#: git-submodule.sh:551 +#: git-submodule.sh:619 #, sh-format -msgid "Failed to register update mode for submodule path '$sm_path'" +msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:588 +#: git-submodule.sh:656 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:603 +#: git-submodule.sh:673 #, sh-format -msgid "Submodule work tree '$sm_path' contains a .git directory" +msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -#: git-submodule.sh:604 +#: git-submodule.sh:674 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: git-submodule.sh:610 +#: git-submodule.sh:680 #, sh-format msgid "" -"Submodule work tree '$sm_path' contains local modifications; use '-f' to " +"Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:613 +#: git-submodule.sh:683 #, sh-format -msgid "Cleared directory '$sm_path'" +msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:614 +#: git-submodule.sh:684 #, sh-format -msgid "Could not remove submodule work tree '$sm_path'" +msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:617 +#: git-submodule.sh:687 #, sh-format -msgid "Could not create empty submodule directory '$sm_path'" +msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:626 +#: git-submodule.sh:696 #, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$sm_path'" +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:731 +#: git-submodule.sh:811 #, sh-format msgid "" -"Submodule path '$prefix$sm_path' not initialized\n" +"Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:744 +#: git-submodule.sh:824 #, sh-format -msgid "Unable to find current revision in submodule path '$prefix$sm_path'" +msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:753 +#: git-submodule.sh:833 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:777 +#: git-submodule.sh:857 #, sh-format -msgid "Unable to fetch in submodule path '$prefix$sm_path'" +msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:791 +#: git-submodule.sh:871 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'" +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:792 +#: git-submodule.sh:872 #, sh-format -msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'" +msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:797 +#: git-submodule.sh:877 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'" +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:798 +#: git-submodule.sh:878 #, sh-format -msgid "Submodule path '$prefix$sm_path': merged in '$sha1'" +msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:803 +#: git-submodule.sh:883 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'" +msgid "" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:804 +#: git-submodule.sh:884 #, sh-format -msgid "Submodule path '$prefix$sm_path': checked out '$sha1'" +msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "" -#: git-submodule.sh:831 +#: git-submodule.sh:889 #, sh-format -msgid "Failed to recurse into submodule path '$prefix$sm_path'" +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:939 +#: git-submodule.sh:890 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:917 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:1025 msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:979 +#: git-submodule.sh:1066 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:997 +#: git-submodule.sh:1086 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_src" +msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:1000 +#: git-submodule.sh:1089 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_dst" +msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:1003 +#: git-submodule.sh:1092 #, sh-format -msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1028 +#: git-submodule.sh:1117 msgid "blob" msgstr "" -#: git-submodule.sh:1066 +#: git-submodule.sh:1155 msgid "Submodules changed but not updated:" msgstr "" -#: git-submodule.sh:1068 +#: git-submodule.sh:1157 msgid "Submodule changes to be committed:" msgstr "" -#: git-submodule.sh:1153 +#: git-submodule.sh:1242 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1216 +#: git-submodule.sh:1306 #, sh-format -msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgid "Synchronizing submodule url for '$displaypath'" msgstr "" @@ -1,15 +1,14 @@ # Vietnamese translation for GIT-CORE. -# Copyright (C) 2012-2013 Trần Ngọc Quân. # This file is distributed under the same license as the git-core package. # First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013. # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012. # msgid "" msgstr "" -"Project-Id-Version: git-v1.8.3-rc0-20-gc6bc7\n" +"Project-Id-Version: git-v1.8.4-rc0-1-g28b3cff\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-04-30 08:25+0800\n" -"PO-Revision-Date: 2013-05-01 14:26+0700\n" +"POT-Creation-Date: 2013-07-26 14:19+0800\n" +"PO-Revision-Date: 2013-07-27 09:44+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -22,7 +21,7 @@ msgstr "" "X-Poedit-Basepath: ../\n" "X-Generator: Poedit 1.5.5\n" -#: advice.c:53 +#: advice.c:57 #, c-format msgid "hint: %.*s\n" msgstr "gợi ý: %.*s\n" @@ -31,7 +30,7 @@ msgstr "gợi ý: %.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:83 +#: advice.c:87 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -70,7 +69,7 @@ msgstr "fmt" msgid "archive format" msgstr "định dạng lưu trữ" -#: archive.c:324 builtin/log.c:1126 +#: archive.c:324 builtin/log.c:1173 msgid "prefix" msgstr "tiền tố" @@ -78,11 +77,11 @@ msgstr "tiền tố" msgid "prepend prefix to each pathname in the archive" msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371 -#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 -#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 -#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292 +#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673 +#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77 +#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152 msgid "file" msgstr "tập-tin" @@ -114,7 +113,7 @@ msgstr "nén nhỏ hơn" msgid "list supported archive formats" msgstr "liệt kê các kiểu nén được hỗ trợ" -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "kho" @@ -122,7 +121,7 @@ msgstr "kho" msgid "retrieve the archive from remote repository <repo>" msgstr "nhận kho lưu từ kho chứa <kho> trên máy chủ" -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615 +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487 msgid "command" msgstr "lệnh" @@ -209,19 +208,19 @@ msgstr "Đã có nhánh mang tên “%s”." msgid "Cannot force update the current branch." msgstr "Không thể ép buộc cập nhật nhánh hiện hành." -#: branch.c:201 +#: branch.c:216 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Không thể cài đặt thông tin theo vết; điểm bắt đầu “%s” không phải là một " "nhánh." -#: branch.c:203 +#: branch.c:218 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "nhánh dòng ngược đã yêu cầu “%s” chưa sẵn có" -#: branch.c:205 +#: branch.c:220 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -241,26 +240,26 @@ msgstr "" "sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n" "\"git push -u\" để đặt cấu hình dòng ngược bạn muốn push." -#: branch.c:250 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "Không phải tên đối tượng hợp lệ: “%s”." -#: branch.c:270 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Tên đối tượng chưa rõ ràng: “%s”." -#: branch.c:275 +#: branch.c:290 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Nhánh không hợp lệ: “%s”." -#: branch.c:281 +#: branch.c:296 msgid "Failed to lock ref for update" msgstr "Gặp lỗi khi khóa tham chiếu (ref) để cập nhật" -#: branch.c:299 +#: branch.c:314 msgid "Failed to write ref" msgstr "Gặp lỗi khi ghi tham chiếu (ref)" @@ -274,7 +273,7 @@ msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump c msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu (header) không được thừa nhận: %s%s (%d)" -#: bundle.c:89 builtin/commit.c:676 +#: bundle.c:89 builtin/commit.c:683 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" @@ -283,11 +282,11 @@ msgstr "không thể mở “%s”" msgid "Repository lacks these prerequisite commits:" msgstr "Kho chứa thiếu những lần chuyển giao (commit) cần trước hết này:" -#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300 -#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 -#: builtin/shortlog.c:155 +#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331 +#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364 +#: builtin/shortlog.c:156 msgid "revision walk setup failed" -msgstr "cài đặt việc di chuyển qua các điểm xét lại gặp lỗi" +msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi" #: bundle.c:186 #, c-format @@ -311,7 +310,7 @@ msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) này:" msgid "rev-list died" msgstr "rev-list đã chết" -#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258 +#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" @@ -342,12 +341,12 @@ msgstr "không thể tạo “%s”" msgid "index-pack died" msgstr "index-pack đã chết" -#: commit.c:50 +#: commit.c:53 #, c-format msgid "could not parse %s" msgstr "không thể phân tích %s" -#: commit.c:52 +#: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s không phải là một lần commit!" @@ -356,16 +355,16 @@ msgstr "%s %s không phải là một lần commit!" msgid "memory exhausted" msgstr "hết bộ nhớ" -#: connected.c:39 +#: connected.c:60 msgid "Could not run 'git rev-list'" msgstr "Không thể chạy “git rev-list”" -#: connected.c:48 +#: connected.c:80 #, c-format msgid "failed write to rev-list: %s" msgstr "gặp lỗi khi ghi vào rev-list: %s" -#: connected.c:56 +#: connected.c:88 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list: %s" @@ -461,7 +460,7 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:3481 +#: diff.c:3487 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -470,7 +469,7 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3495 +#: diff.c:3501 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”" @@ -512,20 +511,20 @@ msgstr "“%s”: %s" msgid "'%s': short read %s" msgstr "“%s”: đọc ngắn %s" -#: help.c:212 +#: help.c:213 #, c-format msgid "available git commands in '%s'" -msgstr "các lệnh git sẵn sàng để dùng trong “%s”" +msgstr "các lệnh git sẵn có trong thư mục “%s”:" -#: help.c:219 +#: help.c:220 msgid "git commands available from elsewhere on your $PATH" msgstr "các lệnh git sẵn sàng để dùng từ một nơi khác trong $PATH của bạn" -#: help.c:235 +#: help.c:236 msgid "The most commonly used git commands are:" msgstr "Những lệnh git hay được sử dụng nhất là:" -#: help.c:292 +#: help.c:293 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -534,11 +533,11 @@ msgstr "" "“%s” trông như là một lệnh git, nhưng chúng tôi không\n" "thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?" -#: help.c:349 +#: help.c:350 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả." -#: help.c:371 +#: help.c:372 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -547,17 +546,17 @@ msgstr "" "CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn.\n" "Giả định rằng ý bạn là “%s”" -#: help.c:376 +#: help.c:377 #, c-format msgid "in %0.1f seconds automatically..." msgstr "trong %0.1f giây một cách tự động..." -#: help.c:383 +#: help.c:384 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: “%s” không phải là một lệnh của git. Xem “git --help”." -#: help.c:387 +#: help.c:388 help.c:447 msgid "" "\n" "Did you mean this?" @@ -571,12 +570,17 @@ msgstr[1] "" "\n" "Có phải ý bạn là một trong số những cái này không?" +#: help.c:443 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s - %s" + #: merge.c:56 msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ tạm" #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 -#: builtin/clone.c:645 +#: builtin/clone.c:656 msgid "unable to write new index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới" @@ -590,70 +594,70 @@ msgstr "(commit sai)\n" msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”" -#: merge-recursive.c:268 +#: merge-recursive.c:269 msgid "error building trees" msgstr "gặp lỗi khi xây dựng cây" -#: merge-recursive.c:672 +#: merge-recursive.c:673 #, c-format msgid "failed to create path '%s'%s" msgstr "gặp lỗi khi tạo đường dẫn “%s”%s" -#: merge-recursive.c:683 +#: merge-recursive.c:684 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:697 merge-recursive.c:718 +#: merge-recursive.c:698 merge-recursive.c:719 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là một xung đột D/F?" -#: merge-recursive.c:708 +#: merge-recursive.c:709 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "từ chối đóng tập tin không được theo vết tại “%s”" -#: merge-recursive.c:748 +#: merge-recursive.c:749 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể đọc đối tượng %s “%s”" -#: merge-recursive.c:750 +#: merge-recursive.c:751 #, c-format msgid "blob expected for %s '%s'" msgstr "đối tượng blob được mong đợi cho %s “%s”" -#: merge-recursive.c:773 builtin/clone.c:313 +#: merge-recursive.c:774 builtin/clone.c:312 #, c-format msgid "failed to open '%s'" msgstr "gặp lỗi khi mở “%s”" -#: merge-recursive.c:781 +#: merge-recursive.c:782 #, c-format msgid "failed to symlink '%s'" msgstr "gặp lỗi khi tạo liên kết tượng trưng (symlink) “%s”" -#: merge-recursive.c:784 +#: merge-recursive.c:785 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "không hiểu phải làm gì với %06o %s “%s”" -#: merge-recursive.c:922 +#: merge-recursive.c:923 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-recursive.c:926 +#: merge-recursive.c:927 #, c-format msgid "Unable to add %s to database" msgstr "Không thể thêm %s vào cơ sở dữ liệu" -#: merge-recursive.c:942 +#: merge-recursive.c:943 msgid "unsupported object type in the tree" msgstr "kiểu đối tượng không được hỗ trợ trong cây (tree)" -#: merge-recursive.c:1021 merge-recursive.c:1035 +#: merge-recursive.c:1022 merge-recursive.c:1036 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -662,7 +666,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree)." -#: merge-recursive.c:1027 merge-recursive.c:1040 +#: merge-recursive.c:1028 merge-recursive.c:1041 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -671,20 +675,20 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1081 +#: merge-recursive.c:1082 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1081 +#: merge-recursive.c:1082 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1137 +#: merge-recursive.c:1138 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s" -#: merge-recursive.c:1159 +#: merge-recursive.c:1160 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -693,150 +697,173 @@ msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi " "tên \"%s\"->\"%s\" trong \"%s\"%s" -#: merge-recursive.c:1164 +#: merge-recursive.c:1165 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1218 +#: merge-recursive.c:1219 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s" -#: merge-recursive.c:1248 +#: merge-recursive.c:1249 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Đang đổi tên %s thành %s thay vì %s thành %s" -#: merge-recursive.c:1447 +#: merge-recursive.c:1448 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s" -#: merge-recursive.c:1457 +#: merge-recursive.c:1458 #, c-format msgid "Adding merged %s" msgstr "Thêm hòa trộn %s" -#: merge-recursive.c:1462 merge-recursive.c:1660 +#: merge-recursive.c:1463 merge-recursive.c:1661 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:1513 +#: merge-recursive.c:1514 #, c-format msgid "cannot read object %s" msgstr "không thể đọc đối tượng %s" -#: merge-recursive.c:1516 +#: merge-recursive.c:1517 #, c-format msgid "object %s is not a blob" msgstr "đối tượng %s không phải là một blob" -#: merge-recursive.c:1564 +#: merge-recursive.c:1565 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:1564 +#: merge-recursive.c:1565 msgid "modified" msgstr "đã sửa" -#: merge-recursive.c:1574 +#: merge-recursive.c:1575 msgid "content" msgstr "nội dung" -#: merge-recursive.c:1581 +#: merge-recursive.c:1582 msgid "add/add" msgstr "thêm/thêm" -#: merge-recursive.c:1615 +#: merge-recursive.c:1616 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" -#: merge-recursive.c:1629 +#: merge-recursive.c:1630 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1633 git-submodule.sh:1029 +#: merge-recursive.c:1634 git-submodule.sh:1118 msgid "submodule" msgstr "mô-đun-con" -#: merge-recursive.c:1634 +#: merge-recursive.c:1635 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-recursive.c:1724 +#: merge-recursive.c:1725 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:1749 +#: merge-recursive.c:1750 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:1755 +#: merge-recursive.c:1756 msgid "directory/file" msgstr "thư-mục/tập tin" -#: merge-recursive.c:1760 +#: merge-recursive.c:1761 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là " "%s" -#: merge-recursive.c:1770 +#: merge-recursive.c:1771 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:1787 +#: merge-recursive.c:1788 msgid "Fatal merge failure, shouldn't happen." msgstr "Việc hòa trộn hỏng nghiêm trọng, không nên để xảy ra." -#: merge-recursive.c:1806 +#: merge-recursive.c:1807 msgid "Already up-to-date!" msgstr "Đã cập nhật rồi!" -#: merge-recursive.c:1815 +#: merge-recursive.c:1816 #, c-format msgid "merging of trees %s and %s failed" msgstr "hòa trộn cây (tree) %s và %s gặp lỗi" -#: merge-recursive.c:1845 +#: merge-recursive.c:1846 #, c-format msgid "Unprocessed path??? %s" msgstr "Đường dẫn chưa được xử lý??? %s" -#: merge-recursive.c:1890 +#: merge-recursive.c:1891 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:1903 +#: merge-recursive.c:1904 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "tìm thấy %u tổ tiên chung:" msgstr[1] "tìm thấy %u tổ tiên chung:" -#: merge-recursive.c:1940 +#: merge-recursive.c:1941 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao (commit) nào" -#: merge-recursive.c:1997 +#: merge-recursive.c:1998 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:2009 builtin/merge.c:658 +#: merge-recursive.c:2010 builtin/merge.c:672 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" -#: object.c:195 +#: notes-utils.c:40 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" +"Không thể chuyển giao (commit) chưa được khởi tạo hoặc không được tham chiếu " +"cây ghi chú" + +#: notes-utils.c:81 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Giá trị notes.rewriteMode sai: “%s”" + +#: notes-utils.c:91 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài của refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: notes-utils.c:118 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Giá trị %s sai: “%s”" + +#: object.c:204 #, c-format msgid "unable to parse object: %s" msgstr "không thể phân tích đối tượng: “%s”" @@ -876,18 +903,18 @@ msgstr "Đường dẫn “%s” thì ở trong mô-đun-con “%.*s”" msgid "'%s' is beyond a symbolic link" msgstr "“%s” nằm ngoài một liên kết tượng trưng" -#: remote.c:1781 +#: remote.c:1788 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Nhánh của bạn là đầu của “%s” bởi %d lần chuyển giao (commit).\n" msgstr[1] "Nhánh của bạn là đầu của “%s” bởi %d lần chuyển giao (commit).\n" -#: remote.c:1787 +#: remote.c:1794 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n" -#: remote.c:1790 +#: remote.c:1797 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -899,11 +926,11 @@ msgstr[1] "" "Nhánh của bạn thì ở đằng sau “%s” bởi %d lần chuyển giao (commit), và có thể " "được fast-forward.\n" -#: remote.c:1798 +#: remote.c:1805 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n" -#: remote.c:1801 +#: remote.c:1808 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -919,20 +946,29 @@ msgstr[1] "" "Your branch and “%s” have diverged,\n" "and have %d and %d different commit each, respectively.\n" -#: remote.c:1811 +#: remote.c:1818 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của " "bạn)\n" -#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 -#: builtin/merge.c:1009 +#: run-command.c:80 +msgid "open /dev/null failed" +msgstr "gặp lỗi khi mở /dev/null" + +#: run-command.c:82 +#, c-format +msgid "dup2(%d,%d) failed" +msgstr "dup2(%d,%d) gặp lỗi" + +#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 +#: builtin/merge.c:1013 builtin/merge.c:1023 #, c-format msgid "Could not open '%s' for writing" msgstr "Không thể mở “%s” để ghi" -#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 -#: builtin/merge.c:1001 builtin/merge.c:1014 +#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 +#: builtin/merge.c:1015 builtin/merge.c:1028 #, c-format msgid "Could not write to '%s'" msgstr "Không thể ghi vào “%s”" @@ -955,7 +991,7 @@ msgstr "" "với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n" "và chuyển giao (commit) kết quả bằng lệnh “git commit”" -#: sequencer.c:245 sequencer.c:859 sequencer.c:942 +#: sequencer.c:245 sequencer.c:869 sequencer.c:952 #, c-format msgid "Could not write to %s" msgstr "Không thể ghi vào %s" @@ -978,46 +1014,46 @@ msgid "Commit your changes or stash them to proceed." msgstr "Chuyển giao (commit) các thay đổi của bạn hay stash chúng để xử lý." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:319 +#: sequencer.c:324 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:350 +#: sequencer.c:355 msgid "Could not resolve HEAD commit\n" msgstr "Không thể phân giải commit (lần chuyển giao) HEAD\n" -#: sequencer.c:371 +#: sequencer.c:377 msgid "Unable to update cache tree\n" msgstr "Không thể cập nhật cây bộ nhớ đệm\n" -#: sequencer.c:416 +#: sequencer.c:422 #, c-format msgid "Could not parse commit %s\n" msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" -#: sequencer.c:421 +#: sequencer.c:427 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Không thể phân tích commit (lần chuyển giao) cha mẹ %s\n" -#: sequencer.c:487 +#: sequencer.c:493 msgid "Your index file is unmerged." msgstr "Tập tin lưu mục lục của bạn không được hòa trộn." -#: sequencer.c:506 +#: sequencer.c:512 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" "Lần chuyển giao (commit) %s là một lần hòa trộn nhưng không đưa ra tùy chọn -" "m." -#: sequencer.c:514 +#: sequencer.c:520 #, c-format msgid "Commit %s does not have parent %d" msgstr "Lần chuyển giao (commit) %s không có cha mẹ %d" -#: sequencer.c:518 +#: sequencer.c:524 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1026,171 +1062,195 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:531 +#: sequencer.c:537 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s" -#: sequencer.c:535 +#: sequencer.c:541 #, c-format msgid "Cannot get commit message for %s" msgstr "Không thể lấy thông điệp lần chuyển giao (commit) cho %s" -#: sequencer.c:621 +#: sequencer.c:627 #, c-format msgid "could not revert %s... %s" msgstr "không thể revert %s... %s" -#: sequencer.c:622 +#: sequencer.c:628 #, c-format msgid "could not apply %s... %s" msgstr "không thể apply (áp dụng miếng vá) %s... %s" -#: sequencer.c:654 +#: sequencer.c:664 msgid "empty commit set passed" msgstr "lần chuyển giao (commit) trống rỗng đặt là hợp quy cách" -#: sequencer.c:662 +#: sequencer.c:672 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: gặp lỗi đọc bảng mục lục" -#: sequencer.c:667 +#: sequencer.c:677 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục" -#: sequencer.c:725 +#: sequencer.c:735 #, c-format msgid "Cannot %s during a %s" msgstr "Không thể %s trong khi %s" -#: sequencer.c:747 +#: sequencer.c:757 #, c-format msgid "Could not parse line %d." msgstr "Không phân tích được dòng %d." -#: sequencer.c:752 +#: sequencer.c:762 msgid "No commits parsed." msgstr "Không có lần chuyển giao (commit) nào được phân tích." -#: sequencer.c:765 +#: sequencer.c:775 #, c-format msgid "Could not open %s" msgstr "Không thể mở %s" -#: sequencer.c:769 +#: sequencer.c:779 #, c-format msgid "Could not read %s." msgstr "Không thể đọc %s." -#: sequencer.c:776 +#: sequencer.c:786 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:804 +#: sequencer.c:814 #, c-format msgid "Invalid key: %s" msgstr "Khóa không đúng: %s" -#: sequencer.c:807 +#: sequencer.c:817 #, c-format msgid "Invalid value for %s: %s" msgstr "Giá trị không hợp lệ %s: %s" -#: sequencer.c:819 +#: sequencer.c:829 #, c-format msgid "Malformed options sheet: %s" msgstr "Bảng tùy chọn dị hình: %s" -#: sequencer.c:840 +#: sequencer.c:850 msgid "a cherry-pick or revert is already in progress" msgstr "một thao tác cherry-pick hoặc revert đang được thực hiện" -#: sequencer.c:841 +#: sequencer.c:851 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:845 +#: sequencer.c:855 #, c-format msgid "Could not create sequencer directory %s" msgstr "Không thể tạo thư mục xếp dãy %s" -#: sequencer.c:861 sequencer.c:946 +#: sequencer.c:871 sequencer.c:956 #, c-format msgid "Error wrapping up %s." msgstr "Lỗi bao bọc %s." -#: sequencer.c:880 sequencer.c:1014 +#: sequencer.c:890 sequencer.c:1024 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay revert trong tiến trình" -#: sequencer.c:882 +#: sequencer.c:892 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:884 +#: sequencer.c:894 msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra" -#: sequencer.c:906 builtin/apply.c:4060 +#: sequencer.c:916 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "không thể mở %s: %s" -#: sequencer.c:909 +#: sequencer.c:919 #, c-format msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: sequencer.c:910 +#: sequencer.c:920 msgid "unexpected end of file" msgstr "kết thúc tập tin đột xuất" -#: sequencer.c:916 +#: sequencer.c:926 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng" -#: sequencer.c:939 +#: sequencer.c:949 #, c-format msgid "Could not format %s." msgstr "Không thể định dạng %s." -#: sequencer.c:1083 +#: sequencer.c:1092 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:1085 +#: sequencer.c:1095 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:1119 +#: sequencer.c:1129 msgid "Can't revert as initial commit" msgstr "Không thể revert một lần chuyển giao (commit) khởi tạo" -#: sequencer.c:1120 +#: sequencer.c:1130 msgid "Can't cherry-pick into empty head" msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" -#: sha1_name.c:1036 +#: sha1_name.c:440 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.object_name_warning false\"" +msgstr "" +"Git thường không bao giờ tạo tham chiếu mà nó kết thúc với 40 ký tự hex\n" +"bởi vì nó sẽ bị bỏ qua khi bạn chỉ định 40-hex. Những tham chiếu này\n" +"có lẽ được tạo ra bởi một sai sót nào đó. Ví dụ,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"với \"$br\" không hiểu lý do vì sao trống rỗng và một tham chiếu 40-hex được " +"tạo ra.\n" +"Xin hãy kiểm tra những tham chiếu này và có thể xóa chúng đi. Tắt lời nhắn " +"này\n" +"bằng cách chạy lệnh \"git config advice.object_name_warning false\"" + +#: sha1_name.c:1097 msgid "HEAD does not point to a branch" msgstr "HEAD không chỉ đến một nhánh nào cả" -#: sha1_name.c:1039 +#: sha1_name.c:1100 #, c-format msgid "No such branch: '%s'" msgstr "Không có nhánh nào như thế: “%s”" -#: sha1_name.c:1041 +#: sha1_name.c:1102 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Không có thượng nguồn (upstream) được cấu hình cho nhánh “%s”" -#: sha1_name.c:1044 +#: sha1_name.c:1106 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -1202,172 +1262,172 @@ msgstr "" msgid "unable to access '%s': %s" msgstr "không thể truy cập “%s”: %s" -#: wrapper.c:423 +#: wrapper.c:429 #, c-format msgid "unable to access '%s'" msgstr "không thể truy cập “%s”" -#: wrapper.c:434 +#: wrapper.c:440 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %s" -#: wrapper.c:435 +#: wrapper.c:441 msgid "no such user" msgstr "không có người dùng như vậy" -#: wt-status.c:140 +#: wt-status.c:141 msgid "Unmerged paths:" msgstr "Những đường dẫn chưa được hòa trộn:" -#: wt-status.c:167 wt-status.c:194 +#: wt-status.c:168 wt-status.c:195 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (dùng \"git reset %s <tập-tin>...\" để bỏ một stage (trạng thái))" -#: wt-status.c:169 wt-status.c:196 +#: wt-status.c:170 wt-status.c:197 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (dùng \"git rm --cached <tập-tin>...\" để bỏ trạng thái (stage))" -#: wt-status.c:173 +#: wt-status.c:174 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (dùng \"git add <tập-tin>...\" để đánh dấu là cần giải quyết)" -#: wt-status.c:175 wt-status.c:179 +#: wt-status.c:176 wt-status.c:180 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (dùng \"git add/rm <tập-tin>...\" như là một cách thích hợp để đánh dấu " "là cần được giải quyết)" -#: wt-status.c:177 +#: wt-status.c:178 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dùng \"git rm <tập-tin>...\" để đánh dấu là cần giải quyết)" -#: wt-status.c:188 +#: wt-status.c:189 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:206 +#: wt-status.c:207 msgid "Changes not staged for commit:" msgstr "" "Các thay đổi không được đặt trạng thái (stage) cho lần chuyển giao (commit):" -#: wt-status.c:210 +#: wt-status.c:211 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (dùng \"git add <tập-tin>...\" để cập nhật những gì cần chuyển giao " "(commit))" -#: wt-status.c:212 +#: wt-status.c:213 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (dùng \"git add/rm <tập-tin>...\" để cập nhật những gì sẽ được chuyển giao)" -#: wt-status.c:213 +#: wt-status.c:214 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (dùng \"git checkout -- <tập-tin>...\" để bỏ thay đổi trong thư mục làm " "việc)" -#: wt-status.c:215 +#: wt-status.c:216 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (chuyển giao (commit) hoặc là loại bỏ các nội dung không-bị-theo-vết hay " "đã bị chỉnh sửa trong mô-đun-con)" -#: wt-status.c:227 +#: wt-status.c:228 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (dùng \"git %s <tập-tin>...\" để thêm vào những gì cần chuyển giao " "(commit))" -#: wt-status.c:244 +#: wt-status.c:245 msgid "bug" msgstr "lỗi" -#: wt-status.c:249 +#: wt-status.c:250 msgid "both deleted:" msgstr "bị xóa bởi cả hai:" -#: wt-status.c:250 +#: wt-status.c:251 msgid "added by us:" msgstr "được thêm vào bởi chúng ta:" -#: wt-status.c:251 +#: wt-status.c:252 msgid "deleted by them:" msgstr "bị xóa đi bởi họ:" -#: wt-status.c:252 +#: wt-status.c:253 msgid "added by them:" msgstr "được thêm vào bởi họ:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "deleted by us:" msgstr "bị xóa bởi chúng ta:" -#: wt-status.c:254 +#: wt-status.c:255 msgid "both added:" msgstr "được thêm vào bởi cả hai:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "both modified:" msgstr "bị sửa bởi cả hai:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "new commits, " msgstr "lần chuyển giao (commit) mới, " -#: wt-status.c:287 +#: wt-status.c:288 msgid "modified content, " msgstr "nội dung bị sửa đổi, " -#: wt-status.c:289 +#: wt-status.c:290 msgid "untracked content, " msgstr "nội dung chưa được theo dõi, " -#: wt-status.c:306 +#: wt-status.c:307 #, c-format msgid "new file: %s" msgstr "tập tin mới: %s" -#: wt-status.c:309 +#: wt-status.c:310 #, c-format msgid "copied: %s -> %s" msgstr "đã sao chép: %s -> %s" -#: wt-status.c:312 +#: wt-status.c:313 #, c-format msgid "deleted: %s" msgstr "đã xóa: %s" -#: wt-status.c:315 +#: wt-status.c:316 #, c-format msgid "modified: %s" msgstr "đã sửa đổi: %s" -#: wt-status.c:318 +#: wt-status.c:319 #, c-format msgid "renamed: %s -> %s" msgstr "đã đổi tên: %s -> %s" -#: wt-status.c:321 +#: wt-status.c:322 #, c-format msgid "typechange: %s" msgstr "đổi-kiểu: %s" -#: wt-status.c:324 +#: wt-status.c:325 #, c-format msgid "unknown: %s" msgstr "không hiểu: %s" -#: wt-status.c:327 +#: wt-status.c:328 #, c-format msgid "unmerged: %s" msgstr "chưa hòa trộn: %s" -#: wt-status.c:330 +#: wt-status.c:331 #, c-format msgid "bug: unhandled diff status %c" msgstr "lỗi: không lấy được trạng thái lệnh diff %c" @@ -1376,7 +1436,7 @@ msgstr "lỗi: không lấy được trạng thái lệnh diff %c" msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:806 wt-status.c:958 +#: wt-status.c:806 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột sau đó chạy \"git commit\")" @@ -1397,8 +1457,8 @@ msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." #: wt-status.c:829 -msgid " (fix conflicts and then run \"git am --resolved\")" -msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --resolved\")" +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")" #: wt-status.c:831 msgid " (use \"git am --skip\" to skip this patch)" @@ -1481,40 +1541,51 @@ msgstr "" msgid "You are currently cherry-picking." msgstr "Bạn hiện nay đang thực hiện việc cherry-pick." +#: wt-status.c:958 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr "" +" (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")" + #: wt-status.c:961 -msgid " (all conflicts fixed: run \"git commit\")" -msgstr " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git commit\")" +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr "" +" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --" +"continue\")" -#: wt-status.c:970 +#: wt-status.c:963 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)" + +#: wt-status.c:972 #, c-format msgid "You are currently reverting commit %s." msgstr "Bạn hiện nay đang thực hiện thao tác revert lần chuyển giao “%s”." -#: wt-status.c:975 +#: wt-status.c:977 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")" -#: wt-status.c:980 +#: wt-status.c:982 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác revert)" -#: wt-status.c:991 +#: wt-status.c:993 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ " "nhánh “%s”." -#: wt-status.c:995 +#: wt-status.c:997 msgid "You are currently bisecting." msgstr "Bạn hiện tại đang thực hiện việc bisect (chia đôi)." -#: wt-status.c:998 +#: wt-status.c:1000 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" @@ -1522,31 +1593,35 @@ msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên th msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1184 +#: wt-status.c:1180 +msgid "rebase in progress; onto " +msgstr "rebase đang được thực hiện: lên trên" + +#: wt-status.c:1187 msgid "HEAD detached at " msgstr "HEAD được tách rời tại" -#: wt-status.c:1186 +#: wt-status.c:1189 msgid "HEAD detached from " msgstr "HEAD được tách rời từ" -#: wt-status.c:1189 +#: wt-status.c:1192 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1206 +#: wt-status.c:1209 msgid "Initial commit" msgstr "Lần chuyển giao (commit) khởi đầu" -#: wt-status.c:1220 +#: wt-status.c:1223 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1222 +#: wt-status.c:1225 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1226 +#: wt-status.c:1229 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1558,32 +1633,32 @@ msgstr "" "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n" "tự thêm các tập tin mới (xem “git help status”.." -#: wt-status.c:1232 +#: wt-status.c:1235 #, c-format msgid "Untracked files not listed%s" msgstr "Những tập tin không bị theo vết không được liệt kê ra %s" -#: wt-status.c:1234 +#: wt-status.c:1237 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" -#: wt-status.c:1240 +#: wt-status.c:1243 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1245 +#: wt-status.c:1248 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "không có thay đổi nào được thêm vào commit (dùng \"git add\" và/hoặc \"git " "commit -a\")\n" -#: wt-status.c:1248 +#: wt-status.c:1251 #, c-format msgid "no changes added to commit\n" msgstr "không có thay đổi nào được thêm vào lần chuyển giao (commit)\n" -#: wt-status.c:1251 +#: wt-status.c:1254 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1592,58 +1667,58 @@ msgstr "" "không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin " "không được theo dấu vết hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" -#: wt-status.c:1254 +#: wt-status.c:1257 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin " "không được theo dấu vết hiện diện\n" -#: wt-status.c:1257 +#: wt-status.c:1260 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" " không có gì để commit (tạo/sao-chép các tập tin và dùng \"git add\" để theo " "dõi dấu vết)\n" -#: wt-status.c:1260 wt-status.c:1265 +#: wt-status.c:1263 wt-status.c:1268 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao (commit)\n" -#: wt-status.c:1263 +#: wt-status.c:1266 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "không có gì để chuyển giao (commit) (dùng -u để bỏ các tập tin cần theo dấu " "vết)\n" -#: wt-status.c:1267 +#: wt-status.c:1270 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "không có gì để chuyển giao (commit), thư mục làm việc sạch sẽ\n" -#: wt-status.c:1375 +#: wt-status.c:1378 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1381 +#: wt-status.c:1384 msgid "Initial commit on " msgstr "Lần chuyển giao (commit) khởi tạo trên " -#: wt-status.c:1396 +#: wt-status.c:1399 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1399 wt-status.c:1402 +#: wt-status.c:1402 wt-status.c:1405 msgid "ahead " msgstr "phía trước " -#: wt-status.c:1404 +#: wt-status.c:1407 msgid ", behind " msgstr ", đằng sau " -#: compat/precompose_utf8.c:58 builtin/clone.c:352 +#: compat/precompose_utf8.c:58 builtin/clone.c:351 #, c-format msgid "failed to unlink '%s'" msgstr "bỏ liên kết (unlink) %s không thành công" @@ -1731,7 +1806,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không như mong đợi %c" -#: builtin/add.c:149 builtin/commit.c:233 +#: builtin/add.c:149 builtin/commit.c:238 msgid "updating files failed" msgstr "Cập nhật tập tin gặp lỗi" @@ -1745,7 +1820,7 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "Các thay đổi không được lưu trạng thái sau khi làm tươi mới lại bảng mục lục:" -#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275 +#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337 #, c-format msgid "pathspec '%s' did not match any files" msgstr "pathspec “%s” không khớp với bất kỳ tập tin nào" @@ -1754,133 +1829,133 @@ msgstr "pathspec “%s” không khớp với bất kỳ tập tin nào" msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" -#: builtin/add.c:349 +#: builtin/add.c:350 #, c-format msgid "Could not open '%s' for writing." msgstr "Không thể mở “%s” để ghi." -#: builtin/add.c:353 +#: builtin/add.c:354 msgid "Could not write patch" msgstr "Không thể ghi ra miếng vá" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Could not stat '%s'" msgstr "không thể lấy trạng thái về “%s”" -#: builtin/add.c:360 +#: builtin/add.c:361 msgid "Empty patch. Aborted." msgstr "Miếng vá trống rỗng. Đã bỏ qua." -#: builtin/add.c:366 +#: builtin/add.c:367 #, c-format msgid "Could not apply '%s'" msgstr "Không thể apply (áp dụng miếng vá) “%s”" -#: builtin/add.c:376 +#: builtin/add.c:377 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\n" -#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 -#: builtin/rm.c:206 +#: builtin/add.c:394 builtin/clean.c:851 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253 +#: builtin/rm.c:268 msgid "dry run" msgstr "chạy thử" -#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 -#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 -#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19 +#: builtin/commit.c:1201 builtin/count-objects.c:95 builtin/fsck.c:613 +#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113 msgid "be verbose" msgstr "chi tiết" -#: builtin/add.c:396 +#: builtin/add.c:397 msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 +#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261 msgid "select hunks interactively" msgstr "chọn “hunks” một cách tương tác" -#: builtin/add.c:398 +#: builtin/add.c:399 msgid "edit current diff and apply" msgstr "sửa diff hiện nay và áp dụng nó" -#: builtin/add.c:399 +#: builtin/add.c:400 msgid "allow adding otherwise ignored files" msgstr "cho phép thêm các tập tin bị bỏ qua khác" -#: builtin/add.c:400 +#: builtin/add.c:401 msgid "update tracked files" msgstr "cập nhật các tập tin được theo vết" -#: builtin/add.c:401 +#: builtin/add.c:402 msgid "record only the fact that the path will be added later" msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau" -#: builtin/add.c:402 +#: builtin/add.c:403 msgid "add changes from all tracked and untracked files" msgstr "" "thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu " "vết" #. takes no arguments -#: builtin/add.c:405 +#: builtin/add.c:406 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)" -#: builtin/add.c:407 +#: builtin/add.c:408 msgid "don't add, only refresh the index" msgstr "không thêm, chỉ làm tươi mới bảng mục lục" -#: builtin/add.c:408 +#: builtin/add.c:409 msgid "just skip files which cannot be added because of errors" msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi" -#: builtin/add.c:409 +#: builtin/add.c:410 msgid "check if - even missing - files are ignored in dry run" msgstr "" "kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử" -#: builtin/add.c:431 +#: builtin/add.c:432 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n" -#: builtin/add.c:432 +#: builtin/add.c:433 msgid "no files added" msgstr "chưa có tập tin nào được thêm vào" -#: builtin/add.c:438 +#: builtin/add.c:439 msgid "adding files failed" msgstr "thêm tập tin gặp lỗi" -#: builtin/add.c:477 +#: builtin/add.c:478 msgid "-A and -u are mutually incompatible" msgstr "-A và -u xung khắc nhau" -#: builtin/add.c:495 +#: builtin/add.c:496 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run" -#: builtin/add.c:525 +#: builtin/add.c:526 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" -#: builtin/add.c:526 +#: builtin/add.c:527 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Có lẽ bạn muốn là “git add .” phải không?\n" -#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 -#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 +#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:895 +#: builtin/commit.c:298 builtin/mv.c:82 builtin/rm.c:297 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "Không thể ghi tập tin lưu bảng mục lục mới" @@ -2067,298 +2142,298 @@ msgstr "vá gặp lỗi: %s:%ld" msgid "cannot checkout %s" msgstr "không thể \"checkout\" %s" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 #, c-format msgid "read of %s failed" msgstr "đọc %s gặp lỗi" -#: builtin/apply.c:3173 builtin/apply.c:3395 +#: builtin/apply.c:3174 builtin/apply.c:3396 #, c-format msgid "path %s has been renamed/deleted" msgstr "đường dẫn %s đã bị xóa/đổi tên" -#: builtin/apply.c:3254 builtin/apply.c:3409 +#: builtin/apply.c:3255 builtin/apply.c:3410 #, c-format msgid "%s: does not exist in index" msgstr "%s: không tồn tại trong bảng mục lục" -#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 +#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3263 builtin/apply.c:3417 +#: builtin/apply.c:3264 builtin/apply.c:3418 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: builtin/apply.c:3365 +#: builtin/apply.c:3366 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: builtin/apply.c:3434 +#: builtin/apply.c:3435 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3436 +#: builtin/apply.c:3437 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, mong chờ %o" -#: builtin/apply.c:3537 +#: builtin/apply.c:3538 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: builtin/apply.c:3540 +#: builtin/apply.c:3541 #, c-format msgid "%s: already exists in working directory" msgstr "%s: đã sẵn có trong thư mục đang làm việc" -#: builtin/apply.c:3560 +#: builtin/apply.c:3561 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" -#: builtin/apply.c:3565 +#: builtin/apply.c:3566 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" -#: builtin/apply.c:3573 +#: builtin/apply.c:3574 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3586 +#: builtin/apply.c:3587 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s..." -#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 +#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”" -#: builtin/apply.c:3822 +#: builtin/apply.c:3823 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: builtin/apply.c:3850 +#: builtin/apply.c:3851 #, c-format -msgid "corrupt patch for subproject %s" -msgstr "miếng vá sai hỏng cho dự án con (subproject) %s" +msgid "corrupt patch for submodule %s" +msgstr "miếng vá sai hỏng cho mô-đun-con (subproject) %s" -#: builtin/apply.c:3854 +#: builtin/apply.c:3855 #, c-format msgid "unable to stat newly created file '%s'" msgstr "không thể lấy trạng thái về tập tin %s mới hơn đã được tạo" -#: builtin/apply.c:3859 +#: builtin/apply.c:3860 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "không thể tạo “backing store” cho tập tin được tạo mới hơn %s" -#: builtin/apply.c:3862 builtin/apply.c:3970 +#: builtin/apply.c:3863 builtin/apply.c:3971 #, c-format msgid "unable to add cache entry for %s" msgstr "không thể thêm mục nhớ tạm cho %s" -#: builtin/apply.c:3895 +#: builtin/apply.c:3896 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin “%s”" -#: builtin/apply.c:3944 +#: builtin/apply.c:3945 #, c-format msgid "unable to write file '%s' mode %o" msgstr "không thể ghi vào tập tin “%s” chế độ (mode) %o" -#: builtin/apply.c:4031 +#: builtin/apply.c:4032 #, c-format msgid "Applied patch %s cleanly." msgstr "Đã áp dụng miếng và %s một cách sạch sẽ." -#: builtin/apply.c:4039 +#: builtin/apply.c:4040 msgid "internal error" msgstr "lỗi nội bộ" #. Say this even without --verbose -#: builtin/apply.c:4042 +#: builtin/apply.c:4043 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối..." msgstr[1] "Đang áp dụng miếng vá %%s với %d lần từ chối..." -#: builtin/apply.c:4052 +#: builtin/apply.c:4053 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "đang cắt cụt tên tập tin .rej thành %.*s.rej" -#: builtin/apply.c:4073 +#: builtin/apply.c:4074 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: builtin/apply.c:4076 +#: builtin/apply.c:4077 #, c-format msgid "Rejected hunk #%d." msgstr "hunk #%d bị từ chối." -#: builtin/apply.c:4226 +#: builtin/apply.c:4227 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: builtin/apply.c:4237 +#: builtin/apply.c:4238 msgid "unable to read index file" msgstr "không thể đọc tập tin lưu bảng mục lục" -#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "đường-dẫn" -#: builtin/apply.c:4357 +#: builtin/apply.c:4358 msgid "don't apply changes matching the given path" msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" -#: builtin/apply.c:4360 +#: builtin/apply.c:4361 msgid "apply changes matching the given path" msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" -#: builtin/apply.c:4362 +#: builtin/apply.c:4363 msgid "num" msgstr "số" -#: builtin/apply.c:4363 +#: builtin/apply.c:4364 msgid "remove <num> leading slashes from traditional diff paths" msgstr "gỡ bỏ <số> phần dẫn đầu (slashe) từ đường dẫn diff cổ điển" -#: builtin/apply.c:4366 +#: builtin/apply.c:4367 msgid "ignore additions made by the patch" msgstr "lờ đi phần phụ thêm tạo ra bởi miếng vá" -#: builtin/apply.c:4368 +#: builtin/apply.c:4369 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" -#: builtin/apply.c:4372 +#: builtin/apply.c:4373 msgid "show number of added and deleted lines in decimal notation" msgstr "" "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" -#: builtin/apply.c:4374 +#: builtin/apply.c:4375 msgid "instead of applying the patch, output a summary for the input" msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" -#: builtin/apply.c:4376 +#: builtin/apply.c:4377 msgid "instead of applying the patch, see if the patch is applicable" msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" -#: builtin/apply.c:4378 +#: builtin/apply.c:4379 msgid "make sure the patch is applicable to the current index" msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" -#: builtin/apply.c:4380 +#: builtin/apply.c:4381 msgid "apply a patch without touching the working tree" msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" -#: builtin/apply.c:4382 +#: builtin/apply.c:4383 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" -#: builtin/apply.c:4384 +#: builtin/apply.c:4385 msgid "attempt three-way merge if a patch does not apply" msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" -#: builtin/apply.c:4386 +#: builtin/apply.c:4387 msgid "build a temporary index based on embedded index information" msgstr "" "xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462 msgid "paths are separated with NUL character" msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" -#: builtin/apply.c:4391 +#: builtin/apply.c:4392 msgid "ensure at least <n> lines of context match" msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp" -#: builtin/apply.c:4392 +#: builtin/apply.c:4393 msgid "action" msgstr "hành động" -#: builtin/apply.c:4393 +#: builtin/apply.c:4394 msgid "detect new or modified lines that have whitespace errors" msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" -#: builtin/apply.c:4396 builtin/apply.c:4399 +#: builtin/apply.c:4397 builtin/apply.c:4400 msgid "ignore changes in whitespace when finding context" msgstr "lờ đi sự thay đổi do khoảng trắng khi quét nội dung" -#: builtin/apply.c:4402 +#: builtin/apply.c:4403 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: builtin/apply.c:4404 +#: builtin/apply.c:4405 msgid "don't expect at least one line of context" msgstr "đừng hy vọng có ít nhất một dòng nội dung" -#: builtin/apply.c:4406 +#: builtin/apply.c:4407 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" -#: builtin/apply.c:4408 +#: builtin/apply.c:4409 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: builtin/apply.c:4411 +#: builtin/apply.c:4412 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" -#: builtin/apply.c:4414 +#: builtin/apply.c:4415 msgid "do not trust the line counts in the hunk headers" msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" -#: builtin/apply.c:4416 +#: builtin/apply.c:4417 msgid "root" msgstr "root" -#: builtin/apply.c:4417 +#: builtin/apply.c:4418 msgid "prepend <root> to all filenames" msgstr "treo thêm <root> vào tất cả các tên tập tin" -#: builtin/apply.c:4439 +#: builtin/apply.c:4440 msgid "--3way outside a repository" msgstr "--3way ở ngoài một kho chứa" -#: builtin/apply.c:4447 +#: builtin/apply.c:4448 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: builtin/apply.c:4450 +#: builtin/apply.c:4451 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: builtin/apply.c:4466 +#: builtin/apply.c:4467 #, c-format msgid "can't open patch '%s'" msgstr "không thể mở miếng vá “%s”" -#: builtin/apply.c:4480 +#: builtin/apply.c:4481 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" msgstr[1] "đã chấm dứt %d lỗi khoảng trắng" -#: builtin/apply.c:4486 builtin/apply.c:4496 +#: builtin/apply.c:4487 builtin/apply.c:4497 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2414,105 +2489,105 @@ msgstr "" "cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao (commit) " "hiện hành" -#: builtin/blame.c:25 +#: builtin/blame.c:26 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "git blame [các-tùy-chọn] [rev-opts] [rev] [--] tập-tin" -#: builtin/blame.c:30 +#: builtin/blame.c:31 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-opts] được mô tả trong git-rev-list(1)" -#: builtin/blame.c:2355 +#: builtin/blame.c:2276 msgid "Show blame entries as we find them, incrementally" msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần" -#: builtin/blame.c:2356 +#: builtin/blame.c:2277 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)" -#: builtin/blame.c:2357 +#: builtin/blame.c:2278 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)" -#: builtin/blame.c:2358 +#: builtin/blame.c:2279 msgid "Show work cost statistics" msgstr "Hiển thị thống kê công sức làm việc" -#: builtin/blame.c:2359 +#: builtin/blame.c:2280 msgid "Show output score for blame entries" msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”" -#: builtin/blame.c:2360 +#: builtin/blame.c:2281 msgid "Show original filename (Default: auto)" msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" -#: builtin/blame.c:2361 +#: builtin/blame.c:2282 msgid "Show original linenumber (Default: off)" msgstr "Hiển thị số dòng gốc (Mặc định: off)" -#: builtin/blame.c:2362 +#: builtin/blame.c:2283 msgid "Show in a format designed for machine consumption" msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy" -#: builtin/blame.c:2363 +#: builtin/blame.c:2284 msgid "Show porcelain format with per-line commit information" msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng" -#: builtin/blame.c:2364 +#: builtin/blame.c:2285 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Dùng cùng chế độ xuất ra vóigit-annotate (Mặc định: off)" -#: builtin/blame.c:2365 +#: builtin/blame.c:2286 msgid "Show raw timestamp (Default: off)" msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)" -#: builtin/blame.c:2366 +#: builtin/blame.c:2287 msgid "Show long commit SHA1 (Default: off)" msgstr "Hiển thị SHA1 của lần chuyển giao (commit) dạng dài (Mặc định: off)" -#: builtin/blame.c:2367 +#: builtin/blame.c:2288 msgid "Suppress author name and timestamp (Default: off)" msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)" -#: builtin/blame.c:2368 +#: builtin/blame.c:2289 msgid "Show author email instead of name (Default: off)" msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)" -#: builtin/blame.c:2369 +#: builtin/blame.c:2290 msgid "Ignore whitespace differences" msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:2370 +#: builtin/blame.c:2291 msgid "Spend extra cycles to find better match" msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa" -#: builtin/blame.c:2371 +#: builtin/blame.c:2292 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”" -#: builtin/blame.c:2372 +#: builtin/blame.c:2293 msgid "Use <file>'s contents as the final image" msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng" -#: builtin/blame.c:2373 builtin/blame.c:2374 +#: builtin/blame.c:2294 builtin/blame.c:2295 msgid "score" msgstr "điểm số" -#: builtin/blame.c:2373 +#: builtin/blame.c:2294 msgid "Find line copies within and across files" msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin" -#: builtin/blame.c:2374 +#: builtin/blame.c:2295 msgid "Find line movements within and across files" msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin" -#: builtin/blame.c:2375 +#: builtin/blame.c:2296 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2375 +#: builtin/blame.c:2296 msgid "Process only line range n,m, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" @@ -2744,8 +2819,8 @@ msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 -#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369 -#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 +#: builtin/branch.c:838 builtin/commit.c:1414 builtin/commit.c:1415 +#: builtin/commit.c:1416 builtin/commit.c:1417 builtin/tag.c:468 msgid "commit" msgstr "commit" @@ -2809,7 +2884,7 @@ msgstr "liệt kê các nhánh trong các cột" msgid "Failed to resolve HEAD as a valid ref." msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu (ref) hợp lệ." -#: builtin/branch.c:860 builtin/clone.c:619 +#: builtin/branch.c:860 builtin/clone.c:630 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" @@ -2933,44 +3008,44 @@ msgstr "Cần một kho chứa để mà tạo một bundle." msgid "Need a repository to unbundle." msgstr "Cần một kho chứa để mà bung một bundle." -#: builtin/cat-file.c:176 +#: builtin/cat-file.c:303 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<kiểu>|--textconv) <đối tượng>" -#: builtin/cat-file.c:177 +#: builtin/cat-file.c:304 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <danh-sách-đối-tượng>" -#: builtin/cat-file.c:195 +#: builtin/cat-file.c:341 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<kiểu> là một trong số: blob, tree, commit, tag" -#: builtin/cat-file.c:196 +#: builtin/cat-file.c:342 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:197 +#: builtin/cat-file.c:343 msgid "show object size" msgstr "hiển thị kích thước đối tượng" -#: builtin/cat-file.c:199 +#: builtin/cat-file.c:345 msgid "exit with zero when there's no error" msgstr "thoát với 0 khi không có lỗi" -#: builtin/cat-file.c:200 +#: builtin/cat-file.c:346 msgid "pretty-print object's content" msgstr "in nội dung đối tượng dạng dễ đọc" -#: builtin/cat-file.c:202 +#: builtin/cat-file.c:348 msgid "for blob objects, run textconv on object's content" msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng" -#: builtin/cat-file.c:204 +#: builtin/cat-file.c:350 msgid "show info and content of objects fed from the standard input" msgstr "" "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:207 +#: builtin/cat-file.c:353 msgid "show info about objects fed from the standard input" msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn" @@ -2999,30 +3074,55 @@ msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" msgid "input paths are terminated by a null character" msgstr "các đường dẫn được ngăn cách bởi ký tự null" -#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 +#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" -#: builtin/check-ignore.c:146 +#: builtin/check-ignore.c:26 +msgid "show non-matching input paths" +msgstr "hiển thị những đường dẫn đầu vào không khớp với mẫu" + +#: builtin/check-ignore.c:143 msgid "cannot specify pathnames with --stdin" msgstr "không thể chỉ định các tên đường dẫn với --stdin" -#: builtin/check-ignore.c:149 +#: builtin/check-ignore.c:146 msgid "-z only makes sense with --stdin" msgstr "-z chỉ hợp lý với --stdin" -#: builtin/check-ignore.c:151 +#: builtin/check-ignore.c:148 msgid "no path specified" msgstr "chưa ghi rõ đường dẫn" -#: builtin/check-ignore.c:155 +#: builtin/check-ignore.c:152 msgid "--quiet is only valid with a single pathname" msgstr "--quiet chỉ hợp lệ với tên đường dẫn đơn" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:154 msgid "cannot have both --quiet and --verbose" msgstr "không thể dùng cả hai tùy chọn --quiet và --verbose" +#: builtin/check-ignore.c:157 +msgid "--non-matching is only valid with --verbose" +msgstr "tùy-chọn --non-matching chỉ hợp lệ khi dùng với --verbose" + +#: builtin/check-mailmap.c:8 +msgid "git check-mailmap [options] <contact>..." +msgstr "git check-mailmap [các-tùy-chọn] <danh-bạ>..." + +#: builtin/check-mailmap.c:13 +msgid "also read contacts from stdin" +msgstr "đồng thời đọc các danh bạ từ đầu vào tiêu chuẩn" + +#: builtin/check-mailmap.c:24 +#, c-format +msgid "unable to parse contact: %s" +msgstr "không thể phân tích danh bạ: “%s”" + +#: builtin/check-mailmap.c:47 +msgid "no contacts specified" +msgstr "chưa chỉ ra danh bạ" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "git checkout-index [các-tùy-chọn] [--] [<tập-tin>...]" @@ -3141,42 +3241,42 @@ msgstr "bạn cần phải phân giải bảng mục lục hiện tại của b msgid "Can not do reflog for '%s'\n" msgstr "Không thể thực hiện reflog cho “%s”\n" -#: builtin/checkout.c:634 +#: builtin/checkout.c:639 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:641 +#: builtin/checkout.c:646 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:644 +#: builtin/checkout.c:649 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:648 +#: builtin/checkout.c:653 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Đã chuyển tới và reset nhánh “%s”\n" -#: builtin/checkout.c:650 builtin/checkout.c:987 +#: builtin/checkout.c:655 builtin/checkout.c:997 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:652 +#: builtin/checkout.c:657 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:708 +#: builtin/checkout.c:713 #, c-format msgid " ... and %d more.\n" msgstr " ... và nhiều hơn %d.\n" #. The singular version -#: builtin/checkout.c:714 +#: builtin/checkout.c:719 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3201,7 +3301,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:737 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3217,138 +3317,138 @@ msgstr "" " git branch tên_nhánh_mới %s\n" "\n" -#: builtin/checkout.c:762 +#: builtin/checkout.c:767 msgid "internal error in revision walk" -msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét lại" +msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt" -#: builtin/checkout.c:766 +#: builtin/checkout.c:771 msgid "Previous HEAD position was" msgstr "Vị trí kế trước của HEAD là" -#: builtin/checkout.c:793 builtin/checkout.c:982 +#: builtin/checkout.c:798 builtin/checkout.c:992 msgid "You are on a branch yet to be born" msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra" #. case (1) -#: builtin/checkout.c:918 +#: builtin/checkout.c:928 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu sai: %s" #. case (1): want a tree -#: builtin/checkout.c:957 +#: builtin/checkout.c:967 #, c-format msgid "reference is not a tree: %s" msgstr "tham chiếu không phải là một cây (tree):%s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1006 msgid "paths cannot be used with switching branches" msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển" -#: builtin/checkout.c:999 builtin/checkout.c:1003 +#: builtin/checkout.c:1009 builtin/checkout.c:1013 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "“%s” không thể được sử dụng với các nhánh chuyển" -#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025 +#: builtin/checkout.c:1028 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” không thể được sử dụng với “%s”" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1033 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Không thể chuyển nhánh đến một non-commit “%s”" -#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90 +#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1046 +#: builtin/checkout.c:1056 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1058 msgid "create/reset and checkout a branch" msgstr "create/reset và checkout một nhánh" -#: builtin/checkout.c:1049 +#: builtin/checkout.c:1059 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1050 +#: builtin/checkout.c:1060 msgid "detach the HEAD at named commit" msgstr "rời bỏ HEAD tại lần chuyển giao danh nghĩa" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:1061 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn (upstream) cho nhánh mới" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1063 msgid "new branch" msgstr "nhánh mới" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1063 msgid "new unparented branch" msgstr "nhánh mồ côi mới" -#: builtin/checkout.c:1054 +#: builtin/checkout.c:1064 msgid "checkout our version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1066 msgid "checkout their version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1068 msgid "force checkout (throw away local modifications)" msgstr "ép buộc lấy ra (checkout) (bỏ đi những thay đổi nội bộ)" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1069 msgid "perform a 3-way merge with the new branch" msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" -#: builtin/checkout.c:1060 builtin/merge.c:217 +#: builtin/checkout.c:1070 builtin/merge.c:232 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 +#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249 msgid "style" msgstr "kiểu" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1072 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hay diff3)" -#: builtin/checkout.c:1065 +#: builtin/checkout.c:1075 msgid "do not limit pathspecs to sparse entries only" msgstr "không giới hạn pathspecs chỉ thành các mục thưa thớt" -#: builtin/checkout.c:1067 +#: builtin/checkout.c:1077 msgid "second guess 'git checkout no-such-branch'" msgstr "gợi ý thứ hai “git checkout không-nhánh-nào-như-vậy”" -#: builtin/checkout.c:1091 +#: builtin/checkout.c:1101 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Tùy chọn -b|-B và --orphan loại từ lẫn nhau" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1118 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1125 msgid "Missing branch name; try -b" msgstr "Thiếu tên nhánh; hãy thử -b" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3358,12 +3458,12 @@ msgstr "" "Bạn đã có ý định checkout “%s” cái mà không thể được phân giải như là lần " "chuyển giao (commit)?" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1172 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3371,217 +3471,320 @@ msgstr "" "git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n" "checkout bảng mục lục (index)." -#: builtin/clean.c:20 -msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "git clean [-d] [-f] [-n] [-q] [-e <mẫu>] [-x | -X] [--] <đường-dẫn>..." +#: builtin/clean.c:25 +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <mẫu>] [-x | -X] [--] <đường-dẫn>..." -#: builtin/clean.c:24 +#: builtin/clean.c:29 #, c-format msgid "Removing %s\n" msgstr "Đang gỡ bỏ %s\n" -#: builtin/clean.c:25 +#: builtin/clean.c:30 #, c-format msgid "Would remove %s\n" msgstr "Có thể gỡ bỏ %s\n" -#: builtin/clean.c:26 +#: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" msgstr "Đang bỏ qua kho chứa %s\n" -#: builtin/clean.c:27 +#: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" msgstr "Nên bỏ qua kho chứa %s\n" -#: builtin/clean.c:28 +#: builtin/clean.c:33 #, c-format msgid "failed to remove %s" msgstr "gặp lỗi khi gỡ bỏ %s" -#: builtin/clean.c:160 +#: builtin/clean.c:293 +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing" +msgstr "" +"Trợ giúp về nhắc:\n" +"1 - chọn một mục được đánh số\n" +"foo - chọn mục trên cơ sở tiền tố duy nhất\n" +" - (trống rỗng) không chọn gì cả" + +#: builtin/clean.c:297 +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting" +msgstr "" +"Trợ giúp về nhắc:\n" +"1 - chọn một mục đơn\n" +"3-5 - chọn một vùng\n" +"2-3,6-9 - chọn nhiều vùng\n" +"foo - chọn mục dựa trên tiền tố duy nhất\n" +"-... - không chọn các mục đã chỉ ra\n" +"* - chọn tất\n" +" - (trống rỗng) kết thúc việc chọn" + +#: builtin/clean.c:491 +#, c-format +msgid "Huh (%s)?" +msgstr "Hả (%s)?" + +#: builtin/clean.c:634 +#, c-format +msgid "Input ignore patterns>> " +msgstr "Mẫu để lọc các tập tin cần lờ đi đầu vào>>" + +#: builtin/clean.c:671 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s" + +#: builtin/clean.c:692 +msgid "Select items to delete" +msgstr "Chọn mục muốn xóa" + +#: builtin/clean.c:732 +#, c-format +msgid "remove %s? " +msgstr "gỡ bỏ “%s”?" + +#: builtin/clean.c:757 +msgid "Bye." +msgstr "Tạm biệt." + +#: builtin/clean.c:765 +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "" +"clean - bắt đầu dọn dẹp\n" +"filter by pattern - loại trừ các mục khỏi việc xóa\n" +"select by numbers - chọn các mục cần xóa bằng số\n" +"ask each - xác nhận trước mỗi lần xóa (giống như \"rm -i\")\n" +"quit - dừng việc dọn dẹp lại\n" +"help - hiển thị chính trợ giúp này\n" +"? - trợ giúp dành cho chọn bằng cách nhắc" + +#: builtin/clean.c:792 +msgid "*** Commands ***" +msgstr "*** Lệnh ***" + +#: builtin/clean.c:793 +msgid "What now" +msgstr "Giờ thì sao" + +#: builtin/clean.c:801 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "Có muốn gỡ bỏ mục sau đây không:" +msgstr[1] "Có muốn gỡ bỏ các mục sau đây không:" + +#: builtin/clean.c:818 +msgid "No more files to clean, exiting." +msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra." + +#: builtin/clean.c:850 msgid "do not print names of files removed" msgstr "không hiển thị tên của các tập tin đã gỡ bỏ" -#: builtin/clean.c:162 +#: builtin/clean.c:852 msgid "force" msgstr "ép buộc" -#: builtin/clean.c:164 +#: builtin/clean.c:853 +msgid "interactive cleaning" +msgstr "sửa bằng cách tương tác" + +#: builtin/clean.c:855 msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 -#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:856 builtin/describe.c:420 builtin/grep.c:716 +#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186 msgid "pattern" msgstr "mẫu" -#: builtin/clean.c:166 +#: builtin/clean.c:857 msgid "add <pattern> to ignore rules" msgstr "thêm <mẫu> vào trong qui tắc bỏ qua" -#: builtin/clean.c:167 +#: builtin/clean.c:858 msgid "remove ignored files, too" msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua" -#: builtin/clean.c:169 +#: builtin/clean.c:860 msgid "remove only ignored files" msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua" -#: builtin/clean.c:187 +#: builtin/clean.c:878 msgid "-x and -X cannot be used together" msgstr "-x và -X không thể dùng cùng một lúc với nhau" -#: builtin/clean.c:191 +#: builtin/clean.c:882 msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean" msgstr "" -"clean.requireForce được đặt thành true và không đưa ra tùy chọn -n mà cũng " +"clean.requireForce được đặt thành true và không đưa ra tùy chọn -n mà cũng " "không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clean.c:194 +#: builtin/clean.c:885 msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" +"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"refusing to clean" msgstr "" -"clean.requireForce mặc định được đặt thành true và không đưa ra tùy chọn -n " -"mà cũng không -f; từ chối lệnh dọn dẹp (clean)" +"clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -n mà " +"cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clone.c:37 +#: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [các-tùy-chọn] [--] <kho> [<t.mục>]" -#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 -#: builtin/push.c:436 +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229 +#: builtin/push.c:462 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến trình" -#: builtin/clone.c:67 +#: builtin/clone.c:66 msgid "don't create a checkout" msgstr "không tạo một checkout" -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 msgid "create a bare repository" msgstr "tạo kho chứa bare" -#: builtin/clone.c:73 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "tạo kho bản sao (mirror) (ngụ ý là bare)" -#: builtin/clone.c:75 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "để nhân bản từ kho nội bộ" -#: builtin/clone.c:77 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép" -#: builtin/clone.c:79 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "cài đặt đây là kho chia sẻ" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "khởi tạo mô-đun-con trong bản sao" -#: builtin/clone.c:84 builtin/init-db.c:485 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "thư-mục-tạm" -#: builtin/clone.c:85 builtin/init-db.c:486 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "thư mục mà tại đó các mẫu sẽ được dùng" -#: builtin/clone.c:87 +#: builtin/clone.c:86 msgid "reference repository" msgstr "kho tham chiếu" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "tên" -#: builtin/clone.c:89 +#: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" msgstr "dùng <tên> thay vì “origin” để theo dõi thượng nguồn (uptream)" -#: builtin/clone.c:91 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "lấy ra nhánh (checkout <nhánh>) thay vì HEAD của máy chủ" -#: builtin/clone.c:93 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "đường dẫn đến git-upload-pack trên máy chủ" -#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661 msgid "depth" msgstr "độ sâu" -#: builtin/clone.c:95 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho" -#: builtin/clone.c:97 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "nhân bản (clone) chỉ một nhánh, HEAD hoặc --branch" -#: builtin/clone.c:98 builtin/init-db.c:494 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:99 builtin/init-db.c:495 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "key=value" msgstr "khóa=giá trị" -#: builtin/clone.c:101 +#: builtin/clone.c:100 msgid "set config inside the new repository" msgstr "đặt cấu hình bên trong một kho chứa mới" -#: builtin/clone.c:254 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "kho tham chiếu “%s” không phải là một kho nội bộ." -#: builtin/clone.c:317 +#: builtin/clone.c:316 #, c-format msgid "failed to create directory '%s'" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/clone.c:319 builtin/diff.c:77 +#: builtin/clone.c:318 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "gặp lỗi stat (lấy trạng thái về) “%s”" -#: builtin/clone.c:321 +#: builtin/clone.c:320 #, c-format msgid "%s exists and is not a directory" msgstr "%s tồn tại nhưng không phải là một thư mục" -#: builtin/clone.c:335 +#: builtin/clone.c:334 #, c-format msgid "failed to stat %s\n" msgstr "lỗi stat (lấy trạng thái về) %s\n" -#: builtin/clone.c:357 +#: builtin/clone.c:356 #, c-format msgid "failed to create link '%s'" msgstr "gặp lỗi khi tạo được liên kết mềm %s" -#: builtin/clone.c:361 +#: builtin/clone.c:360 #, c-format msgid "failed to copy file to '%s'" msgstr "gặp lỗi khi chép tập tin tới “%s”" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "done.\n" msgstr "hoàn tất.\n" -#: builtin/clone.c:397 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -3591,90 +3794,104 @@ msgstr "" "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n" "và thử checkout với lệnh “git checkout -f HEAD”\n" -#: builtin/clone.c:476 +#: builtin/clone.c:475 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." -#: builtin/clone.c:550 +#: builtin/clone.c:555 +#, c-format +msgid "Checking connectivity... " +msgstr "Đang kiểm tra kết nối..." + +#: builtin/clone.c:558 msgid "remote did not send all necessary objects" msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" -#: builtin/clone.c:610 +#: builtin/clone.c:560 +#, c-format +msgid "done\n" +msgstr "xong.\n" + +#: builtin/clone.c:621 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể checkout.\n" -#: builtin/clone.c:641 +#: builtin/clone.c:652 msgid "unable to checkout working tree" msgstr "không thể lấy ra (checkout) cây làm việc" -#: builtin/clone.c:749 +#: builtin/clone.c:760 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:753 +#: builtin/clone.c:764 msgid "You must specify a repository to clone." msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." -#: builtin/clone.c:764 +#: builtin/clone.c:775 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "tùy chọn --bare và --origin %s xung khắc nhau." -#: builtin/clone.c:767 +#: builtin/clone.c:778 msgid "--bare and --separate-git-dir are incompatible." msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." -#: builtin/clone.c:780 +#: builtin/clone.c:791 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:785 +#: builtin/clone.c:796 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:795 +#: builtin/clone.c:798 +msgid "--local is ignored" +msgstr "--local bị lờ đi" + +#: builtin/clone.c:808 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng." -#: builtin/clone.c:805 +#: builtin/clone.c:818 #, c-format msgid "working tree '%s' already exists." msgstr "cây làm việc “%s” đã sẵn tồn tại rồi." -#: builtin/clone.c:818 builtin/clone.c:830 +#: builtin/clone.c:831 builtin/clone.c:843 #, c-format msgid "could not create leading directories of '%s'" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" -#: builtin/clone.c:821 +#: builtin/clone.c:834 #, c-format msgid "could not create work tree dir '%s'." msgstr "không thể tạo cây thư mục làm việc dir “%s”." -#: builtin/clone.c:840 +#: builtin/clone.c:853 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Đang nhân bản thành kho chứa bare “%s”...\n" -#: builtin/clone.c:842 +#: builtin/clone.c:855 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”...\n" -#: builtin/clone.c:877 +#: builtin/clone.c:890 #, c-format msgid "Don't know how to clone %s" msgstr "Không biết làm cách nào để nhân bản (clone) %s" -#: builtin/clone.c:926 +#: builtin/clone.c:942 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn (upstream) %s" -#: builtin/clone.c:933 +#: builtin/clone.c:949 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -3710,15 +3927,15 @@ msgstr "Chèn thêm khoảng trắng giữa các cột" msgid "--command must be the first argument" msgstr "--command phải là đối số đầu tiên" -#: builtin/commit.c:34 +#: builtin/commit.c:35 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [các-tùy-chọn] [--] <pathspec>..." -#: builtin/commit.c:39 +#: builtin/commit.c:40 msgid "git status [options] [--] <pathspec>..." msgstr "git status [các-tùy-chọn] [--] <pathspec>..." -#: builtin/commit.c:44 +#: builtin/commit.c:45 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3746,7 +3963,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:56 +#: builtin/commit.c:57 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -3759,7 +3976,7 @@ msgstr "" "hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n" "\"git reset HEAD^\".\n" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -3776,97 +3993,97 @@ msgstr "" "\n" "Nếu không, hãy thử dùng “git reset”\n" -#: builtin/commit.c:260 +#: builtin/commit.c:265 msgid "failed to unpack HEAD tree object" msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" -#: builtin/commit.c:302 +#: builtin/commit.c:307 msgid "unable to create temporary index" msgstr "không thể tạo bảng mục lục tạm thời" -#: builtin/commit.c:308 +#: builtin/commit.c:313 msgid "interactive add failed" msgstr "việc thêm tương tác gặp lỗi" -#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 +#: builtin/commit.c:346 builtin/commit.c:367 builtin/commit.c:417 msgid "unable to write new_index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)" -#: builtin/commit.c:393 +#: builtin/commit.c:398 msgid "cannot do a partial commit during a merge." msgstr "" "không thể thực hiện việc chuyển giao (commit) cục bộ trong khi đang được hòa " "trộn." -#: builtin/commit.c:395 +#: builtin/commit.c:400 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "không thể thực hiện việc chuyển giao (commit) bộ phận trong khi đang cherry-" "pick." -#: builtin/commit.c:405 +#: builtin/commit.c:410 msgid "cannot read the index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:425 +#: builtin/commit.c:430 msgid "unable to write temporary index file" msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" -#: builtin/commit.c:513 builtin/commit.c:519 +#: builtin/commit.c:521 builtin/commit.c:527 #, c-format msgid "invalid commit: %s" msgstr "lần chuyển giao (commit) không hợp lệ: %s" -#: builtin/commit.c:542 +#: builtin/commit.c:549 msgid "malformed --author parameter" msgstr "đối số --author bị dị hình" -#: builtin/commit.c:562 +#: builtin/commit.c:569 #, c-format msgid "Malformed ident string: '%s'" msgstr "Chuỗi thụt lề đầu dòng dị hình: “%s”" -#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 +#: builtin/commit.c:607 builtin/commit.c:640 builtin/commit.c:963 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:612 builtin/shortlog.c:270 +#: builtin/commit.c:619 builtin/shortlog.c:271 #, c-format msgid "(reading log message from standard input)\n" msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" -#: builtin/commit.c:614 +#: builtin/commit.c:621 msgid "could not read log from standard input" msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" -#: builtin/commit.c:618 +#: builtin/commit.c:625 #, c-format msgid "could not read log file '%s'" msgstr "không đọc được tệp nhật ký “%s”" -#: builtin/commit.c:624 +#: builtin/commit.c:631 msgid "commit has empty message" msgstr "lần chuyển giao (commit) có ghi chú trống rỗng" -#: builtin/commit.c:640 +#: builtin/commit.c:647 msgid "could not read MERGE_MSG" msgstr "không thể đọc MERGE_MSG" -#: builtin/commit.c:644 +#: builtin/commit.c:651 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:648 +#: builtin/commit.c:655 #, c-format msgid "could not read '%s'" msgstr "Không thể đọc “%s”." -#: builtin/commit.c:709 +#: builtin/commit.c:716 msgid "could not write commit template" msgstr "không thể ghi mẫu commit" -#: builtin/commit.c:720 +#: builtin/commit.c:727 #, c-format msgid "" "\n" @@ -3881,7 +4098,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:725 +#: builtin/commit.c:732 #, c-format msgid "" "\n" @@ -3896,7 +4113,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:737 +#: builtin/commit.c:744 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -3907,7 +4124,7 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " "chuyển giao (commit).\n" -#: builtin/commit.c:742 +#: builtin/commit.c:749 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -3919,372 +4136,372 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" "Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao (commit).\n" -#: builtin/commit.c:755 +#: builtin/commit.c:762 #, c-format msgid "%sAuthor: %s" msgstr "%sTác giả: %s" -#: builtin/commit.c:762 +#: builtin/commit.c:769 #, c-format msgid "%sCommitter: %s" msgstr "%sNgười chuyển giao (commit): %s" -#: builtin/commit.c:782 +#: builtin/commit.c:789 msgid "Cannot read index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:819 +#: builtin/commit.c:826 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:834 builtin/tag.c:359 +#: builtin/commit.c:841 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy áp dụng thông điệp sử dụng hoặc là tùy chọn -m hoặc là -F.\n" -#: builtin/commit.c:931 +#: builtin/commit.c:938 #, c-format msgid "No existing author found with '%s'" msgstr "Không tìm thấy tác giả có sẵn với “%s”" -#: builtin/commit.c:946 builtin/commit.c:1140 +#: builtin/commit.c:953 builtin/commit.c:1189 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế độ cho các tập tin không bị theo vết không hợp lệ “%s”" -#: builtin/commit.c:976 +#: builtin/commit.c:990 +msgid "--long and -z are incompatible" +msgstr "hai tùy chọn -long và -z không tương thích với nhau" + +#: builtin/commit.c:1020 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:987 +#: builtin/commit.c:1031 msgid "You have nothing to amend." msgstr "Không có gì để amend (tu bổ) cả." -#: builtin/commit.c:990 +#: builtin/commit.c:1034 msgid "You are in the middle of a merge -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện amend (tu bổ)." -#: builtin/commit.c:992 +#: builtin/commit.c:1036 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện amend (tu " "bổ)." -#: builtin/commit.c:995 +#: builtin/commit.c:1039 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1005 +#: builtin/commit.c:1049 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Chỉ một tùy chọn trong số -c/-C/-F/--fixup được sử dụng" -#: builtin/commit.c:1007 +#: builtin/commit.c:1051 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F/--fixup." -#: builtin/commit.c:1015 +#: builtin/commit.c:1059 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1032 +#: builtin/commit.c:1076 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " "sử dụng." -#: builtin/commit.c:1034 +#: builtin/commit.c:1078 msgid "No paths with --include/--only does not make sense." msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." -#: builtin/commit.c:1036 +#: builtin/commit.c:1080 msgid "Clever... amending the last one with dirty index." msgstr "Giỏi... tu bổ cái cuối với bảng mục lục phi nghĩa." -#: builtin/commit.c:1038 +#: builtin/commit.c:1082 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" "Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; đang " "giả định --only những-đường-dẫn..." -#: builtin/commit.c:1048 builtin/tag.c:575 +#: builtin/commit.c:1092 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1053 +#: builtin/commit.c:1097 msgid "Paths with -a does not make sense." msgstr "Các đường dẫn với tùy chọn -a không hợp lý." -#: builtin/commit.c:1059 builtin/commit.c:1194 -msgid "--long and -z are incompatible" -msgstr "hai tùy chọn -long và -z không tương thích với nhau" - -#: builtin/commit.c:1154 builtin/commit.c:1390 +#: builtin/commit.c:1203 builtin/commit.c:1436 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1156 builtin/commit.c:1392 +#: builtin/commit.c:1205 builtin/commit.c:1438 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 +#: builtin/commit.c:1207 builtin/commit.c:1440 builtin/push.c:452 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1161 builtin/commit.c:1396 +#: builtin/commit.c:1210 builtin/commit.c:1442 msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dài (mặc định)" -#: builtin/commit.c:1164 builtin/commit.c:1399 +#: builtin/commit.c:1213 builtin/commit.c:1445 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 -#: builtin/fast-export.c:662 builtin/tag.c:459 +#: builtin/commit.c:1215 builtin/commit.c:1448 builtin/fast-export.c:667 +#: builtin/fast-export.c:670 builtin/tag.c:459 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1167 builtin/commit.c:1402 +#: builtin/commit.c:1216 builtin/commit.c:1448 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1170 +#: builtin/commit.c:1219 msgid "show ignored files" msgstr "hiển thị các tập tin ẩn" -#: builtin/commit.c:1171 parse-options.h:151 +#: builtin/commit.c:1220 parse-options.h:154 msgid "when" msgstr "khi" -#: builtin/commit.c:1172 +#: builtin/commit.c:1221 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -"bỏ qua các thay đổi trong mô-đun con, tùy chọn khi: all, dirty, untracked. " +"bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1174 +#: builtin/commit.c:1223 msgid "list untracked files in columns" msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" -#: builtin/commit.c:1248 +#: builtin/commit.c:1294 msgid "couldn't look up newly created commit" msgstr "không thể tìm thấy lần chuyển giao (commit) mới hơn đã được tạo" -#: builtin/commit.c:1250 +#: builtin/commit.c:1296 msgid "could not parse newly created commit" msgstr "" "không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo" -#: builtin/commit.c:1291 +#: builtin/commit.c:1337 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1293 +#: builtin/commit.c:1339 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1406 msgid "suppress summary after successful commit" msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" -#: builtin/commit.c:1361 +#: builtin/commit.c:1407 msgid "show diff in commit message template" msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" -#: builtin/commit.c:1363 +#: builtin/commit.c:1409 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1364 builtin/tag.c:457 +#: builtin/commit.c:1410 builtin/tag.c:457 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1365 +#: builtin/commit.c:1411 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1365 +#: builtin/commit.c:1411 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1366 builtin/gc.c:178 +#: builtin/commit.c:1412 builtin/gc.c:178 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1366 +#: builtin/commit.c:1412 msgid "override date for commit" msgstr "ghi đè ngày tháng cho commit" -#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 -#: builtin/notes.c:690 builtin/tag.c:455 +#: builtin/commit.c:1413 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "thông điệp" -#: builtin/commit.c:1367 +#: builtin/commit.c:1413 msgid "commit message" msgstr "chú thích của lần commit" -#: builtin/commit.c:1368 +#: builtin/commit.c:1414 msgid "reuse and edit message from specified commit" msgstr "" "dùng lại các ghi chú từ lần chuyển giao (commit) đã cho nhưng có cho sửa chữa" -#: builtin/commit.c:1369 +#: builtin/commit.c:1415 msgid "reuse message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao (commit) đã cho" -#: builtin/commit.c:1370 +#: builtin/commit.c:1416 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra" -#: builtin/commit.c:1371 +#: builtin/commit.c:1417 msgid "use autosquash formatted message to squash specified commit" msgstr "" "dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ " "ra" -#: builtin/commit.c:1372 +#: builtin/commit.c:1418 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)" -#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109 +#: builtin/commit.c:1419 builtin/log.c:1160 builtin/revert.c:111 msgid "add Signed-off-by:" msgstr "thêm dòng Signed-off-by:" -#: builtin/commit.c:1374 +#: builtin/commit.c:1420 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1375 +#: builtin/commit.c:1421 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1376 +#: builtin/commit.c:1422 msgid "default" msgstr "mặc định" -#: builtin/commit.c:1376 builtin/tag.c:460 +#: builtin/commit.c:1422 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn" -#: builtin/commit.c:1377 +#: builtin/commit.c:1423 msgid "include status in commit message template" msgstr "bao gồm các trạng thái ghi mẫu ghi chú chuyển giao (commit)" -#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 +#: builtin/commit.c:1424 builtin/merge.c:230 builtin/tag.c:461 msgid "key id" msgstr "id khóa" -#: builtin/commit.c:1379 builtin/merge.c:216 +#: builtin/commit.c:1425 builtin/merge.c:231 msgid "GPG sign commit" msgstr "ký lần commit dùng GPG" #. end commit message options -#: builtin/commit.c:1382 +#: builtin/commit.c:1428 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1383 +#: builtin/commit.c:1429 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1384 +#: builtin/commit.c:1430 msgid "add specified files to index for commit" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao (commit)" -#: builtin/commit.c:1385 +#: builtin/commit.c:1431 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1386 +#: builtin/commit.c:1432 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1387 +#: builtin/commit.c:1433 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1388 +#: builtin/commit.c:1434 msgid "bypass pre-commit hook" msgstr "vòng qua móc (hook) pre-commit" -#: builtin/commit.c:1389 +#: builtin/commit.c:1435 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1400 +#: builtin/commit.c:1446 msgid "amend previous commit" msgstr "tu bổ (amend) lần commit trước" -#: builtin/commit.c:1401 +#: builtin/commit.c:1447 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1406 +#: builtin/commit.c:1452 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1409 +#: builtin/commit.c:1455 msgid "ok to record a change with an empty message" msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" -#: builtin/commit.c:1441 +#: builtin/commit.c:1488 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1479 builtin/merge.c:510 +#: builtin/commit.c:1526 builtin/merge.c:525 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" -#: builtin/commit.c:1486 +#: builtin/commit.c:1533 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1493 +#: builtin/commit.c:1540 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1512 +#: builtin/commit.c:1559 #, c-format msgid "could not read commit message: %s" msgstr "không thể đọc thông điệp (message) commit (lần chuyển giao): %s" -#: builtin/commit.c:1526 +#: builtin/commit.c:1573 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" "Đang bỏ qua việc chuyển giao (commit); bạn đã không biên soạn thông điệp " "(message).\n" -#: builtin/commit.c:1531 +#: builtin/commit.c:1578 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" "Đang bỏ qua lần chuyển giao (commit) bởi vì thông điệp của nó trống rỗng.\n" -#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 +#: builtin/commit.c:1593 builtin/merge.c:861 builtin/merge.c:886 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao (commit)" -#: builtin/commit.c:1567 +#: builtin/commit.c:1614 msgid "cannot lock HEAD ref" msgstr "không thể khóa HEAD ref (tham chiếu)" -#: builtin/commit.c:1571 +#: builtin/commit.c:1618 msgid "cannot update HEAD ref" msgstr "không thể cập nhật ref (tham chiếu) HEAD" -#: builtin/commit.c:1582 +#: builtin/commit.c:1629 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4299,115 +4516,123 @@ msgstr "" msgid "git config [options]" msgstr "git config [các-tùy-chọn]" -#: builtin/config.c:51 +#: builtin/config.c:52 msgid "Config file location" msgstr "Vị trí tập tin cấu hình" -#: builtin/config.c:52 +#: builtin/config.c:53 msgid "use global config file" msgstr "đặt tập tin cấu hình cần toàn cục" -#: builtin/config.c:53 +#: builtin/config.c:54 msgid "use system config file" msgstr "sử dụng tập tin cấu hình hệ thống" -#: builtin/config.c:54 +#: builtin/config.c:55 msgid "use repository config file" msgstr "dùng tập tin cấu hình của kho" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "use given config file" msgstr "sử dụng tập tin cấu hình đã cho" -#: builtin/config.c:56 +#: builtin/config.c:57 +msgid "blob-id" +msgstr "blob-id" + +#: builtin/config.c:57 +msgid "read config from given blob object" +msgstr "đọc cấu hình từ đối tượng blob đã cho" + +#: builtin/config.c:58 msgid "Action" msgstr "Hành động" -#: builtin/config.c:57 +#: builtin/config.c:59 msgid "get value: name [value-regex]" msgstr "lấy giá-trị: tên [value-regex]" -#: builtin/config.c:58 +#: builtin/config.c:60 msgid "get all values: key [value-regex]" msgstr "lấy tất cả giá-trị: khóa [value-regex]" -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "get values for regexp: name-regex [value-regex]" msgstr "lấy giá trị cho regexp: name-regex [value-regex]" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "replace all matching variables: name value [value_regex]" msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value_regex]" -#: builtin/config.c:61 +#: builtin/config.c:63 msgid "add a new variable: name value" msgstr "thêm biến mới: tên giá-trị" -#: builtin/config.c:62 +#: builtin/config.c:64 msgid "remove a variable: name [value-regex]" msgstr "gỡ bỏ biến: tên [value-regex]" -#: builtin/config.c:63 +#: builtin/config.c:65 msgid "remove all matches: name [value-regex]" msgstr "gỡ bỏ mọi cái khớp: tên [value-regex]" -#: builtin/config.c:64 +#: builtin/config.c:66 msgid "rename section: old-name new-name" msgstr "đổi tên chương: tên-cũ tên-mới" -#: builtin/config.c:65 +#: builtin/config.c:67 msgid "remove a section: name" msgstr "gỡ bỏ chương: tên" -#: builtin/config.c:66 +#: builtin/config.c:68 msgid "list all" msgstr "liệt kê tất" -#: builtin/config.c:67 +#: builtin/config.c:69 msgid "open an editor" msgstr "mở một trình biên soạn" -#: builtin/config.c:68 builtin/config.c:69 +#: builtin/config.c:70 builtin/config.c:71 msgid "slot" msgstr "khe" -#: builtin/config.c:68 +#: builtin/config.c:70 msgid "find the color configured: [default]" msgstr "tìm cấu hình màu sắc: [mặc định]" -#: builtin/config.c:69 +#: builtin/config.c:71 msgid "find the color setting: [stdout-is-tty]" msgstr "tìm các cài đặt về màu sắc: [stdout-là-tty]" -#: builtin/config.c:70 +#: builtin/config.c:72 msgid "Type" msgstr "Kiểu" -#: builtin/config.c:71 +#: builtin/config.c:73 msgid "value is \"true\" or \"false\"" msgstr "giá trị là \"true\" hoặc \"false\"" -#: builtin/config.c:72 +#: builtin/config.c:74 msgid "value is decimal number" msgstr "giá trị ở dạng số thập phân" -#: builtin/config.c:73 +#: builtin/config.c:75 msgid "value is --bool or --int" msgstr "giá trị là --bool hoặc --int" -#: builtin/config.c:74 +#: builtin/config.c:76 msgid "value is a path (file or directory name)" msgstr "giá trị là đường dẫn (tên tập tin hay thư mục)" -#: builtin/config.c:75 +#: builtin/config.c:77 msgid "Other" msgstr "Khác" -#: builtin/config.c:76 +#: builtin/config.c:78 msgid "terminate values with NUL byte" msgstr "chấm dứt giá trị với byte NUL" -#: builtin/config.c:77 +#: builtin/config.c:79 msgid "respect include directives on lookup" msgstr "tôn trọng kể cà các hướng trong tìm kiếm" @@ -4419,55 +4644,55 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc" -#: builtin/describe.c:15 +#: builtin/describe.c:16 msgid "git describe [options] <committish>*" msgstr "git describe [các-tùy-chọn] <committish>*" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] --dirty" msgstr "git describe [các-tùy-chọn] --dirty" -#: builtin/describe.c:233 +#: builtin/describe.c:237 #, c-format msgid "annotated tag %s not available" msgstr "thẻ đã được ghi chú %s không sẵn để dùng" -#: builtin/describe.c:237 +#: builtin/describe.c:241 #, c-format msgid "annotated tag %s has no embedded name" msgstr "thẻ được chú giải %s không có tên nhúng" -#: builtin/describe.c:239 +#: builtin/describe.c:243 #, c-format msgid "tag '%s' is really '%s' here" msgstr "thẻ “%s” đã thực sự ở đây “%s” rồi" -#: builtin/describe.c:266 +#: builtin/describe.c:270 #, c-format msgid "Not a valid object name %s" msgstr "Không phải tên đối tượng %s hợp lệ" -#: builtin/describe.c:269 +#: builtin/describe.c:273 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s không phải là một đối tượng “%s” hợp lệ" -#: builtin/describe.c:286 +#: builtin/describe.c:290 #, c-format msgid "no tag exactly matches '%s'" msgstr "không có thẻ nào khớp chính xác với “%s”" -#: builtin/describe.c:288 +#: builtin/describe.c:292 #, c-format msgid "searching to describe %s\n" msgstr "Đang tìm kiếm để mô tả %s\n" -#: builtin/describe.c:328 +#: builtin/describe.c:332 #, c-format msgid "finished search at %s\n" msgstr "việc tìm kiếm đã kết thúc tại %s\n" -#: builtin/describe.c:352 +#: builtin/describe.c:359 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4476,7 +4701,7 @@ msgstr "" "Không có thẻ được chú giải nào được mô tả là “%s”.\n" "Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags." -#: builtin/describe.c:356 +#: builtin/describe.c:363 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4485,12 +4710,12 @@ msgstr "" "Không có thẻ (tag) có thể mô tả “%s”.\n" "Hãy thử --always, hoặt tạo một số thẻ." -#: builtin/describe.c:377 +#: builtin/describe.c:384 #, c-format msgid "traversed %lu commits\n" msgstr "đã xuyên %lu qua lần chuyển giao (commit)\n" -#: builtin/describe.c:380 +#: builtin/describe.c:387 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -4499,59 +4724,63 @@ msgstr "" "tìm thấy nhiều hơn %i thẻ (tag); đã liệt kê %i gần đây nhất\n" "bỏ đi tìm kiếm tại %s\n" -#: builtin/describe.c:402 +#: builtin/describe.c:409 msgid "find the tag that comes after the commit" msgstr "tìm các thẻ mà nó đến trước lần chuyển giao" -#: builtin/describe.c:403 +#: builtin/describe.c:410 msgid "debug search strategy on stderr" msgstr "chiến lược tìm kiếm trên đầu ra lỗi chuẩn stderr" -#: builtin/describe.c:404 +#: builtin/describe.c:411 msgid "use any ref" msgstr "dùng ref bất kỳ" -#: builtin/describe.c:405 +#: builtin/describe.c:412 msgid "use any tag, even unannotated" msgstr "dùng thẻ bất kỳ, cả khi “unannotated”" -#: builtin/describe.c:406 +#: builtin/describe.c:413 msgid "always use long format" msgstr "luôn dùng định dạng dài" -#: builtin/describe.c:409 +#: builtin/describe.c:414 +msgid "only follow first parent" +msgstr "chỉ theo cha mẹ đầu tiên" + +#: builtin/describe.c:417 msgid "only output exact matches" msgstr "chỉ xuất những gì khớp chính xác" -#: builtin/describe.c:411 +#: builtin/describe.c:419 msgid "consider <n> most recent tags (default: 10)" msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)" -#: builtin/describe.c:413 +#: builtin/describe.c:421 msgid "only consider tags matching <pattern>" msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" -#: builtin/describe.c:415 builtin/name-rev.c:238 +#: builtin/describe.c:423 builtin/name-rev.c:322 msgid "show abbreviated commit object as fallback" msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback" -#: builtin/describe.c:416 +#: builtin/describe.c:424 msgid "mark" msgstr "dấu" -#: builtin/describe.c:417 +#: builtin/describe.c:425 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")" -#: builtin/describe.c:435 +#: builtin/describe.c:443 msgid "--long is incompatible with --abbrev=0" msgstr "--long là xung khắc với tùy chọn --abbrev=0" -#: builtin/describe.c:461 +#: builtin/describe.c:469 msgid "No names found, cannot describe anything." msgstr "Không tìm thấy các tên, không thể mô tả gì cả." -#: builtin/describe.c:481 +#: builtin/describe.c:489 msgid "--dirty is incompatible with committishes" msgstr "--dirty là xung khắc với các tùy chọn dành cho chuyển giao (commit)" @@ -4560,31 +4789,26 @@ msgstr "--dirty là xung khắc với các tùy chọn dành cho chuyển giao ( msgid "'%s': not a regular file or symlink" msgstr "“%s”: không phải tập tin bình thường hay liên kết tượng trưng" -#: builtin/diff.c:228 +#: builtin/diff.c:230 #, c-format msgid "invalid option: %s" msgstr "tùy chọn sai: %s" -#: builtin/diff.c:305 +#: builtin/diff.c:307 msgid "Not a git repository" msgstr "Không phải là kho git" -#: builtin/diff.c:348 +#: builtin/diff.c:350 #, c-format msgid "invalid object '%s' given." msgstr "đối tượng đã cho “%s” không hợp lệ." -#: builtin/diff.c:353 -#, c-format -msgid "more than %d trees given: '%s'" -msgstr "đã chỉ ra nhiều hơn %d cây (tree): “%s”" - -#: builtin/diff.c:363 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”" -#: builtin/diff.c:371 +#: builtin/diff.c:366 #, c-format msgid "unhandled object '%s' given." msgstr "đã cho đối tượng không thể nắm giữ “%s”." @@ -4593,39 +4817,39 @@ msgstr "đã cho đối tượng không thể nắm giữ “%s”." msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:658 +#: builtin/fast-export.c:666 msgid "show progress after <n> objects" msgstr "hiển thị tiến triển sau <n> đối tượng" -#: builtin/fast-export.c:660 +#: builtin/fast-export.c:668 msgid "select handling of signed tags" msgstr "chọn điều khiển của thẻ đã ký" -#: builtin/fast-export.c:663 +#: builtin/fast-export.c:671 msgid "select handling of tags that tag filtered objects" msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra" -#: builtin/fast-export.c:666 +#: builtin/fast-export.c:674 msgid "Dump marks to this file" msgstr "Đổ các đánh dấu này vào tập-tin" -#: builtin/fast-export.c:668 +#: builtin/fast-export.c:676 msgid "Import marks from this file" msgstr "nhập vào đánh dấu từ tập tin này" -#: builtin/fast-export.c:670 +#: builtin/fast-export.c:678 msgid "Fake a tagger when tags lack one" msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái" -#: builtin/fast-export.c:672 +#: builtin/fast-export.c:680 msgid "Output full tree for each commit" msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao" -#: builtin/fast-export.c:674 +#: builtin/fast-export.c:682 msgid "Use the done feature to terminate the stream" msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu" -#: builtin/fast-export.c:675 +#: builtin/fast-export.c:683 msgid "Skip output of blob data" msgstr "Bỏ qua kết xuất của dữ liệu blob" @@ -4647,7 +4871,7 @@ msgstr "git fetch --all [<các-tùy-chọn>]" #: builtin/fetch.c:60 msgid "fetch from all remotes" -msgstr "fetch từ tất cả các máy chủ" +msgstr "lấy về từ tất cả các máy chủ" #: builtin/fetch.c:62 msgid "append to .git/FETCH_HEAD instead of overwriting" @@ -4663,15 +4887,15 @@ msgstr "ép buộc ghi đè lên nhánh nội bộ" #: builtin/fetch.c:67 msgid "fetch from multiple remotes" -msgstr "fetch từ nhiều máy chủ cùng lúc" +msgstr "lấy từ nhiều máy chủ cùng lúc" #: builtin/fetch.c:69 msgid "fetch all tags and associated objects" -msgstr "lấy (fetch) tất cả các thẻ cùng với các đối tượng liên quan đến nó" +msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó" #: builtin/fetch.c:71 msgid "do not fetch all tags (--no-tags)" -msgstr "không lấy (fetch) tất cả các thẻ (--no-tags)" +msgstr "không lấy tất cả các thẻ (--no-tags)" #: builtin/fetch.c:73 msgid "prune remote-tracking branches no longer on remote" @@ -4685,7 +4909,7 @@ msgstr "khi-cần" #: builtin/fetch.c:75 msgid "control recursive fetching of submodules" -msgstr "điều khiển việc lấy về (fetch) đệ quy trong các mô-đun-con" +msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con" #: builtin/fetch.c:79 msgid "keep downloaded pack" @@ -4693,7 +4917,7 @@ msgstr "giữ các gói đã tải về" #: builtin/fetch.c:81 msgid "allow updating of HEAD ref" -msgstr "cho phép cập nhật ref (tham chiếu) HEAD" +msgstr "cho phép cập nhật th.chiếu HEAD" #: builtin/fetch.c:84 msgid "deepen history of shallow clone" @@ -4703,7 +4927,7 @@ msgstr "làm sâu hơn lịch sử của bản sao" msgid "convert to a complete repository" msgstr "chuyển đổi hoàn toàn sang kho git" -#: builtin/fetch.c:88 builtin/log.c:1130 +#: builtin/fetch.c:88 builtin/log.c:1177 msgid "dir" msgstr "tmục" @@ -4715,76 +4939,76 @@ msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con" msgid "default mode for recursion" msgstr "chế độ mặc định cho đệ qui" -#: builtin/fetch.c:204 +#: builtin/fetch.c:220 msgid "Couldn't find remote ref HEAD" msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" -#: builtin/fetch.c:257 +#: builtin/fetch.c:273 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:262 +#: builtin/fetch.c:278 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:276 +#: builtin/fetch.c:292 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) về nhánh hiện hành)" -#: builtin/fetch.c:277 builtin/fetch.c:363 +#: builtin/fetch.c:293 builtin/fetch.c:379 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:288 +#: builtin/fetch.c:304 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 +#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359 msgid " (unable to update local ref)" msgstr " (không thể cập nhật tham chiếu (ref) nội bộ)" -#: builtin/fetch.c:308 +#: builtin/fetch.c:324 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:327 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:314 +#: builtin/fetch.c:330 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:359 +#: builtin/fetch.c:375 msgid "unable to update local ref" msgstr "không thể cập nhật tham chiếu (ref) nội bộ" -#: builtin/fetch.c:359 +#: builtin/fetch.c:375 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:365 +#: builtin/fetch.c:381 msgid "(non-fast-forward)" msgstr "(non-fast-forward)" -#: builtin/fetch.c:396 builtin/fetch.c:688 +#: builtin/fetch.c:412 builtin/fetch.c:718 #, c-format msgid "cannot open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: builtin/fetch.c:405 +#: builtin/fetch.c:421 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" -#: builtin/fetch.c:491 +#: builtin/fetch.c:520 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:502 +#: builtin/fetch.c:531 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -4793,57 +5017,57 @@ msgstr "" "một số tham chiếu (refs) nội bộ không thể được cập nhật; hãy thử chạy\n" " “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột" -#: builtin/fetch.c:552 +#: builtin/fetch.c:581 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:553 +#: builtin/fetch.c:582 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:560 +#: builtin/fetch.c:589 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:561 builtin/remote.c:1055 +#: builtin/fetch.c:590 builtin/remote.c:1055 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:678 +#: builtin/fetch.c:708 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Từ chối việc lấy (fetch) vào trong nhánh hiện tại %s của một kho chứa không " "phải kho trần (bare)" -#: builtin/fetch.c:712 +#: builtin/fetch.c:742 #, c-format msgid "Don't know how to fetch from %s" -msgstr "Không biết làm cách nào để lấy về (fetch) từ %s" +msgstr "Không biết làm cách nào để lấy về từ %s" -#: builtin/fetch.c:789 +#: builtin/fetch.c:823 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" -#: builtin/fetch.c:792 +#: builtin/fetch.c:826 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n" -#: builtin/fetch.c:894 +#: builtin/fetch.c:928 #, c-format msgid "Fetching %s\n" -msgstr "Đang lấy (fetch) %s\n" +msgstr "Đang lấy về %s\n" -#: builtin/fetch.c:896 builtin/remote.c:100 +#: builtin/fetch.c:930 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" -msgstr "không thể fetch (lấy) %s" +msgstr "không thể lấy về %s" -#: builtin/fetch.c:915 +#: builtin/fetch.c:949 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -4851,32 +5075,32 @@ msgstr "" "Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." -#: builtin/fetch.c:935 +#: builtin/fetch.c:969 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:981 +#: builtin/fetch.c:1015 msgid "--depth and --unshallow cannot be used together" msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" -#: builtin/fetch.c:983 +#: builtin/fetch.c:1017 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1036 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:1004 +#: builtin/fetch.c:1038 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1049 #, c-format msgid "No such remote or remote group: %s" msgstr "không có nhóm máy chủ hay máy chủ như thế: %s" -#: builtin/fetch.c:1023 +#: builtin/fetch.c:1057 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" @@ -4885,9 +5109,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <thông điệp>] [--log[=<n>]|--no-log] [--file <tập-tin>]" -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701 -#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243 msgid "n" msgstr "n" @@ -5047,223 +5271,223 @@ msgstr "git grep [các-tùy-chọn] [-e] <mẫu> [<rev>...] [[--] <đường-d msgid "grep: failed to create thread: %s" msgstr "grep: gặp lỗi tạo tuyến (thread): %s" -#: builtin/grep.c:365 +#: builtin/grep.c:364 #, c-format msgid "Failed to chdir: %s" msgstr "Gặp lỗi với lệnh chdir: %s" -#: builtin/grep.c:443 builtin/grep.c:478 +#: builtin/grep.c:442 builtin/grep.c:477 #, c-format msgid "unable to read tree (%s)" msgstr "không thể đọc cây (%s)" -#: builtin/grep.c:493 +#: builtin/grep.c:492 #, c-format msgid "unable to grep from object of type %s" msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s" -#: builtin/grep.c:551 +#: builtin/grep.c:550 #, c-format msgid "switch `%c' expects a numerical value" msgstr "chuyển đến “%c” cần một giá trị bằng số" -#: builtin/grep.c:568 +#: builtin/grep.c:567 #, c-format msgid "cannot open '%s'" msgstr "không mở được “%s”" -#: builtin/grep.c:643 +#: builtin/grep.c:642 msgid "search in index instead of in the work tree" msgstr "tìm trong bảng mục lục thay vì trong cây làm việc" -#: builtin/grep.c:645 +#: builtin/grep.c:644 msgid "find in contents not managed by git" msgstr "tìm trong nội dung không được quản lý bởi git" -#: builtin/grep.c:647 +#: builtin/grep.c:646 msgid "search in both tracked and untracked files" msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết" -#: builtin/grep.c:649 +#: builtin/grep.c:648 msgid "search also in ignored files" msgstr "tìm cả trong các tập tin đã bị lờ đi" -#: builtin/grep.c:652 +#: builtin/grep.c:651 msgid "show non-matching lines" msgstr "hiển thị những dòng không khớp với mẫu" -#: builtin/grep.c:654 +#: builtin/grep.c:653 msgid "case insensitive matching" msgstr "phân biệt chữ hoa/thường" -#: builtin/grep.c:656 +#: builtin/grep.c:655 msgid "match patterns only at word boundaries" msgstr "chỉ khớp mẫu tại đường ranh giới từ" -#: builtin/grep.c:658 +#: builtin/grep.c:657 msgid "process binary files as text" msgstr "xử lý tập tin nhị phân như là dạng văn bản thường" -#: builtin/grep.c:660 +#: builtin/grep.c:659 msgid "don't match patterns in binary files" msgstr "không khớp mẫu trong các tập tin nhị phân" -#: builtin/grep.c:663 +#: builtin/grep.c:662 msgid "descend at most <depth> levels" msgstr "giảm xuống ít nhất mức <sâu>" -#: builtin/grep.c:667 +#: builtin/grep.c:666 msgid "use extended POSIX regular expressions" msgstr "dùng biểu thức chính qui POSIX có mở rộng" -#: builtin/grep.c:670 +#: builtin/grep.c:669 msgid "use basic POSIX regular expressions (default)" msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)" -#: builtin/grep.c:673 +#: builtin/grep.c:672 msgid "interpret patterns as fixed strings" msgstr "diễn dịch các mẫu như là chuỗi cố định" -#: builtin/grep.c:676 +#: builtin/grep.c:675 msgid "use Perl-compatible regular expressions" msgstr "sử dụng biểu thức chính quy tương thích Perl" -#: builtin/grep.c:679 +#: builtin/grep.c:678 msgid "show line numbers" msgstr "hiển thị số của dòng" -#: builtin/grep.c:680 +#: builtin/grep.c:679 msgid "don't show filenames" msgstr "không hiển thị tên tập tin" -#: builtin/grep.c:681 +#: builtin/grep.c:680 msgid "show filenames" msgstr "hiển thị các tên tập tin" -#: builtin/grep.c:683 +#: builtin/grep.c:682 msgid "show filenames relative to top directory" msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)" -#: builtin/grep.c:685 +#: builtin/grep.c:684 msgid "show only filenames instead of matching lines" msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu" -#: builtin/grep.c:687 +#: builtin/grep.c:686 msgid "synonym for --files-with-matches" msgstr "đồng nghĩa với --files-with-matches" -#: builtin/grep.c:690 +#: builtin/grep.c:689 msgid "show only the names of files without match" msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu" -#: builtin/grep.c:692 +#: builtin/grep.c:691 msgid "print NUL after filenames" msgstr "thêm NUL vào sau tên tập tin" -#: builtin/grep.c:694 +#: builtin/grep.c:693 msgid "show the number of matches instead of matching lines" msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu" -#: builtin/grep.c:695 +#: builtin/grep.c:694 msgid "highlight matches" msgstr "tô sáng cái khớp" -#: builtin/grep.c:697 +#: builtin/grep.c:696 msgid "print empty line between matches from different files" msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt" -#: builtin/grep.c:699 +#: builtin/grep.c:698 msgid "show filename only once above matches from same file" msgstr "" "hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin" -#: builtin/grep.c:702 +#: builtin/grep.c:701 msgid "show <n> context lines before and after matches" msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp" -#: builtin/grep.c:705 +#: builtin/grep.c:704 msgid "show <n> context lines before matches" msgstr "hiển thị <n> dòng nội dung trước khớp" -#: builtin/grep.c:707 +#: builtin/grep.c:706 msgid "show <n> context lines after matches" msgstr "hiển thị <n> dòng nội dung sau khớp" -#: builtin/grep.c:708 +#: builtin/grep.c:707 msgid "shortcut for -C NUM" msgstr "Dạng tắt cho -C SỐ" -#: builtin/grep.c:711 +#: builtin/grep.c:710 msgid "show a line with the function name before matches" msgstr "hiển thị dòng vói tên hàm trước các lần khớp" -#: builtin/grep.c:713 +#: builtin/grep.c:712 msgid "show the surrounding function" msgstr "hiển thị hàm bao quanh" -#: builtin/grep.c:716 +#: builtin/grep.c:715 msgid "read patterns from file" msgstr "đọc mẫu từ tập-tin" -#: builtin/grep.c:718 +#: builtin/grep.c:717 msgid "match <pattern>" msgstr "match <mẫu>" -#: builtin/grep.c:720 +#: builtin/grep.c:719 msgid "combine patterns specified with -e" msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e" -#: builtin/grep.c:732 +#: builtin/grep.c:731 msgid "indicate hit with exit status without output" msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất" -#: builtin/grep.c:734 +#: builtin/grep.c:733 msgid "show only matches from files that match all patterns" msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu" -#: builtin/grep.c:736 +#: builtin/grep.c:735 msgid "show parse tree for grep expression" msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)" -#: builtin/grep.c:740 +#: builtin/grep.c:739 msgid "pager" msgstr "trang giấy" -#: builtin/grep.c:740 +#: builtin/grep.c:739 msgid "show matching files in the pager" msgstr "hiển thị các tập tin khớp trong trang giấy" -#: builtin/grep.c:743 +#: builtin/grep.c:742 msgid "allow calling of grep(1) (ignored by this build)" msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)" -#: builtin/grep.c:744 builtin/show-ref.c:184 +#: builtin/grep.c:743 builtin/show-ref.c:188 msgid "show usage" msgstr "hiển thị cách dùng" -#: builtin/grep.c:811 +#: builtin/grep.c:810 msgid "no pattern given." msgstr "chưa chỉ ra mẫu." -#: builtin/grep.c:866 +#: builtin/grep.c:865 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached hay --untracked không được sử dụng với --no-index." -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "--no-index hay --untracked không được sử dụng cùng với các tùy chọn liên " "quan đến revs." -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết." -#: builtin/grep.c:905 +#: builtin/grep.c:904 msgid "both --cached and trees are given." msgstr "cả hai --cached và các cây phải được chỉ ra." @@ -5303,54 +5527,54 @@ msgstr "lưu các tập tin mà nó không có các bộ lọc" msgid "process file as it were from this path" msgstr "xử lý tập tin như là nó đang ở thư mục này" -#: builtin/help.c:43 +#: builtin/help.c:41 msgid "print all available commands" msgstr "hiển thị danh sách các câu lệnh người dùng có thể sử dụng" -#: builtin/help.c:44 +#: builtin/help.c:42 msgid "print list of useful guides" msgstr "hiển thị danh sách các hướng dẫn hữu dụng" -#: builtin/help.c:45 +#: builtin/help.c:43 msgid "show man page" msgstr "hiển thị trang man" -#: builtin/help.c:46 +#: builtin/help.c:44 msgid "show manual in web browser" msgstr "hiển thị hướng dẫn sử dụng trong trình duyệt web" -#: builtin/help.c:48 +#: builtin/help.c:46 msgid "show info page" msgstr "hiện trang info" -#: builtin/help.c:54 +#: builtin/help.c:52 msgid "git help [--all] [--guides] [--man|--web|--info] [command]" msgstr "git help [--all] [--guides] [--man|--web|--info] [lệnh]" -#: builtin/help.c:66 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "không nhận ra định dạng trợ giúp “%s”" -#: builtin/help.c:94 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "Lỗi khởi chạy emacsclient." -#: builtin/help.c:107 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "Gặp lỗi khi phân tích phiên bản emacsclient." -#: builtin/help.c:115 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)." -#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "gặp lỗi khi thực thi “%s”: %s" -#: builtin/help.c:218 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -5359,7 +5583,7 @@ msgstr "" "“%s”: đường dẫn không hỗ trợ bộ trình chiếu man.\n" "Hãy cân nhắc đến việc sử dụng “man.<tool>.cmd” để thay thế." -#: builtin/help.c:230 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -5368,335 +5592,335 @@ msgstr "" "“%s”: cmd (lệnh) hỗ trợ bộ trình chiếu man.\n" "Hãy cân nhắc đến việc sử dụng “man.<tool>.path” để thay thế." -#: builtin/help.c:351 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "“%s”: không rõ chương trình xem man." -#: builtin/help.c:368 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu" -#: builtin/help.c:376 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu" -#: builtin/help.c:422 +#: builtin/help.c:420 msgid "Defining attributes per path" msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn" -#: builtin/help.c:423 +#: builtin/help.c:421 msgid "A Git glossary" msgstr "Thuật ngữ chuyên môn Git" -#: builtin/help.c:424 +#: builtin/help.c:422 msgid "Specifies intentionally untracked files to ignore" -msgstr "Chỉ định các tập tin chưa theo dõi dấu vết bị bỏ qua một cách cố ý" +msgstr "Chỉ định các tập tin không cần theo dõi" -#: builtin/help.c:425 +#: builtin/help.c:423 msgid "Defining submodule properties" msgstr "Định nghĩa thuộc tính mô-đun-con" -#: builtin/help.c:426 +#: builtin/help.c:424 msgid "Specifying revisions and ranges for Git" msgstr "Chỉ định điểm xét duyệt và vùng cho Git" -#: builtin/help.c:427 +#: builtin/help.c:425 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (dành cho bản 1.5.1 hay mới hơn)" +msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (bản 1.5.1 hay mới hơn)" -#: builtin/help.c:428 +#: builtin/help.c:426 msgid "An overview of recommended workflows with Git" msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git." -#: builtin/help.c:440 +#: builtin/help.c:438 msgid "The common Git guides are:\n" msgstr "Các chỉ dẫn chung về cách dùng Git là:\n" -#: builtin/help.c:462 builtin/help.c:478 +#: builtin/help.c:460 builtin/help.c:476 #, c-format msgid "usage: %s%s" msgstr "cách sử dụng: %s%s" -#: builtin/help.c:494 +#: builtin/help.c:492 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "“git %s” được đặt bí danh thành “%s”" -#: builtin/index-pack.c:182 +#: builtin/index-pack.c:184 #, c-format msgid "object type mismatch at %s" msgstr "kiểu đối tượng không khớp tại %s" -#: builtin/index-pack.c:202 +#: builtin/index-pack.c:204 msgid "object of unexpected type" msgstr "đối tượng của kiểu không mong đợi" -#: builtin/index-pack.c:239 +#: builtin/index-pack.c:244 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "không thể điền vào %d byte" msgstr[1] "không thể điền vào %d byte" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:254 msgid "early EOF" msgstr "vừa đúng lúc EOF" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c:255 msgid "read error on input" msgstr "lỗi đọc ở đầu vào" -#: builtin/index-pack.c:262 +#: builtin/index-pack.c:267 msgid "used more bytes than were available" msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:274 msgid "pack too large for current definition of off_t" msgstr "pack quá lớn so với định nghĩa hiện tại của kiểu off_t" -#: builtin/index-pack.c:285 +#: builtin/index-pack.c:290 #, c-format msgid "unable to create '%s'" msgstr "không thể tạo “%s”" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:295 #, c-format msgid "cannot open packfile '%s'" msgstr "không thể mở packfile “%s”" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:309 msgid "pack signature mismatch" msgstr "chữ ký cho pack không khớp" -#: builtin/index-pack.c:306 +#: builtin/index-pack.c:311 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "không hỗ trợ phiên bản pack %<PRIu32>" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:329 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "pack có đối tượng sai khoảng bù (offset) %lu: %s" -#: builtin/index-pack.c:446 +#: builtin/index-pack.c:451 #, c-format msgid "inflate returned %d" msgstr "xả nén trả về %d" -#: builtin/index-pack.c:495 +#: builtin/index-pack.c:500 msgid "offset value overflow for delta base object" msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở" -#: builtin/index-pack.c:503 +#: builtin/index-pack.c:508 msgid "delta base offset is out of bound" msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:516 #, c-format msgid "unknown object type %d" msgstr "không hiểu kiểu đối tượng %d" -#: builtin/index-pack.c:542 +#: builtin/index-pack.c:547 msgid "cannot pread pack file" msgstr "không thể chạy hàm pread cho tập tin pack" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:549 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu" msgstr[1] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu" -#: builtin/index-pack.c:570 +#: builtin/index-pack.c:575 msgid "serious inflate inconsistency" msgstr "sự mâu thuẫn xả nén nghiêm trọng" -#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 -#: builtin/index-pack.c:724 builtin/index-pack.c:733 +#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 +#: builtin/index-pack.c:729 builtin/index-pack.c:738 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" -#: builtin/index-pack.c:664 builtin/pack-objects.c:170 +#: builtin/index-pack.c:669 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "không thể đọc %s" -#: builtin/index-pack.c:730 +#: builtin/index-pack.c:735 #, c-format msgid "cannot read existing object %s" msgstr "không thể đọc đối tượng đã tồn tại %s" -#: builtin/index-pack.c:744 +#: builtin/index-pack.c:749 #, c-format msgid "invalid blob object %s" msgstr "đối tượng blob không hợp lệ %s" -#: builtin/index-pack.c:759 +#: builtin/index-pack.c:763 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/index-pack.c:761 +#: builtin/index-pack.c:766 msgid "Error in object" msgstr "Lỗi trong đối tượng" -#: builtin/index-pack.c:763 +#: builtin/index-pack.c:768 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được" -#: builtin/index-pack.c:833 builtin/index-pack.c:863 +#: builtin/index-pack.c:838 builtin/index-pack.c:868 msgid "failed to apply delta" msgstr "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:1004 +#: builtin/index-pack.c:1009 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:1004 +#: builtin/index-pack.c:1009 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:1030 +#: builtin/index-pack.c:1035 msgid "pack is corrupted (SHA1 mismatch)" msgstr "pack bị sai hỏng (SHA1 không khớp)" -#: builtin/index-pack.c:1035 +#: builtin/index-pack.c:1040 msgid "cannot fstat packfile" msgstr "không thể fstat packfile" -#: builtin/index-pack.c:1038 +#: builtin/index-pack.c:1043 msgid "pack has junk at the end" msgstr "pack có phần thừa ở cuối" -#: builtin/index-pack.c:1049 +#: builtin/index-pack.c:1054 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()" -#: builtin/index-pack.c:1072 +#: builtin/index-pack.c:1077 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1082 +#: builtin/index-pack.c:1087 #, c-format msgid "unable to create thread: %s" msgstr "không thể tạo tuyến: %s" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1129 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:1132 +#: builtin/index-pack.c:1137 #, c-format msgid "completed with %d local objects" msgstr "đầy đủ với %d đối tượng nội bộ" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1147 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Tổng kiểm tra tail không như mong đợi cho %s (đĩa hỏng?)" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1151 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "pack có %d delta chưa được giải quyết" msgstr[1] "pack có %d delta chưa được giải quyết" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1176 #, c-format msgid "unable to deflate appended object (%d)" msgstr "không thể xả đối tượng nối thêm (%d)" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1255 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1279 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin pack" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1292 #, c-format msgid "cannot write keep file '%s'" msgstr "không thể ghi tập tin giữ lại “%s”" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1300 #, c-format msgid "cannot close written keep file '%s'" msgstr "không thể đóng tập tin giữ lại đã được ghi “%s”" -#: builtin/index-pack.c:1308 +#: builtin/index-pack.c:1313 msgid "cannot store pack file" msgstr "không thể lưu tập tin pack" -#: builtin/index-pack.c:1319 +#: builtin/index-pack.c:1324 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1352 +#: builtin/index-pack.c:1357 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1358 +#: builtin/index-pack.c:1363 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/index-pack.c:1362 builtin/index-pack.c:1535 +#: builtin/index-pack.c:1367 builtin/index-pack.c:1545 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1425 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Không thể mở tập tin pack đã sẵn có “%s”" -#: builtin/index-pack.c:1422 +#: builtin/index-pack.c:1427 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Không thể mở tập tin “pack idx” cho “%s”" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1474 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "không delta: %d đối tượng" msgstr[1] "không delta: %d đối tượng" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1481 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "chiều dài xích = %d: %lu đối tượng" msgstr[1] "chiều dài xích = %d: %lu đối tượng" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1509 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1547 builtin/index-pack.c:1550 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1566 +#: builtin/index-pack.c:1557 builtin/index-pack.c:1560 +#: builtin/index-pack.c:1572 builtin/index-pack.c:1576 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1580 +#: builtin/index-pack.c:1590 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin không thể được dùng mà không có --stdin" -#: builtin/index-pack.c:1584 builtin/index-pack.c:1594 +#: builtin/index-pack.c:1594 builtin/index-pack.c:1604 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "tên tập tin packfile “%s” không được kết thúc bằng đuôi “.pack”" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1613 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" @@ -5832,7 +6056,7 @@ msgstr "các quyền" msgid "specify that the git repository is to be shared amongst several users" msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng" -#: builtin/init-db.c:493 builtin/prune-packed.c:77 +#: builtin/init-db.c:493 builtin/prune-packed.c:75 msgid "be quiet" msgstr "im lặng" @@ -5864,241 +6088,255 @@ msgstr "Không thể truy cập thư mục làm việc hiện hành" msgid "Cannot access work tree '%s'" msgstr "không thể truy cập cây (tree) làm việc “%s”" -#: builtin/log.c:40 +#: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [<các-tùy-chọn>] [<vùng xem xét>] [[--] <đường-dẫn>...]\n" -#: builtin/log.c:41 +#: builtin/log.c:42 msgid " or: git show [options] <object>..." msgstr " hay: git show [các-tùy-chọn] <đối-tượng>..." -#: builtin/log.c:103 +#: builtin/log.c:124 msgid "suppress diff output" msgstr "chặn mọi kết xuất từ diff" -#: builtin/log.c:104 +#: builtin/log.c:125 msgid "show source" msgstr "hiển thị mã nguồn" -#: builtin/log.c:105 +#: builtin/log.c:126 msgid "Use mail map file" msgstr "Sử dụng tập tin ánh xạ thư" -#: builtin/log.c:106 +#: builtin/log.c:127 msgid "decorate options" msgstr "các tùy chọn trang trí" -#: builtin/log.c:199 +#: builtin/log.c:230 #, c-format msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:422 builtin/log.c:514 +#: builtin/log.c:453 builtin/log.c:545 #, c-format msgid "Could not read object %s" msgstr "Không thể đọc đối tượng %s" -#: builtin/log.c:538 +#: builtin/log.c:569 #, c-format msgid "Unknown type: %d" msgstr "Không nhận ra kiểu: %d" -#: builtin/log.c:638 +#: builtin/log.c:669 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:720 +#: builtin/log.c:751 msgid "name of output directory is too long" msgstr "tên của thư mục kết xuất quá dài" -#: builtin/log.c:736 +#: builtin/log.c:767 #, c-format msgid "Cannot open patch file %s" msgstr "Không thể mở tập tin miếng vá: %s" -#: builtin/log.c:750 +#: builtin/log.c:781 msgid "Need exactly one range." msgstr "Cần chính xác một vùng." -#: builtin/log.c:758 +#: builtin/log.c:789 msgid "Not a range." msgstr "Không phải là một vùng." -#: builtin/log.c:860 +#: builtin/log.c:891 msgid "Cover letter needs email format" msgstr "”Cover letter” cần cho định dạng thư" -#: builtin/log.c:936 +#: builtin/log.c:967 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:964 +#: builtin/log.c:995 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [các-tùy-chọn] [<kể-từ> | <vùng-xem-xét>]" -#: builtin/log.c:1009 +#: builtin/log.c:1040 msgid "Two output directories?" msgstr "Hai thư mục kết xuất?" -#: builtin/log.c:1108 +#: builtin/log.c:1155 msgid "use [PATCH n/m] even with a single patch" msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" -#: builtin/log.c:1111 +#: builtin/log.c:1158 msgid "use [PATCH] even with multiple patches" msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" -#: builtin/log.c:1115 +#: builtin/log.c:1162 msgid "print patches to standard out" msgstr "hiển thị miếng vá ra đầu ra chuẩn" -#: builtin/log.c:1117 +#: builtin/log.c:1164 msgid "generate a cover letter" msgstr "tạo bì thư" -#: builtin/log.c:1119 +#: builtin/log.c:1166 msgid "use simple number sequence for output file names" msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" -#: builtin/log.c:1120 +#: builtin/log.c:1167 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1121 +#: builtin/log.c:1168 msgid "use <sfx> instead of '.patch'" msgstr "sử dụng <sfx> thay cho “.patch”" -#: builtin/log.c:1123 +#: builtin/log.c:1170 msgid "start numbering patches at <n> instead of 1" msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" -#: builtin/log.c:1125 +#: builtin/log.c:1172 msgid "mark the series as Nth re-roll" msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" -#: builtin/log.c:1127 +#: builtin/log.c:1174 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Dùng [<tiền-tố>] thay cho [VÁ]" -#: builtin/log.c:1130 +#: builtin/log.c:1177 msgid "store resulting files in <dir>" msgstr "lưu các tập tin kết quả trong <t.mục>" -#: builtin/log.c:1133 +#: builtin/log.c:1180 msgid "don't strip/add [PATCH]" msgstr "không strip/add [VÁ]" -#: builtin/log.c:1136 +#: builtin/log.c:1183 msgid "don't output binary diffs" msgstr "không kết xuất diff (những khác biệt) nhị phân" -#: builtin/log.c:1138 +#: builtin/log.c:1185 msgid "don't include a patch matching a commit upstream" msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" -#: builtin/log.c:1140 +#: builtin/log.c:1187 msgid "show patch format instead of default (patch + stat)" msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" -#: builtin/log.c:1142 +#: builtin/log.c:1189 msgid "Messaging" msgstr "Lời nhắn" -#: builtin/log.c:1143 +#: builtin/log.c:1190 msgid "header" msgstr "đầu đề thư" -#: builtin/log.c:1144 +#: builtin/log.c:1191 msgid "add email header" msgstr "thêm đầu đề thư" -#: builtin/log.c:1145 builtin/log.c:1147 +#: builtin/log.c:1192 builtin/log.c:1194 msgid "email" msgstr "thư điện tử" -#: builtin/log.c:1145 +#: builtin/log.c:1192 msgid "add To: header" msgstr "thêm To: đầu đề thư" -#: builtin/log.c:1147 +#: builtin/log.c:1194 msgid "add Cc: header" msgstr "thêm Cc: đầu đề thư" -#: builtin/log.c:1149 +#: builtin/log.c:1196 +msgid "ident" +msgstr "thụt lề" + +#: builtin/log.c:1197 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "" +"đặt `Địa chỉ gửi' thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)" + +#: builtin/log.c:1199 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1150 +#: builtin/log.c:1200 msgid "make first mail a reply to <message-id>" msgstr "dùng thư đầu tiên để trả lời <message-id>" -#: builtin/log.c:1151 builtin/log.c:1154 +#: builtin/log.c:1201 builtin/log.c:1204 msgid "boundary" msgstr "ranh giới" -#: builtin/log.c:1152 +#: builtin/log.c:1202 msgid "attach the patch" msgstr "đính kèm miếng vá" -#: builtin/log.c:1155 +#: builtin/log.c:1205 msgid "inline the patch" msgstr "dùng miếng vá làm nội dung" -#: builtin/log.c:1159 +#: builtin/log.c:1209 msgid "enable message threading, styles: shallow, deep" msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" -#: builtin/log.c:1161 +#: builtin/log.c:1211 msgid "signature" msgstr "chữ ký" -#: builtin/log.c:1162 +#: builtin/log.c:1212 msgid "add a signature" msgstr "thêm chữ ký" -#: builtin/log.c:1164 +#: builtin/log.c:1214 msgid "don't print the patch filenames" msgstr "không hiển thị các tên tập tin của miếng vá" -#: builtin/log.c:1248 +#: builtin/log.c:1288 +#, c-format +msgid "invalid ident line: %s" +msgstr "dòng thụt lề không hợp lệ: %s" + +#: builtin/log.c:1303 msgid "-n and -k are mutually exclusive." msgstr "-n và -k loại từ lẫn nhau." -#: builtin/log.c:1250 +#: builtin/log.c:1305 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix và -k xung khắc nhau." -#: builtin/log.c:1258 +#: builtin/log.c:1313 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1260 +#: builtin/log.c:1315 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1262 +#: builtin/log.c:1317 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1285 +#: builtin/log.c:1340 msgid "standard output, or directory, which one?" msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?" -#: builtin/log.c:1287 +#: builtin/log.c:1342 #, c-format msgid "Could not create directory '%s'" msgstr "Không thể tạo thư mục “%s”" -#: builtin/log.c:1435 +#: builtin/log.c:1490 msgid "Failed to create output files" msgstr "Gặp lỗi khi tạo các tập tin kết xuất" -#: builtin/log.c:1484 +#: builtin/log.c:1539 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<head> [<giới-hạn>]]]" -#: builtin/log.c:1539 +#: builtin/log.c:1594 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6106,103 +6344,103 @@ msgstr "" "Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <thượng-nguồn> một cách " "thủ công.\n" -#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 +#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621 #, c-format msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao (commit) %s" -#: builtin/ls-files.c:402 +#: builtin/ls-files.c:408 msgid "git ls-files [options] [<file>...]" msgstr "git ls-files [các-tùy-chọn] [<tập-tin>...]" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:465 msgid "identify the file status with tags" msgstr "nhận dạng các trạng thái tập tin với thẻ" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:467 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không " "thay đổi)" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:469 msgid "show cached files in the output (default)" msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:471 msgid "show deleted files in the output" msgstr "hiển thị các tập tin đã xóa trong kết xuất" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:473 msgid "show modified files in the output" msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:475 msgid "show other files in the output" msgstr "hiển thị các tập tin khác trong kết xuất" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:477 msgid "show ignored files in the output" msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:480 msgid "show staged contents' object name in the output" msgstr "hiển thị tên đối tượng của nội dung được lưu trạng thái ở kết xuất" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:482 msgid "show files on the filesystem that need to be removed" msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:484 msgid "show 'other' directories' name only" msgstr "chỉ hiển thị tên của các thư mục “khác”" -#: builtin/ls-files.c:481 +#: builtin/ls-files.c:487 msgid "don't show empty directories" msgstr "không hiển thị thư mục rỗng" -#: builtin/ls-files.c:484 +#: builtin/ls-files.c:490 msgid "show unmerged files in the output" msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:492 msgid "show resolve-undo information" msgstr "hiển thị thông tin resolve-undo" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:494 msgid "skip files matching pattern" msgstr "bỏ qua những tập tin khớp với một mẫu" -#: builtin/ls-files.c:491 +#: builtin/ls-files.c:497 msgid "exclude patterns are read from <file>" msgstr "mẫu loại trừ được đọc từ <tập tin>" -#: builtin/ls-files.c:494 +#: builtin/ls-files.c:500 msgid "read additional per-directory exclude patterns in <file>" msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>" -#: builtin/ls-files.c:496 +#: builtin/ls-files.c:502 msgid "add the standard git exclusions" msgstr "thêm loại trừ tiêu chuẩn kiểu git" -#: builtin/ls-files.c:499 +#: builtin/ls-files.c:505 msgid "make the output relative to the project top directory" msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:508 msgid "if any <file> is not in the index, treat this as an error" msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:509 msgid "tree-ish" msgstr "tree-ish" -#: builtin/ls-files.c:504 +#: builtin/ls-files.c:510 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:512 msgid "show debugging data" msgstr "hiển thị dữ liệu gỡ lỗi" @@ -6254,170 +6492,170 @@ msgstr "git merge [các-tùy-chọn] <tin-nhắn> HEAD <commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:90 +#: builtin/merge.c:98 msgid "switch `m' requires a value" msgstr "switch “m” yêu cầu một giá trị" -#: builtin/merge.c:127 +#: builtin/merge.c:135 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n" -#: builtin/merge.c:128 +#: builtin/merge.c:136 #, c-format msgid "Available strategies are:" msgstr "Các chiến lược sẵn sàng là:" -#: builtin/merge.c:133 +#: builtin/merge.c:141 #, c-format msgid "Available custom strategies are:" msgstr "Các chiến lược tùy chỉnh sẵn sàng là:" -#: builtin/merge.c:183 +#: builtin/merge.c:198 msgid "do not show a diffstat at the end of the merge" msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn" -#: builtin/merge.c:186 +#: builtin/merge.c:201 msgid "show a diffstat at the end of the merge" msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn" -#: builtin/merge.c:187 +#: builtin/merge.c:202 msgid "(synonym to --stat)" msgstr "(đồng nghĩa với --stat)" -#: builtin/merge.c:189 +#: builtin/merge.c:204 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn" -#: builtin/merge.c:192 +#: builtin/merge.c:207 msgid "create a single commit instead of doing a merge" msgstr "tạo một lần chuyển giao (commit) đưon thay vì thực hiện việc hòa trộn" -#: builtin/merge.c:194 +#: builtin/merge.c:209 msgid "perform a commit if the merge succeeds (default)" msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)" -#: builtin/merge.c:196 +#: builtin/merge.c:211 msgid "edit message before committing" msgstr "sửa chú thích trước khi chuyển giao (commit)" -#: builtin/merge.c:198 +#: builtin/merge.c:212 msgid "allow fast-forward (default)" msgstr "cho phép fast-forward (mặc định)" -#: builtin/merge.c:200 +#: builtin/merge.c:214 msgid "abort if fast-forward is not possible" msgstr "bỏ qua nếu fast-forward không thể được" -#: builtin/merge.c:203 +#: builtin/merge.c:218 msgid "Verify that the named commit has a valid GPG signature" msgstr "Thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không" -#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 +#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114 msgid "strategy" msgstr "chiến lược" -#: builtin/merge.c:205 +#: builtin/merge.c:220 msgid "merge strategy to use" msgstr "chiến lược hòa trộn sẽ dùng" -#: builtin/merge.c:206 +#: builtin/merge.c:221 msgid "option=value" msgstr "tùy_chọn=giá_trị" -#: builtin/merge.c:207 +#: builtin/merge.c:222 msgid "option for selected merge strategy" msgstr "tùy chọn cho chiến lược hòa trộn đã chọn" -#: builtin/merge.c:209 +#: builtin/merge.c:224 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn non-fast-forward)" -#: builtin/merge.c:213 +#: builtin/merge.c:228 msgid "abort the current in-progress merge" msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện" -#: builtin/merge.c:242 +#: builtin/merge.c:257 msgid "could not run stash." msgstr "không thể chạy stash." -#: builtin/merge.c:247 +#: builtin/merge.c:262 msgid "stash failed" msgstr "stash gặp lỗi" -#: builtin/merge.c:252 +#: builtin/merge.c:267 #, c-format msgid "not a valid object: %s" msgstr "không phải là một đối tượng hợp lệ: %s" -#: builtin/merge.c:271 builtin/merge.c:288 +#: builtin/merge.c:286 builtin/merge.c:303 msgid "read-tree failed" msgstr "read-tree gặp lỗi" -#: builtin/merge.c:318 +#: builtin/merge.c:333 msgid " (nothing to squash)" msgstr " (không có gì để squash)" -#: builtin/merge.c:331 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash commit -- không cập nhật HEAD\n" -#: builtin/merge.c:363 +#: builtin/merge.c:378 msgid "Writing SQUASH_MSG" msgstr "Đang ghi SQUASH_MSG" -#: builtin/merge.c:365 +#: builtin/merge.c:380 msgid "Finishing SQUASH_MSG" msgstr "Hoàn thành SQUASH_MSG" -#: builtin/merge.c:388 +#: builtin/merge.c:403 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Không thông điệp hòa trộn -- không cập nhật HEAD\n" -#: builtin/merge.c:438 +#: builtin/merge.c:453 #, c-format msgid "'%s' does not point to a commit" msgstr "“%s” không chỉ đến một lần chuyển giao (commit) nào cả" -#: builtin/merge.c:550 +#: builtin/merge.c:565 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuỗi branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:643 +#: builtin/merge.c:657 msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" -#: builtin/merge.c:671 +#: builtin/merge.c:685 msgid "Not handling anything other than two heads merge." msgstr "Không cầm nắm gì ngoài hai head hòa trộn" -#: builtin/merge.c:685 +#: builtin/merge.c:699 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s" -#: builtin/merge.c:699 +#: builtin/merge.c:713 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:788 +#: builtin/merge.c:802 #, c-format msgid "Could not read from '%s'" msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:797 +#: builtin/merge.c:811 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Vẫn chưa hòa trộn các lần chuyển giao (commit); sử dụng lệnh “git commit” để " "hoàn tất việc hòa trộn.\n" -#: builtin/merge.c:803 +#: builtin/merge.c:817 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6435,55 +6673,50 @@ msgstr "" "rỗng\n" "sẽ hủy bỏ lần chuyển giao (commit).\n" -#: builtin/merge.c:827 +#: builtin/merge.c:841 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:839 +#: builtin/merge.c:853 #, c-format msgid "Wonderful.\n" msgstr "Thần kỳ.\n" -#: builtin/merge.c:904 +#: builtin/merge.c:918 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao " "(commit) kết quả.\n" -#: builtin/merge.c:920 +#: builtin/merge.c:934 #, c-format msgid "'%s' is not a commit" msgstr "%s không phải là một lần commit (chuyển giao)" -#: builtin/merge.c:961 +#: builtin/merge.c:975 msgid "No current branch." msgstr "không phải nhánh hiện hành" -#: builtin/merge.c:963 +#: builtin/merge.c:977 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:965 +#: builtin/merge.c:979 msgid "No default upstream defined for the current branch." msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành." -#: builtin/merge.c:970 +#: builtin/merge.c:984 #, c-format -msgid "No remote tracking branch for %s from %s" +msgid "No remote-tracking branch for %s from %s" msgstr "Không nhánh mạng theo vết cho %s từ %s" -#: builtin/merge.c:1057 builtin/merge.c:1214 -#, c-format -msgid "%s - not something we can merge" -msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn" - -#: builtin/merge.c:1125 +#: builtin/merge.c:1140 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1141 git-pull.sh:31 +#: builtin/merge.c:1156 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6491,11 +6724,11 @@ msgstr "" "Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại).\n" "Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1144 git-pull.sh:34 +#: builtin/merge.c:1159 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại)." -#: builtin/merge.c:1148 +#: builtin/merge.c:1163 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6503,107 +6736,108 @@ msgstr "" "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" "Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1151 +#: builtin/merge.c:1166 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)." -#: builtin/merge.c:1160 +#: builtin/merge.c:1175 msgid "You cannot combine --squash with --no-ff." msgstr "Bạn không thể kết hợp --squash với --no-ff." -#: builtin/merge.c:1165 -msgid "You cannot combine --no-ff with --ff-only." -msgstr "Bạn không thể kết hợp --no-ff với --ff-only." - -#: builtin/merge.c:1172 +#: builtin/merge.c:1184 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Không chỉ ra lần chuyển giao (commit) và merge.defaultToUpstream chưa được " "đặt." -#: builtin/merge.c:1204 +#: builtin/merge.c:1216 msgid "Can merge only exactly one commit into empty head" msgstr "" "Không thể hòa trộn một cách đúng đắn một lần chuyển giao (commit) vào một " "head rỗng" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "Squash commit into empty head not supported yet" msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ" -#: builtin/merge.c:1209 +#: builtin/merge.c:1221 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Chuyển giao (commit) không-fast-forward không hợp lý ở trong một head trống " "rỗng" -#: builtin/merge.c:1265 +#: builtin/merge.c:1226 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn" + +#: builtin/merge.c:1277 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s." -#: builtin/merge.c:1268 +#: builtin/merge.c:1280 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s." #. 'N' -#: builtin/merge.c:1271 +#: builtin/merge.c:1283 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Lần chuyển giao (commit) %s không có chữ ký GPG." -#: builtin/merge.c:1274 +#: builtin/merge.c:1286 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n" -#: builtin/merge.c:1358 +#: builtin/merge.c:1370 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1397 +#: builtin/merge.c:1409 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Đang thử hòa trộn kiểu “trivial in-index”...\n" -#: builtin/merge.c:1404 +#: builtin/merge.c:1416 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1436 +#: builtin/merge.c:1448 msgid "Not possible to fast-forward, aborting." msgstr "Thực hiện lệnh fast-forward là không thể được, đang bỏ qua." -#: builtin/merge.c:1459 builtin/merge.c:1538 +#: builtin/merge.c:1471 builtin/merge.c:1550 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Đang tua lại cây thành thời xa xưa...\n" -#: builtin/merge.c:1463 +#: builtin/merge.c:1475 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s...\n" -#: builtin/merge.c:1529 +#: builtin/merge.c:1541 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1543 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n" -#: builtin/merge.c:1540 +#: builtin/merge.c:1552 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1564 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6772,48 +7006,52 @@ msgstr "Đổi tên %s thành %s\n" msgid "renaming '%s' failed" msgstr "đổi tên %s gặp lỗi" -#: builtin/name-rev.c:175 +#: builtin/name-rev.c:259 msgid "git name-rev [options] <commit>..." msgstr "git name-rev [các-tùy-chọn] <commit>..." -#: builtin/name-rev.c:176 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --all" msgstr "git name-rev [các-tùy-chọn] --all" -#: builtin/name-rev.c:177 +#: builtin/name-rev.c:261 msgid "git name-rev [options] --stdin" msgstr "git name-rev [các-tùy-chọn] --stdin" -#: builtin/name-rev.c:229 +#: builtin/name-rev.c:313 msgid "print only names (no SHA-1)" msgstr "chỉ hiển thị tên (không SHA-1)" -#: builtin/name-rev.c:230 +#: builtin/name-rev.c:314 msgid "only use tags to name the commits" msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao" -#: builtin/name-rev.c:232 +#: builtin/name-rev.c:316 msgid "only use refs matching <pattern>" msgstr "chỉ sử dụng các tham chiếu (refs) khớp với <mẫu>" -#: builtin/name-rev.c:234 +#: builtin/name-rev.c:318 msgid "list all commits reachable from all refs" msgstr "" "liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu" -#: builtin/name-rev.c:235 +#: builtin/name-rev.c:319 msgid "read from stdin" msgstr "đọc từ đầu vào tiêu chuẩn" -#: builtin/name-rev.c:236 +#: builtin/name-rev.c:320 msgid "allow to print `undefined` names" msgstr "cho phép hiển thị các tên “chưa định nghĩa“" -#: builtin/notes.c:26 +#: builtin/name-rev.c:326 +msgid "dereference tags in the input (internal use)" +msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)" + +#: builtin/notes.c:24 msgid "git notes [--ref <notes_ref>] [list [<object>]]" msgstr "git notes [--ref <notes_ref>] [list [<đối-tượng>]]" -#: builtin/notes.c:27 +#: builtin/notes.c:25 msgid "" "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" @@ -6821,11 +7059,11 @@ msgstr "" "git notes [--ref <notes_ref>] add [-f] [-m <lời-nhắn> | -F <tập-tin> | (-c | " "-C) <đối-tượng>] [<đối-tượng>]" -#: builtin/notes.c:28 +#: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <notes_ref>] copy [-f] <từ-đối-tượng> <đến-đối-tượng>" -#: builtin/notes.c:29 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" @@ -6833,223 +7071,200 @@ msgstr "" "git notes [--ref <notes_ref>] append [-m <lời-nhắn> | -F <tập-tin> | (-c | -" "C) <đối-tượng>] [<đối-tượng>]" -#: builtin/notes.c:30 +#: builtin/notes.c:28 msgid "git notes [--ref <notes_ref>] edit [<object>]" msgstr "git notes [--ref <notes_ref>] edit [<đối-tượng>]" -#: builtin/notes.c:31 +#: builtin/notes.c:29 msgid "git notes [--ref <notes_ref>] show [<object>]" msgstr "git notes [--ref <notes_ref>] show [<đối-tượng>]" -#: builtin/notes.c:32 +#: builtin/notes.c:30 msgid "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" msgstr "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <chiến-lược> ] <notes_ref>" -#: builtin/notes.c:33 +#: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:32 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:35 +#: builtin/notes.c:33 msgid "git notes [--ref <notes_ref>] remove [<object>...]" msgstr "git notes [--ref <notes_ref>] remove [<đối-tượng>...]" -#: builtin/notes.c:36 +#: builtin/notes.c:34 msgid "git notes [--ref <notes_ref>] prune [-n | -v]" msgstr "git notes [--ref <notes_ref>] prune [-n | -v]" -#: builtin/notes.c:37 +#: builtin/notes.c:35 msgid "git notes [--ref <notes_ref>] get-ref" msgstr "git notes [--ref <notes_ref>] get-ref" -#: builtin/notes.c:42 +#: builtin/notes.c:40 msgid "git notes [list [<object>]]" msgstr "git notes [list [<đối tượng>]]" -#: builtin/notes.c:47 +#: builtin/notes.c:45 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<các-tùy-chọn>] [<đối-tượng>]" -#: builtin/notes.c:52 +#: builtin/notes.c:50 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<các-tùy-chọn>] <từ-đối-tượng> <đến-đối-tượng>" -#: builtin/notes.c:53 +#: builtin/notes.c:51 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<từ-đối-tượng> <đến-đối-tượng>]..." -#: builtin/notes.c:58 +#: builtin/notes.c:56 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<các-tùy-chọn>] [<đối-tượng>]" -#: builtin/notes.c:63 +#: builtin/notes.c:61 msgid "git notes edit [<object>]" msgstr "git notes edit [<đối tượng>]" -#: builtin/notes.c:68 +#: builtin/notes.c:66 msgid "git notes show [<object>]" msgstr "git notes show [<đối tượng>]" -#: builtin/notes.c:73 +#: builtin/notes.c:71 msgid "git notes merge [<options>] <notes_ref>" msgstr "git notes merge [<các-tùy-chọn>] <notes_ref>" -#: builtin/notes.c:74 +#: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<các-tùy-chọn>]" -#: builtin/notes.c:75 +#: builtin/notes.c:73 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<các-tùy-chọn>]" -#: builtin/notes.c:80 +#: builtin/notes.c:78 msgid "git notes remove [<object>]" msgstr "git notes remove [<đối tượng>]" -#: builtin/notes.c:85 +#: builtin/notes.c:83 msgid "git notes prune [<options>]" msgstr "git notes prune [<các-tùy-chọn>]" -#: builtin/notes.c:90 +#: builtin/notes.c:88 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:139 +#: builtin/notes.c:137 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "không thể khởi chạy “show” cho đối tượng “%s”" -#: builtin/notes.c:143 +#: builtin/notes.c:141 msgid "could not read 'show' output" msgstr "không thể đọc kết xuất “show”" -#: builtin/notes.c:151 +#: builtin/notes.c:149 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "gặp lỗi khi hoàn thành “show” cho đối tượng “%s”" -#: builtin/notes.c:169 builtin/tag.c:341 +#: builtin/notes.c:167 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "không thể tạo tập tin “%s”" -#: builtin/notes.c:188 +#: builtin/notes.c:186 msgid "Please supply the note contents using either -m or -F option" msgstr "" "Xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy chọn -m hoặc là -F" -#: builtin/notes.c:209 builtin/notes.c:972 +#: builtin/notes.c:207 builtin/notes.c:844 #, c-format msgid "Removing note for object %s\n" msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n" -#: builtin/notes.c:214 +#: builtin/notes.c:212 msgid "unable to write note object" msgstr "không thể ghi đối tượng ghi chú (note)" -#: builtin/notes.c:216 +#: builtin/notes.c:214 #, c-format msgid "The note contents has been left in %s" msgstr "Nội dung ghi chú còn lại %s" -#: builtin/notes.c:250 builtin/tag.c:540 +#: builtin/notes.c:248 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "không thể đọc “%s”" -#: builtin/notes.c:252 builtin/tag.c:543 +#: builtin/notes.c:250 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "không thể mở hay đọc “%s”" -#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 -#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 -#: builtin/notes.c:967 builtin/tag.c:556 +#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 +#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 +#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 +#: builtin/notes.c:839 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu (ref) hợp lệ." -#: builtin/notes.c:274 +#: builtin/notes.c:272 #, c-format msgid "Failed to read object '%s'." msgstr "Gặp lỗi khi đọc đối tượng “%s”." -#: builtin/notes.c:298 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "" -"Không thể chuyển giao (commit) chưa được khởi tạo hoặc không được tham chiếu " -"cây ghi chú" - -#: builtin/notes.c:339 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "Giá trị notes.rewriteMode sai: “%s”" - -#: builtin/notes.c:349 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài của refs/notes/)" - -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: builtin/notes.c:376 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "Giá trị %s sai: “%s”" - -#: builtin/notes.c:440 +#: builtin/notes.c:312 #, c-format msgid "Malformed input line: '%s'." msgstr "Dòng nhập vào dị hình: “%s”." -#: builtin/notes.c:455 +#: builtin/notes.c:327 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”" -#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 -#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 -#: builtin/notes.c:1032 +#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 +#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 +#: builtin/notes.c:904 msgid "too many parameters" msgstr "quá nhiều đối số" -#: builtin/notes.c:512 builtin/notes.c:771 +#: builtin/notes.c:384 builtin/notes.c:643 #, c-format msgid "No note found for object %s." msgstr "không tìm thấy ghi chú cho đối tượng %s." -#: builtin/notes.c:534 builtin/notes.c:691 +#: builtin/notes.c:406 builtin/notes.c:563 msgid "note contents as a string" msgstr "nội dung ghi chú (note) nằm trong một chuỗi" -#: builtin/notes.c:537 builtin/notes.c:694 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents in a file" msgstr "nội dung ghi chú (note) nằm trong một tập tin" -#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 -#: builtin/notes.c:699 builtin/tag.c:474 +#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 +#: builtin/notes.c:571 builtin/tag.c:474 msgid "object" msgstr "đối tượng" -#: builtin/notes.c:540 builtin/notes.c:697 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "reuse and edit specified note object" msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra" -#: builtin/notes.c:543 builtin/notes.c:700 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse specified note object" msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra" -#: builtin/notes.c:545 builtin/notes.c:613 +#: builtin/notes.c:417 builtin/notes.c:485 msgid "replace existing notes" msgstr "thay thế ghi chú trước" -#: builtin/notes.c:579 +#: builtin/notes.c:451 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7058,24 +7273,24 @@ msgstr "" "Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng " "%s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:584 builtin/notes.c:661 +#: builtin/notes.c:456 builtin/notes.c:533 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n" -#: builtin/notes.c:614 +#: builtin/notes.c:486 msgid "read objects from stdin" msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn" -#: builtin/notes.c:616 +#: builtin/notes.c:488 msgid "load rewriting config for <command> (implies --stdin)" msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)" -#: builtin/notes.c:634 +#: builtin/notes.c:506 msgid "too few parameters" msgstr "quá ít đối số" -#: builtin/notes.c:655 +#: builtin/notes.c:527 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7084,12 +7299,12 @@ msgstr "" "Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối " "tượng %s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:667 +#: builtin/notes.c:539 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Thiếu ghi chú trên đối tượng nguốn %s. Không thể sao chép." -#: builtin/notes.c:716 +#: builtin/notes.c:588 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7098,15 +7313,15 @@ msgstr "" "Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n" "Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n" -#: builtin/notes.c:863 +#: builtin/notes.c:735 msgid "General options" msgstr "Tùy chọn chung" -#: builtin/notes.c:865 +#: builtin/notes.c:737 msgid "Merge options" msgstr "Tùy chọn về hòa trộn" -#: builtin/notes.c:867 +#: builtin/notes.c:739 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -7114,46 +7329,46 @@ msgstr "" "phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:869 +#: builtin/notes.c:741 msgid "Committing unmerged notes" msgstr "Chuyển giao các note chưa được hòa trộn" -#: builtin/notes.c:871 +#: builtin/notes.c:743 msgid "finalize notes merge by committing unmerged notes" msgstr "" "các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển " "giao" -#: builtin/notes.c:873 +#: builtin/notes.c:745 msgid "Aborting notes merge resolution" msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn" -#: builtin/notes.c:875 +#: builtin/notes.c:747 msgid "abort notes merge" msgstr "bỏ qua hòa trộn các ghi chú (note)" -#: builtin/notes.c:970 +#: builtin/notes.c:842 #, c-format msgid "Object %s has no note\n" msgstr "Đối tượng %s không có ghi chú (note)\n" -#: builtin/notes.c:982 +#: builtin/notes.c:854 msgid "attempt to remove non-existent note is not an error" msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi" -#: builtin/notes.c:985 +#: builtin/notes.c:857 msgid "read object names from the standard input" msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" -#: builtin/notes.c:1066 +#: builtin/notes.c:938 msgid "notes_ref" msgstr "notes_ref" -#: builtin/notes.c:1067 +#: builtin/notes.c:939 msgid "use notes from <notes_ref>" msgstr "dùng “notes” từ <notes_ref>" -#: builtin/notes.c:1102 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" @@ -7394,7 +7609,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:121 +#: builtin/push.c:117 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7409,7 +7624,7 @@ msgstr "" "\n" " git push %s HEAD:<tên-của-nhánh-máy-chủ>\n" -#: builtin/push.c:128 +#: builtin/push.c:131 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7423,12 +7638,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:136 +#: builtin/push.c:139 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Nhánh hiện tại %s có đa nhánh thượng nguồn (upstream), từ chối push." -#: builtin/push.c:139 +#: builtin/push.c:142 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7440,7 +7655,7 @@ msgstr "" "nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n" "để cập nhật nhánh máy chủ nào." -#: builtin/push.c:151 +#: builtin/push.c:165 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7473,28 +7688,28 @@ msgstr "" "tự\n" "“current” thay vì “simple” nếu bạn thỉnh thoảng phải sử dụng bản Git cũ)" -#: builtin/push.c:199 +#: builtin/push.c:225 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Bạn đã không chỉ ra một refspecs nào để push, và push.default là \"không là " "gì cả\"." -#: builtin/push.c:206 +#: builtin/push.c:232 msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" -"before pushing again.\n" +"its remote counterpart. Integrate the remote changes (e.g.\n" +"'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" "phận tương ứng của máy chủ. Hòa trộn với các thay đổi từ máy chủ (v.d. “git " -"pull”)\n" +"pull...”)\n" "trước khi lại push lần nữa.\n" -"Xem trong phần “Note about fast-forwards” từ lệnh “git push --help” để có " -"thông tin chi tiết." +"Xem “Note about fast-forwards” từ lệnh “git push --help” để có thông tin chi " +"tiết." -#: builtin/push.c:212 +#: builtin/push.c:238 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7509,41 +7724,40 @@ msgstr "" "thành “simple”, “current” hoặc “upstream” để chỉ push nhánh hiện hành mà " "thôi." -#: builtin/push.c:218 +#: builtin/push.c:244 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. Check out this branch and merge the remote changes\n" -"(e.g. 'git pull') before pushing again.\n" +"counterpart. Check out this branch and integrate the remote changes\n" +"(e.g. 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" "phận tương ứng của máy chủ. Checkou nhánh này và hòa trộn với các thay đổi " "từ máy chủ\n" -"(v.d. “git pull”) trước khi lại push lần nữa.\n" -"Xem trong phần “Note about fast-forwards” từ lệnh “git push --help” để có " -"thông tin chi tiết." +"(v.d. “git pull ...”) trước khi lại push lần nữa.\n" +"Xem “Note about fast-forwards” từ lệnh “git push --help” để có thông tin chi " +"tiết." -#: builtin/push.c:224 +#: builtin/push.c:250 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" -"to the same ref. You may want to first merge the remote changes (e.g.,\n" -"'git pull') before pushing again.\n" +"to the same ref. You may want to first integrate the remote changes\n" +"(e.g., 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Việc cập nhật bị từ chối bởi vì máy chủ có chứa công việc mà bạn không\n" -"có ở máy nội bộ của mình. Lỗi này thường có nguyên nhân bởi kho khác đẩy dữ " -"liệu lên\n" -"cùng một tham chiếu. Bạn có lẽ muốn hòa trộn với các thay đổi từ máy chủ\n" -"(v.d. “git pull”) trước khi lại push lần nữa.\n" -"Xem trong phần “Note about fast-forwards” từ lệnh “git push --help” để có " -"thông tin chi tiết." - -#: builtin/push.c:231 +"có ở máy nội bộ của mình. Lỗi này thường có nguyên nhân bởi kho khác đẩy\n" +"dữ liệu lên cùng một tham chiếu. Bạn có lẽ muốn hòa trộn với các thay đổi\n" +"từ máy chủ(v.d. “git pull...”) trước khi lại push lần nữa.\n" +"Xem “Note about fast-forwards” từ lệnh “git push --help” để có thông tin chi " +"tiết." + +#: builtin/push.c:257 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ." -#: builtin/push.c:234 +#: builtin/push.c:260 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -7555,22 +7769,22 @@ msgstr "" "tượng\n" "không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n" -#: builtin/push.c:294 +#: builtin/push.c:320 #, c-format msgid "Pushing to %s\n" msgstr "Đang push (đẩy) lên %s\n" -#: builtin/push.c:298 +#: builtin/push.c:324 #, c-format msgid "failed to push some refs to '%s'" msgstr "gặp lỗi khi push (đẩy lên) một số tham chiếu (ref) đến “%s”" -#: builtin/push.c:331 +#: builtin/push.c:357 #, c-format msgid "bad repository '%s'" msgstr "repository (kho) sai “%s”" -#: builtin/push.c:332 +#: builtin/push.c:358 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7591,88 +7805,88 @@ msgstr "" "\n" " git push <tên>\n" -#: builtin/push.c:347 +#: builtin/push.c:373 msgid "--all and --tags are incompatible" msgstr "--all và --tags xung khắc nhau" -#: builtin/push.c:348 +#: builtin/push.c:374 msgid "--all can't be combined with refspecs" msgstr "--all không thể được tổ hợp cùng với refspecs" -#: builtin/push.c:353 +#: builtin/push.c:379 msgid "--mirror and --tags are incompatible" msgstr "--mirror và --tags xung khắc nhau" -#: builtin/push.c:354 +#: builtin/push.c:380 msgid "--mirror can't be combined with refspecs" msgstr "--mirror không thể được tổ hợp cùng với refspecs" -#: builtin/push.c:359 +#: builtin/push.c:385 msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:419 +#: builtin/push.c:445 msgid "repository" msgstr "kho" -#: builtin/push.c:420 +#: builtin/push.c:446 msgid "push all refs" msgstr "push tất cả refs" -#: builtin/push.c:421 +#: builtin/push.c:447 msgid "mirror all refs" msgstr "mirror tất cả refs" -#: builtin/push.c:423 +#: builtin/push.c:449 msgid "delete refs" msgstr "xóa refs" -#: builtin/push.c:424 +#: builtin/push.c:450 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "các thẻ push (không thể sử dụng cùng với các tùy chọn --all hay --mirror)" -#: builtin/push.c:427 +#: builtin/push.c:453 msgid "force updates" msgstr "ép buộc cập nhật" -#: builtin/push.c:428 +#: builtin/push.c:454 msgid "check" msgstr "kiểm tra" -#: builtin/push.c:429 +#: builtin/push.c:455 msgid "control recursive pushing of submodules" msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con" -#: builtin/push.c:431 +#: builtin/push.c:457 msgid "use thin pack" msgstr "tạo gói nhẹ" -#: builtin/push.c:432 builtin/push.c:433 +#: builtin/push.c:458 builtin/push.c:459 msgid "receive pack program" msgstr "nhận về chương trình pack" -#: builtin/push.c:434 +#: builtin/push.c:460 msgid "set upstream for git pull/status" msgstr "đặt thượng nguồn (upstream) cho git pull/status" -#: builtin/push.c:437 +#: builtin/push.c:463 msgid "prune locally removed refs" msgstr "prune (cắt cụt) những tham chiếu (refs) bị gỡ bỏ" -#: builtin/push.c:439 +#: builtin/push.c:465 msgid "bypass pre-push hook" msgstr "vòng qua “pre-push hook”" -#: builtin/push.c:440 +#: builtin/push.c:466 msgid "push missing but relevant tags" msgstr "push bị trượt nhưng các thẻ thích hợp" -#: builtin/push.c:450 +#: builtin/push.c:476 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags" -#: builtin/push.c:452 +#: builtin/push.c:478 msgid "--delete doesn't make sense without any refs" msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu (refs) nào" @@ -7687,71 +7901,81 @@ msgstr "" "[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-" "ish3>]])" -#: builtin/read-tree.c:108 +#: builtin/read-tree.c:109 msgid "write resulting index to <file>" msgstr "ghi mục lục kết quả vào <tập-tin>" -#: builtin/read-tree.c:111 +#: builtin/read-tree.c:112 msgid "only empty the index" msgstr "chỉ với bảng mục lục trống rỗng" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:114 msgid "Merging" msgstr "Hòa trộn" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:116 msgid "perform a merge in addition to a read" msgstr "thực hiện một hòa trộn thêm vào việc đọc" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:118 msgid "3-way merge if no file level merging required" msgstr "" "hòa trộn kiểu “3-way” nếu không có tập tin mức hòa trộn nào được yêu cầu " -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:120 msgid "3-way merge in presence of adds and removes" msgstr "hòa trộn 3-way trong sự hiện diện của “adds” và “removes”" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:122 msgid "same as -m, but discard unmerged entries" msgstr "giống với -m, nhưng bỏ qua các mục chưa được hòa trộn" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "<subdirectory>/" msgstr "<thư-mục-con>/" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "read the tree into the index under <subdirectory>/" msgstr "đọc cây vào trong bảng mục lục dưới <thư_mục_con>/" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:127 msgid "update working tree with merge result" msgstr "cập nhật cây làm việc với kết quả hòa trộn" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:129 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "allow explicitly ignored files to be overwritten" msgstr "cho phép các tập tin rõ ràng bị lờ đi được ghi đè" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:133 msgid "don't check the working tree after merging" msgstr "không kiểm tra cây làm việc sau hòa trộn" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't update the index or the work tree" msgstr "không cập nhật bảng mục lục hay cây làm việc" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:136 msgid "skip applying sparse checkout filter" msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:138 msgid "debug unpack-trees" msgstr "gỡ lỗi unpack-trees" +#: builtin/reflog.c:500 +#, c-format +msgid "%s' for '%s' is not a valid timestamp" +msgstr "%s' cho '%s' không phải là dấu thời gian hợp lệ" + +#: builtin/reflog.c:616 builtin/reflog.c:621 +#, c-format +msgid "'%s' is not a valid timestamp" +msgstr "“%s” không phải là dấu thời gian hợp lệ" + #: builtin/remote.c:11 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" @@ -8327,97 +8551,97 @@ msgstr "Gặp lỗi khi tìm cây của HEAD." msgid "Failed to find tree of %s." msgstr "Gặp lỗi khi tìm cây của %s." -#: builtin/reset.c:98 +#: builtin/reset.c:99 #, c-format msgid "HEAD is now at %s" msgstr "HEAD hiện giờ tại %s" -#: builtin/reset.c:169 +#: builtin/reset.c:172 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn." -#: builtin/reset.c:248 +#: builtin/reset.c:251 msgid "be quiet, only report errors" msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi" -#: builtin/reset.c:250 +#: builtin/reset.c:253 msgid "reset HEAD and index" msgstr "đặt lại (reset) HEAD và bảng mục lục" -#: builtin/reset.c:251 +#: builtin/reset.c:254 msgid "reset only HEAD" msgstr "chỉ đặt lại (reset) HEAD" -#: builtin/reset.c:253 builtin/reset.c:255 +#: builtin/reset.c:256 builtin/reset.c:258 msgid "reset HEAD, index and working tree" msgstr "đặt lại HEAD, bảng mục lục và cây làm việc" -#: builtin/reset.c:257 +#: builtin/reset.c:260 msgid "reset HEAD but keep local changes" msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ" -#: builtin/reset.c:275 +#: builtin/reset.c:278 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ." -#: builtin/reset.c:278 builtin/reset.c:286 +#: builtin/reset.c:281 builtin/reset.c:289 #, c-format msgid "Could not parse object '%s'." msgstr "không thể phân tích đối tượng “%s”." -#: builtin/reset.c:283 +#: builtin/reset.c:286 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ." -#: builtin/reset.c:292 +#: builtin/reset.c:295 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch xung khắc với --{hard,mixed,soft}" -#: builtin/reset.c:301 +#: builtin/reset.c:304 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git " "reset -- <đường_dẫn>”." -#: builtin/reset.c:303 +#: builtin/reset.c:306 #, c-format msgid "Cannot do %s reset with paths." msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn." -#: builtin/reset.c:313 +#: builtin/reset.c:316 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset không được phép trên kho bare (trên máy chủ)" -#: builtin/reset.c:333 +#: builtin/reset.c:336 #, c-format msgid "Could not reset index file to revision '%s'." -msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét lại “%s”." +msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét duyệt “%s”." -#: builtin/reset.c:339 +#: builtin/reset.c:342 msgid "Unstaged changes after reset:" msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:" -#: builtin/reset.c:344 +#: builtin/reset.c:347 msgid "Could not write new index file." msgstr "Không thể ghi tập tin lưu bảng mục lục mới." -#: builtin/rev-parse.c:339 +#: builtin/rev-parse.c:345 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [các-tùy-chọn] -- [<th.số>...]" -#: builtin/rev-parse.c:344 +#: builtin/rev-parse.c:350 msgid "keep the `--` passed as an arg" msgstr "giữ “--“ chuyển qua làm tham số" -#: builtin/rev-parse.c:346 +#: builtin/rev-parse.c:352 msgid "stop parsing after the first non-option argument" msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn" -#: builtin/rev-parse.c:464 +#: builtin/rev-parse.c:470 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8447,176 +8671,204 @@ msgstr "git cherry-pick [các-tùy-chọn] <commit-ish>..." msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <lệnh-con>" -#: builtin/revert.c:70 builtin/revert.c:92 +#: builtin/revert.c:71 builtin/revert.c:94 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s không thể được sử dụng với %s" -#: builtin/revert.c:103 +#: builtin/revert.c:105 msgid "end revert or cherry-pick sequence" msgstr "kết thúc cherry-pick hay revert liên tiếp nhau" -#: builtin/revert.c:104 +#: builtin/revert.c:106 msgid "resume revert or cherry-pick sequence" msgstr "phục hồi lại cherry-pick hay revert liên tiếp nhau" -#: builtin/revert.c:105 +#: builtin/revert.c:107 msgid "cancel revert or cherry-pick sequence" msgstr "không cherry-pick hay revert liên tiếp nhau" -#: builtin/revert.c:106 +#: builtin/revert.c:108 msgid "don't automatically commit" msgstr "không commit một cách tự động." -#: builtin/revert.c:107 +#: builtin/revert.c:109 msgid "edit the commit message" msgstr "sửa lại chú thích cho commit" -#: builtin/revert.c:110 +#: builtin/revert.c:112 msgid "parent number" msgstr "số của cha mẹ" -#: builtin/revert.c:112 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "chiến lược hòa trộn" -#: builtin/revert.c:113 +#: builtin/revert.c:115 msgid "option" msgstr "tùy chọn" -#: builtin/revert.c:114 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "tùy chọn cho chiến lược hòa trộn" -#: builtin/revert.c:125 +#: builtin/revert.c:127 msgid "append commit name" msgstr "nối thêm tên lần chuyển giao (commit)" -#: builtin/revert.c:126 +#: builtin/revert.c:128 msgid "allow fast-forward" msgstr "cho phép fast-forward" -#: builtin/revert.c:127 +#: builtin/revert.c:129 msgid "preserve initially empty commits" msgstr "cấm khởi tạo lần chuyển giao trống rỗng" -#: builtin/revert.c:128 +#: builtin/revert.c:130 msgid "allow commits with empty messages" msgstr "chấp nhận chuyển giao (commit) mà không ghi chú gì" -#: builtin/revert.c:129 +#: builtin/revert.c:131 msgid "keep redundant, empty commits" msgstr "giữ lại các lần chuyển giao dư thừa, rỗng" -#: builtin/revert.c:133 +#: builtin/revert.c:135 msgid "program error" msgstr "lỗi chương trình" -#: builtin/revert.c:223 +#: builtin/revert.c:225 msgid "revert failed" msgstr "revert gặp lỗi" -#: builtin/revert.c:238 +#: builtin/revert.c:240 msgid "cherry-pick failed" msgstr "cherry-pick gặp lỗi" -#: builtin/rm.c:15 +#: builtin/rm.c:16 msgid "git rm [options] [--] <file>..." msgstr "git rm [các-tùy-chọn] [--] <tập-tin>..." -#: builtin/rm.c:64 builtin/rm.c:186 -#, c-format +#: builtin/rm.c:64 +msgid "" +"the following submodule (or one of its nested submodules)\n" +"uses a .git directory:" +msgid_plural "" +"the following submodules (or one of its nested submodules)\n" +"use a .git directory:" +msgstr[0] "" +"mô-đun-con sau đây (hay một trong số mô-đun-con bên trong của nó)\n" +"dùng một thư mục .git:" +msgstr[1] "" +"các mô-đun-con sau đây (hay một trong số mô-đun-con bên trong của nó)\n" +"dùng một thư mục .git:" + +#: builtin/rm.c:70 msgid "" -"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -"mô-đun-con “%s” (hoặc cái nằm trong các mô-đun-con) dùng thư mục .git\n" -"(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " +"\n" +"(dùng /\"rm -rf/\" nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " "chúng)" -#: builtin/rm.c:174 -#, c-format +#: builtin/rm.c:230 msgid "" -"'%s' has staged content different from both the file and the HEAD\n" -"(use -f to force removal)" -msgstr "" -"“%s” có nội dung được lưu trạng thái khác biệt từ cả tập tin và cả HEAD\n" -"(dùng tùy chọn -f để ép buộc gỡ bỏ)" +"the following file has staged content different from both the\n" +"file and the HEAD:" +msgid_plural "" +"the following files have staged content different from both the\n" +"file and the HEAD:" +msgstr[0] "" +"tập tin sau đây có trạng thái khác biệt nội dung từ cả tập tin\n" +"và cả HEAD:" +msgstr[1] "" +"các tập tin sau đây có trạng thái khác biệt nội dung từ cả tập tin\n" +"và cả HEAD:" -#: builtin/rm.c:180 -#, c-format +#: builtin/rm.c:235 msgid "" -"'%s' has changes staged in the index\n" -"(use --cached to keep the file, or -f to force removal)" +"\n" +"(use -f to force removal)" msgstr "" -"“%s” có các thay đổi được lưu trạng thái trong bảng mục lục\n" -"(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" +"\n" +"(dùng -f để buộc gỡ bỏ)" -#: builtin/rm.c:191 -#, c-format +#: builtin/rm.c:239 +msgid "the following file has changes staged in the index:" +msgid_plural "the following files have changes staged in the index:" +msgstr[0] "tập tin sau đây có thay đổi trạng thái trong bảng mục lục:" +msgstr[1] "các tập tin sau đây có thay đổi trạng thái trong bảng mục lục:" + +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" -"'%s' has local modifications\n" +"\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -"“%s” có các thay đổi nội bộ\n" +"\n" "(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" -#: builtin/rm.c:207 +#: builtin/rm.c:251 +msgid "the following file has local modifications:" +msgid_plural "the following files have local modifications:" +msgstr[0] "tập tin sau đây có những thay đổi nội bộ:" +msgstr[1] "những tập tin sau đây có những thay đổi nội bộ:" + +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "không liệt kê các tập tin đã gỡ bỏ" -#: builtin/rm.c:208 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "chỉ gỡ bỏ từ mục lục" -#: builtin/rm.c:209 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "ghi đè lên kiểm tra cập nhật" -#: builtin/rm.c:210 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "cho phép gỡ bỏ đệ qui" -#: builtin/rm.c:212 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp" -#: builtin/rm.c:283 +#: builtin/rm.c:345 #, c-format msgid "not removing '%s' recursively without -r" msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r" -#: builtin/rm.c:322 +#: builtin/rm.c:384 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: không thể gỡ bỏ %s" #: builtin/shortlog.c:13 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" -msgstr "git shortlog [các-tùy-chọn] [<vùng-xem-xét>] [[--] [<đường-dẫn>...]]" +msgstr "git shortlog [các-tùy-chọn] [<vùng-xét-duyệt>] [[--] [<đường-dẫn>...]]" #: builtin/shortlog.c:131 #, c-format msgid "Missing author: %s" msgstr "Thiếu tên tác giả: %s" -#: builtin/shortlog.c:227 +#: builtin/shortlog.c:228 msgid "sort output according to the number of commits per author" msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả" -#: builtin/shortlog.c:229 +#: builtin/shortlog.c:230 msgid "Suppress commit descriptions, only provides commit count" msgstr "Chặn mọi mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao" -#: builtin/shortlog.c:231 +#: builtin/shortlog.c:232 msgid "Show the email address of each author" msgstr "Hiển thị thư điện tử cho từng tác giả" -#: builtin/shortlog.c:232 +#: builtin/shortlog.c:233 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:233 +#: builtin/shortlog.c:234 msgid "Linewrap output" msgstr "Ngắt dòng khi quá dài" @@ -8680,23 +8932,23 @@ msgstr "hiển thị các tham chiếu không thể được đọc bởi bất msgid "show commits in topological order" msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:672 msgid "show only commits not on the first branch" msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên" -#: builtin/show-branch.c:673 +#: builtin/show-branch.c:674 msgid "show merges reachable from only one tip" msgstr "hiển thị các lần hòa trộn có thể đọc được chỉ từ một đầu mút" -#: builtin/show-branch.c:675 -msgid "show commits where no parent comes before its children" -msgstr "hiển thị các lần chuyển giao nơi mà cha mẹ đến trước con của nó" +#: builtin/show-branch.c:676 +msgid "topologically sort, maintaining date order where possible" +msgstr "sắp xếp hình thái học, bảo trì thứ tự ngày nếu có thể" -#: builtin/show-branch.c:677 +#: builtin/show-branch.c:679 msgid "<n>[,<base>]" msgstr "<n>[,<cơ sở>]" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:680 msgid "show <n> most recent ref-log entries starting at base" msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (base)" @@ -8712,38 +8964,38 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=mẫu] < ref-list" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:168 msgid "only show tags (can be combined with heads)" msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng với đầu)" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:169 msgid "only show heads (can be combined with tags)" msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:170 msgid "stricter reference checking, requires exact ref path" msgstr "" "việc kiểm tra tham chiếu chính xác, đòi hỏi chính xác đường dẫn tham chiếu " "(ref)" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 -msgid "show the HEAD reference" -msgstr "hiển thị tham chiếu của HEAD" +#: builtin/show-ref.c:173 builtin/show-ref.c:176 +msgid "show the HEAD reference, even if it would be filtered out" +msgstr "hiển thị tham chiếu HEAD, ngay cả khi nó đã được lọc ra" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:178 msgid "dereference tags into object IDs" msgstr "bãi bỏ tham chiếu các thẻ thành ra các ID đối tượng" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:180 msgid "only show SHA1 hash using <n> digits" msgstr "chỉ hiển thị mã băm SHA1 sử dụng <n> chữ số" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:184 msgid "do not print results to stdout (useful with --verify)" msgstr "" "không hiển thị kết quả ra đầu ra chuẩn (stdout) (chỉ hữu dụng với --verify)" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:186 msgid "show refs from stdin that aren't in local repository" msgstr "" "hiển thị các tham chiếu (refs) từ đầu vào tiêu chuẩn (stdin) cái mà không ở " @@ -9164,30 +9416,33 @@ msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con" msgid "only useful for debugging" msgstr "chỉ hữu ích khi cần gỡ lỗi" -#: git.c:16 +#: git.c:17 msgid "" "'git help -a' and 'git help -g' lists available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" "“git help -a” và “git help -g” liệt kê các câu lệnh con sẵn có và một số\n" -"hướng dẫn khái niệm cơ bản. Xem “git help <lệnh>” hay “git help <khái " -"niệm>”\n" -"để đọc các đặc tả cho lệnh hay khái niệm đó." +"hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n" +"để xem các đặc tả cho lệnh hay khái niệm cụ thể." + +#: parse-options.h:144 +msgid "expiry date" +msgstr "ngày hết hạn" -#: parse-options.h:156 +#: parse-options.h:159 msgid "no-op (backward compatibility)" msgstr "no-op (tương thích ngược)" -#: parse-options.h:232 +#: parse-options.h:236 msgid "be more verbose" msgstr "chi tiết hơn nữa" -#: parse-options.h:234 +#: parse-options.h:238 msgid "be more quiet" msgstr "im lặng hơn nữa" -#: parse-options.h:240 +#: parse-options.h:244 msgid "use <n> digits to display SHA-1s" msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" @@ -9205,7 +9460,7 @@ msgstr "Liệt kê, tạo hay là xóa các nhánh" #: common-cmds.h:11 msgid "Checkout a branch or paths to the working tree" -msgstr "Lấy ra (checkout) một nhánh hay các đường dẫn tới cây làm việc" +msgstr "Lấy ra một nhánh hay các đường dẫn tới cây làm việc" #: common-cmds.h:12 msgid "Clone a repository into a new directory" @@ -9218,12 +9473,12 @@ msgstr "Ghi các thay đổi vào kho chứa" #: common-cmds.h:14 msgid "Show changes between commits, commit and working tree, etc" msgstr "" -"Hiển thị các thay đổi giữa những lần chuyển giao (commit), commit và cây làm " -"việc, v.v.." +"Xem các thay đổi giữa những lần chuyển giao,\n" +" giữa một lần chuyển giao và cây làm việc, v.v.." #: common-cmds.h:15 msgid "Download objects and refs from another repository" -msgstr "Các đối tượng và tham chiếu được tải về từ kho chứa khác" +msgstr "Tải về các đối tượng và tham chiếu từ kho chứa khác" #: common-cmds.h:16 msgid "Print lines matching a pattern" @@ -9231,40 +9486,37 @@ msgstr "In ra những dòng khớp với một mẫu" #: common-cmds.h:17 msgid "Create an empty Git repository or reinitialize an existing one" -msgstr "" -"Tạo một kho git trống rỗng hay khởi tạo lại một kho đã tồn tại từ trước" +msgstr "Tạo một kho git mới hay khởi tạo lại một kho đã tồn tại từ trước" #: common-cmds.h:18 msgid "Show commit logs" -msgstr "Hiển thị nhật ký các lần chuyển giao (commit)" +msgstr "Hiển thị nhật ký các lần chuyển giao" #: common-cmds.h:19 msgid "Join two or more development histories together" -msgstr "" -"Hợp nhất hai hay nhiều hơn lịch sử của các nhà phát triển phần mềm lại với " -"nhau" +msgstr "Hợp nhất hai hay nhiều hơn lịch sử của các nhà phát triển" #: common-cmds.h:20 msgid "Move or rename a file, a directory, or a symlink" -msgstr "Di chuyển, đổi tên một tập tin, thư mục hay liên kết tượng trưng" +msgstr "Di chuyển hay đổi tên một tập tin, thư mục hoặc liên kết mềm" #: common-cmds.h:21 -msgid "Fetch from and merge with another repository or a local branch" -msgstr "Lấy về (fetch) và hòa trộn với kho khác hay nhánh nội bộ" +msgid "Fetch from and integrate with another repository or a local branch" +msgstr "Lấy về và hợp nhất với kho khác hay một nhánh nội bộ" #: common-cmds.h:22 msgid "Update remote refs along with associated objects" -msgstr "" -"Cập nhật tham chiếu (refs) máy chủ cùng với các đối tượng liên quan đến nó" +msgstr "Cập nhật th.chiếu máy chủ cùng với các đối tượng liên quan đến nó" #: common-cmds.h:23 msgid "Forward-port local commits to the updated upstream head" msgstr "" -"Forward-port những lần chuyển giao nội bộ tới head thượng nguồn đã cập nhật" +"Chuyển tiếp những lần chuyển giao nội bộ\n" +" tới head thượng nguồn đã cập nhật" #: common-cmds.h:24 msgid "Reset current HEAD to the specified state" -msgstr "Đặt lại HEAD hiện hành thành một trạng thái được chỉ ra" +msgstr "Đặt lại HEAD hiện hành thành trạng thái đã cho" #: common-cmds.h:25 msgid "Remove files from the working tree and from the index" @@ -9280,9 +9532,7 @@ msgstr "Hiển thị trạng thái cây làm việc" #: common-cmds.h:28 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "" -"Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ (tag) mà nó được ký sử dụng " -"GPG" +msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG" #: git-am.sh:50 msgid "You need to set your committer info first" @@ -9299,11 +9549,11 @@ msgstr "" #: git-am.sh:105 #, sh-format msgid "" -"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"When you have resolved this problem, run \"$cmdline --continue\".\n" "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" "To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" -"Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"$cmdline --resolved\".\n" +"Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"$cmdline --continue\".\n" "Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"$cmdline --skip" "\".\n" "Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy " @@ -9359,25 +9609,34 @@ msgstr "" "Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n" "nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa." -#: git-am.sh:477 +#: git-am.sh:479 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "thư mục rebase trước $dotest vẫn chưa sẵn sàng nhưng mbox được đưa ra." -#: git-am.sh:482 +#: git-am.sh:484 msgid "Please make up your mind. --skip or --abort?" msgstr "Xin hãy rõ ràng. --skip hay --abort?" -#: git-am.sh:509 +#: git-am.sh:520 +#, sh-format +msgid "" +"Stray $dotest directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"Tìm thấy thư mục lạc $dotest.\n" +"Dùng \"git am --abort\" để loại bỏ nó đi." + +#: git-am.sh:528 msgid "Resolve operation not in progress, we are not resuming." msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại." -#: git-am.sh:575 +#: git-am.sh:594 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Bảng mục lục sai: không thể áp dụng các miếng vá (sai: $files)" -#: git-am.sh:679 +#: git-am.sh:698 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -9390,34 +9649,34 @@ msgstr "" "Để phục hồi lại nhánh nguyên thủy và dừng vá lại hãy chạy lệnh \"$cmdline --" "abort\"." -#: git-am.sh:706 +#: git-am.sh:725 msgid "Patch does not have a valid e-mail address." msgstr "Miếng vá không có địa chỉ e-mail hợp lệ." -#: git-am.sh:753 +#: git-am.sh:772 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối" -#: git-am.sh:757 +#: git-am.sh:776 msgid "Commit Body is:" msgstr "Thân của lần chuyển giao (commit) là:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:764 +#: git-am.sh:783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" "Áp dụng? đồng ý [y]/không [n]/chỉnh sửa [e]/hiển thị miếng [v]á/đồng ý tất " "cả [a] " -#: git-am.sh:800 +#: git-am.sh:819 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Đang áp dụng (miếng vá): $FIRSTLINE" -#: git-am.sh:821 +#: git-am.sh:840 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9428,7 +9687,7 @@ msgstr "" "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng " "vá này." -#: git-am.sh:829 +#: git-am.sh:848 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -9436,16 +9695,16 @@ msgstr "" "Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình\n" "bạn đã quên sử dụng lệnh “git add” à?" -#: git-am.sh:845 +#: git-am.sh:864 msgid "No changes -- Patch already applied." msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." -#: git-am.sh:855 +#: git-am.sh:874 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Vá gặp lỗi tại $msgnum $FIRSTLINE" -#: git-am.sh:858 +#: git-am.sh:877 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -9454,7 +9713,7 @@ msgstr "" "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong:\n" " $dotest/patch" -#: git-am.sh:876 +#: git-am.sh:895 msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" @@ -9477,7 +9736,7 @@ msgstr "không công nhận tùy chọn: “$arg”" #: git-bisect.sh:99 #, sh-format msgid "'$arg' does not appear to be a valid revision" -msgstr "”$arg” không có vẻ như là một sự xét lại hợp lệ" +msgstr "”$arg” không có vẻ như là một điểm xét duyệt hợp lệ" #: git-bisect.sh:117 msgid "Bad HEAD - I need a HEAD" @@ -9662,7 +9921,7 @@ msgstr "Không thể hòa trộn nhiều nhánh và trong một head trống r msgid "Cannot rebase onto multiple branches" msgstr "Không thể thực hiện lệnh rebase (cơ cấu lại) trên nhiều nhánh" -#: git-rebase.sh:53 +#: git-rebase.sh:54 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -9675,35 +9934,55 @@ msgstr "" "Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy \"git " "rebase --abort\"." +#: git-rebase.sh:156 +msgid "Applied autostash." +msgstr "Đã áp dụng autostash." + +#: git-rebase.sh:159 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "Không thể lưu $stash_sha1" + #: git-rebase.sh:160 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" it at any time.\n" +msgstr "" +"Áp dụng autostash có hiệu quả trong các xung đột.\n" +"Các thay đổi của bạn an toàn trong stash (tạm cất đi).\n" +"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc " +"nào.\n" + +#: git-rebase.sh:190 msgid "The pre-rebase hook refused to rebase." msgstr "Móc (hook) pre-rebase từ chối rebase." -#: git-rebase.sh:165 +#: git-rebase.sh:195 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" "Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh " "rebase." -#: git-rebase.sh:296 +#: git-rebase.sh:329 msgid "The --exec option must be used with the --interactive option" msgstr "Tùy chọn --exec phải được sử dụng cùng với tùy chọn --interactive" -#: git-rebase.sh:301 +#: git-rebase.sh:334 msgid "No rebase in progress?" msgstr "Không có tiến trình rebase nào phải không?" -#: git-rebase.sh:312 +#: git-rebase.sh:345 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch " "sử) tương tác." -#: git-rebase.sh:319 +#: git-rebase.sh:352 msgid "Cannot read HEAD" msgstr "Không thể đọc HEAD" -#: git-rebase.sh:322 +#: git-rebase.sh:355 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -9711,12 +9990,12 @@ msgstr "" "Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n" "đó đánh dấu chúng là cần xử lý sử dụng lệnh git add" -#: git-rebase.sh:340 +#: git-rebase.sh:373 #, sh-format msgid "Could not move back to $head_name" msgstr "Không thể quay trở lại $head_name" -#: git-rebase.sh:359 +#: git-rebase.sh:392 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -9739,57 +10018,66 @@ msgstr "" "\n" "TÔI: là lệnh bạn vừa gọi!" -#: git-rebase.sh:404 +#: git-rebase.sh:437 #, sh-format msgid "invalid upstream $upstream_name" msgstr "thượng nguồn không hợp lệ $upstream_name" -#: git-rebase.sh:428 +#: git-rebase.sh:461 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ở đây có nhiều hơn một nền móng hòa trộn" -#: git-rebase.sh:431 git-rebase.sh:435 +#: git-rebase.sh:464 git-rebase.sh:468 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ở đây không có nền móng hòa trộn nào" -#: git-rebase.sh:440 +#: git-rebase.sh:473 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Không chỉ đến một lần chuyển giao (commit) không hợp lệ: $onto_name" -#: git-rebase.sh:463 +#: git-rebase.sh:496 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "nghiêm trọng: không có nhánh như thế: $branch_name" -#: git-rebase.sh:483 +#: git-rebase.sh:519 +msgid "Cannot autostash" +msgstr "Không thể autostash" + +#: git-rebase.sh:524 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "Đã tạo autostash: $stash_abbrev" + +#: git-rebase.sh:528 msgid "Please commit or stash them." msgstr "Xin hãy commit hoặc tạm cất (stash) chúng." -#: git-rebase.sh:501 +#: git-rebase.sh:548 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi." -#: git-rebase.sh:504 +#: git-rebase.sh:552 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc." -#: git-rebase.sh:515 +#: git-rebase.sh:563 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Thay đổi từ $mb thành $onto:" #. Detach HEAD and reset the tree -#: git-rebase.sh:524 +#: git-rebase.sh:572 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó..." -#: git-rebase.sh:532 +#: git-rebase.sh:582 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Fast-forward $branch_name thành $onto_name." @@ -9823,6 +10111,11 @@ msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể x msgid "Cannot record working tree state" msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành" +#: git-stash.sh:190 +#, sh-format +msgid "Cannot update $ref_stash with $w_commit" +msgstr "Không thể cập nhật $ref_stash với $w_commit" + #. TRANSLATORS: $option is an invalid option, like #. `--blah-blah'. The 7 spaces at the beginning of the #. second line correspond to "error: ". So you should line @@ -9833,132 +10126,153 @@ msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:202 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" "lỗi: không hiểu tùy chọn cho “stash save”: $option\n" -" Để cung cấp một thông điệp, sử dụng git stash save -- “$option”" +" Để dùng thông điệp có chứa -- ở đầu, sử dụng git stash save -- \"$option" +"\"" -#: git-stash.sh:223 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "Không có thay đổi nội bộ nào được ghi lại" -#: git-stash.sh:227 +#: git-stash.sh:268 +msgid "" +"The following untracked files would NOT be saved but need to be removed by " +"stash save:" +msgstr "" +"Các tập tin chưa được theo dõi sau đây KHÔNG được ghi lại nhưng cần được gỡ " +"bỏ bởi việc ghi lại stash:" + +#: git-stash.sh:270 +msgid "" +"Aborting. Consider using either the --force or --include-untracked option." +msgstr "" +"Bãi bỏ. Cân nhắc dùng một trong hai tùy chọn --force và --include-untracked." + +#: git-stash.sh:274 msgid "Cannot initialize stash" msgstr "Không thể khởi tạo stash" -#: git-stash.sh:235 +#: git-stash.sh:278 msgid "Cannot save the current status" msgstr "Không thể ghi lại trạng thái hiện hành" -#: git-stash.sh:253 +#: git-stash.sh:296 msgid "Cannot remove worktree changes" msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" -#: git-stash.sh:352 +#: git-stash.sh:395 msgid "No stash found." msgstr "Không tìm thấy stash nào." -#: git-stash.sh:359 +#: git-stash.sh:402 #, sh-format msgid "Too many revisions specified: $REV" -msgstr "Chỉ ra quá nhiều điểm xét lại: $REV" +msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV" -#: git-stash.sh:365 +#: git-stash.sh:408 #, sh-format msgid "$reference is not valid reference" msgstr "$reference không phải là tham chiếu hợp lệ" -#: git-stash.sh:393 +#: git-stash.sh:436 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "”$args” không phải là lần chuyển giao (commit) giống-stash" -#: git-stash.sh:404 +#: git-stash.sh:447 #, sh-format msgid "'$args' is not a stash reference" msgstr "”$args” không phải tham chiếu đến stash" -#: git-stash.sh:412 +#: git-stash.sh:455 msgid "unable to refresh index" msgstr "không thể làm tươi mới bảng mục lục" -#: git-stash.sh:416 +#: git-stash.sh:459 msgid "Cannot apply a stash in the middle of a merge" msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn" -#: git-stash.sh:424 +#: git-stash.sh:467 msgid "Conflicts in index. Try without --index." msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index." -#: git-stash.sh:426 +#: git-stash.sh:469 msgid "Could not save index tree" msgstr "Không thể ghi lại cây chỉ mục" -#: git-stash.sh:460 +#: git-stash.sh:503 msgid "Cannot unstage modified files" msgstr "Không thể bỏ trạng thía của các tập tin đã được sửa chữa" -#: git-stash.sh:475 +#: git-stash.sh:518 msgid "Index was not unstashed." msgstr "Bảng mục lục đã không được bỏ stash." -#: git-stash.sh:492 +#: git-stash.sh:535 #, sh-format msgid "Dropped ${REV} ($s)" -msgstr "Đã hạ xuống ${REV} ($s)" +msgstr "Đã xóa ${REV} ($s)" -#: git-stash.sh:493 +#: git-stash.sh:536 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Không thể xóa bỏ mục stash" -#: git-stash.sh:500 +#: git-stash.sh:543 msgid "No branch name specified" msgstr "Chưa chỉ ra tên của nhánh" -#: git-stash.sh:571 +#: git-stash.sh:615 msgid "(To restore them type \"git stash apply\")" msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")" -#: git-submodule.sh:91 +#: git-submodule.sh:95 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "không thể tháo bỏ một thành phần ra khỏi “$remoteurl” url" -#: git-submodule.sh:196 +#: git-submodule.sh:237 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" "Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn " "“$sm_path”" -#: git-submodule.sh:239 +#: git-submodule.sh:281 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "Nhân bản “$url” vào đường dẫn mô-đun-con “$sm_path” gặp lỗi" -#: git-submodule.sh:251 +#: git-submodule.sh:293 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" "Gitdir “$a” là bộ phận của đường dẫn mô-đun-con “$b” hoặc \"vice versa\"" -#: git-submodule.sh:349 +#: git-submodule.sh:403 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "" +"Đường dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm " +"việc" + +#: git-submodule.sh:413 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "repo URL: “$repo” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../" -#: git-submodule.sh:366 +#: git-submodule.sh:430 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi" -#: git-submodule.sh:370 +#: git-submodule.sh:434 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9970,36 +10284,36 @@ msgstr "" "$sm_path\n" "Sử dụng -f nếu bạn thực sự muốn thêm nó vào." -#: git-submodule.sh:388 +#: git-submodule.sh:452 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Đang thêm repo có sẵn tại “$sm_path” vào bảng mục lục" -#: git-submodule.sh:390 +#: git-submodule.sh:454 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "”$sm_path” đã tồn tại từ trước và không phải là một kho git hợp lệ" -#: git-submodule.sh:398 +#: git-submodule.sh:462 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:" -#: git-submodule.sh:400 +#: git-submodule.sh:464 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó" -#: git-submodule.sh:402 +#: git-submodule.sh:466 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" "dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là repo (kho) đúng" -#: git-submodule.sh:403 +#: git-submodule.sh:467 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -10008,70 +10322,71 @@ msgstr "" "hay bạn không chắc chắn điều đó có nghĩa gì chọn tên khác với tùy chọn “--" "name”." -#: git-submodule.sh:405 +#: git-submodule.sh:469 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" "Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”." -#: git-submodule.sh:417 +#: git-submodule.sh:481 #, sh-format msgid "Unable to checkout submodule '$sm_path'" -msgstr "Không thể checkout mô-đun con “$sm_path”" +msgstr "Không thể checkout mô-đun-con “$sm_path”" -#: git-submodule.sh:422 +#: git-submodule.sh:486 #, sh-format msgid "Failed to add submodule '$sm_path'" -msgstr "Gặp lỗi khi thêm mô-đun con “$sm_path”" +msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path”" -#: git-submodule.sh:431 +#: git-submodule.sh:495 #, sh-format msgid "Failed to register submodule '$sm_path'" -msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun con “$sm_path”" +msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”" -#: git-submodule.sh:474 +#: git-submodule.sh:539 #, sh-format -msgid "Entering '$prefix$sm_path'" -msgstr "Đang nhập “$prefix$sm_path”" +msgid "Entering '$prefix$displaypath'" +msgstr "Đang vào “$prefix$displaypath”" -#: git-submodule.sh:488 +#: git-submodule.sh:554 #, sh-format -msgid "Stopping at '$sm_path'; script returned non-zero status." -msgstr "Dừng lại tại “$sm_path”; script trả về trạng thái khác không." +msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgstr "" +"Dừng lại tại “$prefix$displaypath”; script trả về trạng thái khác không." -#: git-submodule.sh:532 +#: git-submodule.sh:600 #, sh-format -msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" -"Không tìm thấy url cho đường dẫn mô-đun-con “$sm_path” trong .gitmodules" +"Không tìm thấy url cho đường dẫn mô-đun-con “$displaypath” trong .gitmodules" -#: git-submodule.sh:541 +#: git-submodule.sh:609 #, sh-format -msgid "Failed to register url for submodule path '$sm_path'" -msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “$sm_path”" +msgid "Failed to register url for submodule path '$displaypath'" +msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:543 +#: git-submodule.sh:611 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$sm_path'" -msgstr "Mô-đun-con “$name” ($url) được đăng ký cho đường dẫn “$sm_path”" +msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgstr "Mô-đun-con “$name” ($url) được đăng ký cho đường dẫn “$displaypath”" -#: git-submodule.sh:551 +#: git-submodule.sh:619 #, sh-format -msgid "Failed to register update mode for submodule path '$sm_path'" +msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" -"Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “$sm_path”" +"Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:588 +#: git-submodule.sh:656 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "Dùng “.” nếu bạn thực sự muốn gỡ bỏ mọi mô-đun-con" -#: git-submodule.sh:603 +#: git-submodule.sh:673 #, sh-format -msgid "Submodule work tree '$sm_path' contains a .git directory" -msgstr "Cây làm việc mô-đun-con “$sm_path” có chứa thư mục .git" +msgid "Submodule work tree '$displaypath' contains a .git directory" +msgstr "Cây làm việc mô-đun-con “$displaypath” có chứa thư mục .git" -#: git-submodule.sh:604 +#: git-submodule.sh:674 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -10079,147 +10394,201 @@ msgstr "" "(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " "chúng)" -#: git-submodule.sh:610 +#: git-submodule.sh:680 #, sh-format msgid "" -"Submodule work tree '$sm_path' contains local modifications; use '-f' to " +"Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -"Cây làm việc mô-đun-con “$sm_path” chứa các thay đổi nội bộ; hãy dùng “-f” " -"để loại bỏ chúng đi" +"Cây làm việc mô-đun-con “$displaypath” chứa các thay đổi nội bộ; hãy dùng “-" +"f” để loại bỏ chúng đi" -#: git-submodule.sh:613 +#: git-submodule.sh:683 #, sh-format -msgid "Cleared directory '$sm_path'" -msgstr "Thư mục được dọn “$sm_path”" +msgid "Cleared directory '$displaypath'" +msgstr "Đã tạo thư mục '$displaypath'" -#: git-submodule.sh:614 +#: git-submodule.sh:684 #, sh-format -msgid "Could not remove submodule work tree '$sm_path'" -msgstr "Không thể gỡ bỏ cây làm việc mô-đun con “$sm_path”" +msgid "Could not remove submodule work tree '$displaypath'" +msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “$displaypath”" -#: git-submodule.sh:617 +#: git-submodule.sh:687 #, sh-format -msgid "Could not create empty submodule directory '$sm_path'" -msgstr "Không thể tạo thư mục mô-đun-con rỗng “$sm_path”" +msgid "Could not create empty submodule directory '$displaypath'" +msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath”" -#: git-submodule.sh:626 +#: git-submodule.sh:696 #, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$sm_path'" -msgstr "Mô-đun-con “$name” ($url) được bỏ đăng ký cho đường dẫn “$sm_path”" +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +msgstr "Mô-đun-con “$name” ($url) được bỏ đăng ký cho đường dẫn “$displaypath”" -#: git-submodule.sh:731 +#: git-submodule.sh:811 #, sh-format msgid "" -"Submodule path '$prefix$sm_path' not initialized\n" +"Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -"Đường dẫn mô-đun-con “$prefix$sm_path” chưa được khởi tạo\n" +"Đường dẫn mô-đun-con “$displaypath” chưa được khởi tạo.\n" "Có lẽ bạn muốn sử dụng lệnh “update --init”?" -#: git-submodule.sh:744 +#: git-submodule.sh:824 #, sh-format -msgid "Unable to find current revision in submodule path '$prefix$sm_path'" +msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -"Không tìm thấy điểm xét lại hiện hành trong đường dẫn mô-đun-con “$prefix" -"$sm_path”" +"Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con " +"“$displaypath”" -#: git-submodule.sh:753 +#: git-submodule.sh:833 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Không thể lấy về (fetch) trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:777 +#: git-submodule.sh:857 #, sh-format -msgid "Unable to fetch in submodule path '$prefix$sm_path'" -msgstr "Không thể lấy về (fetch) trong đường dẫn mô-đun-con “$prefix$sm_path”" +msgid "Unable to fetch in submodule path '$displaypath'" +msgstr "Không thể lấy về (fetch) trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:791 +#: git-submodule.sh:871 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'" -msgstr "Không thể rebase “$sha1” trong đường dẫn mô-đun-con “$prefix$sm_path”" +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgstr "Không thể rebase “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:792 +#: git-submodule.sh:872 #, sh-format -msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'" -msgstr "Đường dẫn mô-đun-con “$prefix$sm_path”: được rebase vào trong “$sha1”" +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”" -#: git-submodule.sh:797 +#: git-submodule.sh:877 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'" +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -"Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$prefix" -"$sm_path”" +"Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:798 +#: git-submodule.sh:878 #, sh-format -msgid "Submodule path '$prefix$sm_path': merged in '$sha1'" -msgstr "Đường dẫn mô-đun-con “$prefix$sm_path”: được hòa trộn vào “$sha1”" +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”" -#: git-submodule.sh:803 +#: git-submodule.sh:883 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'" +msgid "" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" -"Không thể checkout “$sha1” trong đường dẫn mô-đun-con “$prefix$sm_path”" +"Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con " +"“$prefix$sm_path”" -#: git-submodule.sh:804 +#: git-submodule.sh:884 #, sh-format -msgid "Submodule path '$prefix$sm_path': checked out '$sha1'" -msgstr "Đường dẫn mô-đun-con “$prefix$sm_path”: được checkout “$sha1”" +msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgstr "Đường dẫn mô-đun-con “$prefix$sm_path”: “$command $sha1”" -#: git-submodule.sh:831 +#: git-submodule.sh:889 #, sh-format -msgid "Failed to recurse into submodule path '$prefix$sm_path'" -msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$prefix$sm_path”" +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "Không thể checkout “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:939 +#: git-submodule.sh:890 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”" + +#: git-submodule.sh:917 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”" + +#: git-submodule.sh:1025 msgid "The --cached option cannot be used with the --files option" msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files" #. unexpected type -#: git-submodule.sh:979 +#: git-submodule.sh:1066 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:997 +#: git-submodule.sh:1086 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_src" -msgstr " Cảnh báo: $name không chứa lần chuyển giao (commit) $sha1_src" +msgid " Warn: $display_name doesn't contain commit $sha1_src" +msgstr "" +" Cảnh báo: $display_name không chứa lần chuyển giao (commit) $sha1_src" -#: git-submodule.sh:1000 +#: git-submodule.sh:1089 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_dst" -msgstr " Cảnh báo: $name không chứa lần chuyển giao (commit) $sha1_dst" +msgid " Warn: $display_name doesn't contain commit $sha1_dst" +msgstr "" +" Cảnh báo: $display_name không chứa lần chuyển giao (commit) $sha1_dst" -#: git-submodule.sh:1003 +#: git-submodule.sh:1092 #, sh-format -msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -" Cảnh báo: $name không chứa những lần chuyển giao (commit) $sha1_src và " -"$sha1_dst" +" Cảnh báo: $display_name không chứa những lần chuyển giao (commit) " +"$sha1_src và $sha1_dst" -#: git-submodule.sh:1028 +#: git-submodule.sh:1117 msgid "blob" msgstr "blob" -#: git-submodule.sh:1066 +#: git-submodule.sh:1155 msgid "Submodules changed but not updated:" msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" -#: git-submodule.sh:1068 +#: git-submodule.sh:1157 msgid "Submodule changes to be committed:" msgstr "Những mô-đun-con thay đổi đã được chuyển giao (commit):" -#: git-submodule.sh:1153 +#: git-submodule.sh:1242 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:1216 +#: git-submodule.sh:1306 #, sh-format -msgid "Synchronizing submodule url for '$prefix$sm_path'" -msgstr "Url Mô-đun-con đồng bộ hóa cho “$prefix$sm_path”" +msgid "Synchronizing submodule url for '$displaypath'" +msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" + +#~ msgid " (fix conflicts and then run \"git am --resolved\")" +#~ msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --resolved\")" + +#~ msgid " (all conflicts fixed: run \"git commit\")" +#~ msgstr " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git commit\")" + +#~ msgid "more than %d trees given: '%s'" +#~ msgstr "đã chỉ ra nhiều hơn %d cây (tree): “%s”" + +#~ msgid "You cannot combine --no-ff with --ff-only." +#~ msgstr "Bạn không thể kết hợp --no-ff với --ff-only." + +#~ msgid "" +#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" +#~ msgstr "" +#~ "mô-đun-con “%s” (hoặc cái nằm trong các mô-đun-con) dùng thư mục .git\n" +#~ "(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " +#~ "chúng)" + +#~ msgid "" +#~ "'%s' has changes staged in the index\n" +#~ "(use --cached to keep the file, or -f to force removal)" +#~ msgstr "" +#~ "“%s” có các thay đổi được lưu trạng thái trong bảng mục lục\n" +#~ "(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" + +#~ msgid "show commits where no parent comes before its children" +#~ msgstr "hiển thị các lần chuyển giao nơi mà cha mẹ đến trước con của nó" + +#~ msgid "show the HEAD reference" +#~ msgstr "hiển thị tham chiếu của HEAD" + +#~ msgid "Unable to fetch in submodule path '$prefix$sm_path'" +#~ msgstr "" +#~ "Không thể lấy về (fetch) trong đường dẫn mô-đun-con “$prefix$sm_path”" + +#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'" +#~ msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$prefix$sm_path”" #~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'" #~ msgstr "Cần %.2f giây để đếm các tập tin chưa được theo vết. “status -uno”" diff --git a/po/zh_CN.po b/po/zh_CN.po index ba757d9afd..ff95140612 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-04-30 08:25+0800\n" -"PO-Revision-Date: 2013-04-12 09:23+0800\n" +"POT-Creation-Date: 2013-07-26 14:19+0800\n" +"PO-Revision-Date: 2013-08-03 14:13+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:53 +#: advice.c:57 #, c-format msgid "hint: %.*s\n" msgstr "提示：%.*s\n" @@ -31,7 +31,7 @@ msgstr "提示：%.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:83 +#: advice.c:87 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -68,7 +68,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c:324 builtin/log.c:1126 +#: archive.c:324 builtin/log.c:1173 msgid "prefix" msgstr "前缀" @@ -76,11 +76,11 @@ msgstr "前缀" msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371 -#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 -#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 -#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292 +#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673 +#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77 +#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152 msgid "file" msgstr "文件" @@ -112,7 +112,7 @@ msgstr "压缩效果更好" msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "版本库" @@ -120,7 +120,7 @@ msgstr "版本库" msgid "retrieve the archive from remote repository <repo>" msgstr "从远程版本库（<版本库>）提取归档文件" -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615 +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487 msgid "command" msgstr "命令" @@ -205,17 +205,17 @@ msgstr "一个分支名 '%s' 已经存在。" msgid "Cannot force update the current branch." msgstr "无法强制更新当前分支。" -#: branch.c:201 +#: branch.c:216 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。" -#: branch.c:203 +#: branch.c:218 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" -#: branch.c:205 +#: branch.c:220 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -233,26 +233,26 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c:250 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "不是一个有效的对象名：'%s'。" -#: branch.c:270 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." msgstr "歧义的对象名：'%s'。" -#: branch.c:275 +#: branch.c:290 #, c-format msgid "Not a valid branch point: '%s'." msgstr "无效的分支点：'%s'。" -#: branch.c:281 +#: branch.c:296 msgid "Failed to lock ref for update" msgstr "无法为更新锁定引用" -#: branch.c:299 +#: branch.c:314 msgid "Failed to write ref" msgstr "不能写引用" @@ -266,7 +266,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:89 builtin/commit.c:676 +#: bundle.c:89 builtin/commit.c:683 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -275,9 +275,9 @@ msgstr "不能打开 '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" -#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300 -#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 -#: builtin/shortlog.c:155 +#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331 +#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364 +#: builtin/shortlog.c:156 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -303,7 +303,7 @@ msgstr[1] "这个包需要 %d 个引用：" msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258 +#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -334,12 +334,12 @@ msgstr "不能创建 '%s'" msgid "index-pack died" msgstr "index-pack 终止" -#: commit.c:50 +#: commit.c:53 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:52 +#: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交!" @@ -348,16 +348,16 @@ msgstr "%s %s 不是一个提交!" msgid "memory exhausted" msgstr "内存耗尽" -#: connected.c:39 +#: connected.c:60 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" -#: connected.c:48 +#: connected.c:80 #, c-format msgid "failed write to rev-list: %s" msgstr "无法写入 rev-list：%s" -#: connected.c:56 +#: connected.c:88 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "无法关闭 rev-list 的标准输入：%s" @@ -455,7 +455,7 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:3481 +#: diff.c:3487 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -464,7 +464,7 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:3495 +#: diff.c:3501 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" @@ -506,20 +506,20 @@ msgstr "'%s'：%s" msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" -#: help.c:212 +#: help.c:213 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:219 +#: help.c:220 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:235 +#: help.c:236 msgid "The most commonly used git commands are:" msgstr "最常用的 git 命令有：" -#: help.c:292 +#: help.c:293 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -528,11 +528,11 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:349 +#: help.c:350 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:371 +#: help.c:372 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -541,17 +541,17 @@ msgstr "" "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" "是 '%s'" -#: help.c:376 +#: help.c:377 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:383 +#: help.c:384 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:387 +#: help.c:388 help.c:447 msgid "" "\n" "Did you mean this?" @@ -565,12 +565,17 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么？" +#: help.c:443 +#, c-format +msgid "%s: %s - %s" +msgstr "%s：%s - %s" + #: merge.c:56 msgid "failed to read the cache" msgstr "无法读取缓存" #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 -#: builtin/clone.c:645 +#: builtin/clone.c:656 msgid "unable to write new index file" msgstr "无法写新的索引文件" @@ -584,70 +589,70 @@ msgstr "（坏提交）\n" msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" -#: merge-recursive.c:268 +#: merge-recursive.c:269 msgid "error building trees" msgstr "无法创建树" -#: merge-recursive.c:672 +#: merge-recursive.c:673 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" -#: merge-recursive.c:683 +#: merge-recursive.c:684 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:697 merge-recursive.c:718 +#: merge-recursive.c:698 merge-recursive.c:719 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:708 +#: merge-recursive.c:709 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:748 +#: merge-recursive.c:749 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:750 +#: merge-recursive.c:751 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据（blob）对象" -#: merge-recursive.c:773 builtin/clone.c:313 +#: merge-recursive.c:774 builtin/clone.c:312 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: merge-recursive.c:781 +#: merge-recursive.c:782 #, c-format msgid "failed to symlink '%s'" msgstr "无法创建符号链接 '%s'" -#: merge-recursive.c:784 +#: merge-recursive.c:785 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:922 +#: merge-recursive.c:923 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:926 +#: merge-recursive.c:927 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:942 +#: merge-recursive.c:943 msgid "unsupported object type in the tree" msgstr "在树中有不支持的对象类型" -#: merge-recursive.c:1021 merge-recursive.c:1035 +#: merge-recursive.c:1022 merge-recursive.c:1036 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -656,7 +661,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本被保留。" -#: merge-recursive.c:1027 merge-recursive.c:1040 +#: merge-recursive.c:1028 merge-recursive.c:1041 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -665,20 +670,20 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本保留于 %8$s 中。" -#: merge-recursive.c:1081 +#: merge-recursive.c:1082 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1081 +#: merge-recursive.c:1082 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1137 +#: merge-recursive.c:1138 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1159 +#: merge-recursive.c:1160 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -687,148 +692,169 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1164 +#: merge-recursive.c:1165 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1218 +#: merge-recursive.c:1219 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->" "%5$s" -#: merge-recursive.c:1248 +#: merge-recursive.c:1249 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" -#: merge-recursive.c:1447 +#: merge-recursive.c:1448 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" -#: merge-recursive.c:1457 +#: merge-recursive.c:1458 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" -#: merge-recursive.c:1462 merge-recursive.c:1660 +#: merge-recursive.c:1463 merge-recursive.c:1661 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:1513 +#: merge-recursive.c:1514 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:1516 +#: merge-recursive.c:1517 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据（blob）对象" -#: merge-recursive.c:1564 +#: merge-recursive.c:1565 msgid "modify" msgstr "修改" -#: merge-recursive.c:1564 +#: merge-recursive.c:1565 msgid "modified" msgstr "修改" -#: merge-recursive.c:1574 +#: merge-recursive.c:1575 msgid "content" msgstr "内容" -#: merge-recursive.c:1581 +#: merge-recursive.c:1582 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:1615 +#: merge-recursive.c:1616 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:1629 +#: merge-recursive.c:1630 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1633 git-submodule.sh:1029 +#: merge-recursive.c:1634 git-submodule.sh:1118 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:1634 +#: merge-recursive.c:1635 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:1724 +#: merge-recursive.c:1725 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:1749 +#: merge-recursive.c:1750 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:1755 +#: merge-recursive.c:1756 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:1760 +#: merge-recursive.c:1761 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" -#: merge-recursive.c:1770 +#: merge-recursive.c:1771 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:1787 +#: merge-recursive.c:1788 msgid "Fatal merge failure, shouldn't happen." msgstr "严重的合并错误，不应发生。" -#: merge-recursive.c:1806 +#: merge-recursive.c:1807 msgid "Already up-to-date!" msgstr "已经是最新的！" -#: merge-recursive.c:1815 +#: merge-recursive.c:1816 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:1845 +#: merge-recursive.c:1846 #, c-format msgid "Unprocessed path??? %s" msgstr "未处理的路径??? %s" -#: merge-recursive.c:1890 +#: merge-recursive.c:1891 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:1903 +#: merge-recursive.c:1904 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:1940 +#: merge-recursive.c:1941 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:1997 +#: merge-recursive.c:1998 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2009 builtin/merge.c:658 +#: merge-recursive.c:2010 builtin/merge.c:672 msgid "Unable to write index." msgstr "不能写入索引。" -#: object.c:195 +#: notes-utils.c:40 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "不能提交未初始化/未引用的注解树" + +#: notes-utils.c:81 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "坏的 notes.rewriteMode 值：'%s'" + +#: notes-utils.c:91 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: notes-utils.c:118 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "坏的 %s 值：'%s'" + +#: object.c:204 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" @@ -869,18 +895,18 @@ msgstr "路径 '%s' 属于模组 '%.*s'" msgid "'%s' is beyond a symbolic link" msgstr "'%s' 位于符号链接中" -#: remote.c:1781 +#: remote.c:1788 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:1787 +#: remote.c:1794 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:1790 +#: remote.c:1797 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -889,11 +915,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:1798 +#: remote.c:1805 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:1801 +#: remote.c:1808 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -909,18 +935,27 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:1811 +#: remote.c:1818 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 -#: builtin/merge.c:1009 +#: run-command.c:80 +msgid "open /dev/null failed" +msgstr "不能打开 /dev/null" + +#: run-command.c:82 +#, c-format +msgid "dup2(%d,%d) failed" +msgstr "不能调用 dup2(%d,%d)" + +#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 +#: builtin/merge.c:1013 builtin/merge.c:1023 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" -#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 -#: builtin/merge.c:1001 builtin/merge.c:1014 +#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 +#: builtin/merge.c:1015 builtin/merge.c:1028 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" @@ -942,7 +977,7 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:245 sequencer.c:859 sequencer.c:942 +#: sequencer.c:245 sequencer.c:869 sequencer.c:952 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" @@ -965,215 +1000,236 @@ msgid "Commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:319 +#: sequencer.c:324 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:350 +#: sequencer.c:355 msgid "Could not resolve HEAD commit\n" msgstr "不能解析 HEAD 提交\n" -#: sequencer.c:371 +#: sequencer.c:377 msgid "Unable to update cache tree\n" msgstr "不能更新缓存\n" -#: sequencer.c:416 +#: sequencer.c:422 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: sequencer.c:421 +#: sequencer.c:427 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" -#: sequencer.c:487 +#: sequencer.c:493 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:506 +#: sequencer.c:512 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:514 +#: sequencer.c:520 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:518 +#: sequencer.c:524 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "指定了主线但提交 %s 不是一个合并。" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:531 +#: sequencer.c:537 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:535 +#: sequencer.c:541 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:621 +#: sequencer.c:627 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:622 +#: sequencer.c:628 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:654 +#: sequencer.c:664 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:662 +#: sequencer.c:672 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:667 +#: sequencer.c:677 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:725 +#: sequencer.c:735 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" -#: sequencer.c:747 +#: sequencer.c:757 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" -#: sequencer.c:752 +#: sequencer.c:762 msgid "No commits parsed." msgstr "没有提交被解析。" -#: sequencer.c:765 +#: sequencer.c:775 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:769 +#: sequencer.c:779 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:776 +#: sequencer.c:786 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:804 +#: sequencer.c:814 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:807 +#: sequencer.c:817 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:819 +#: sequencer.c:829 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:840 +#: sequencer.c:850 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:841 +#: sequencer.c:851 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:845 +#: sequencer.c:855 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:861 sequencer.c:946 +#: sequencer.c:871 sequencer.c:956 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:880 sequencer.c:1014 +#: sequencer.c:890 sequencer.c:1024 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:882 +#: sequencer.c:892 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:884 +#: sequencer.c:894 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:906 builtin/apply.c:4060 +#: sequencer.c:916 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" -#: sequencer.c:909 +#: sequencer.c:919 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:910 +#: sequencer.c:920 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:916 +#: sequencer.c:926 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:939 +#: sequencer.c:949 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:1083 +#: sequencer.c:1092 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:1085 +#: sequencer.c:1095 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:1119 +#: sequencer.c:1129 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:1120 +#: sequencer.c:1130 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" -#: sha1_name.c:1036 +#: sha1_name.c:440 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.object_name_warning false\"" +msgstr "" +"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n" +"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n" +"可能需要删除它们。用 \"git config advice.object_name_warning false\"" +"命令关闭本消息通知。" + +#: sha1_name.c:1097 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: sha1_name.c:1039 +#: sha1_name.c:1100 #, c-format msgid "No such branch: '%s'" msgstr "没有此分支：'%s'" -#: sha1_name.c:1041 +#: sha1_name.c:1102 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: sha1_name.c:1044 +#: sha1_name.c:1106 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" @@ -1183,181 +1239,181 @@ msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" msgid "unable to access '%s': %s" msgstr "不能访问 '%s'：%s" -#: wrapper.c:423 +#: wrapper.c:429 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" -#: wrapper.c:434 +#: wrapper.c:440 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "无法在口令文件中查询到当前用户：%s" -#: wrapper.c:435 +#: wrapper.c:441 msgid "no such user" msgstr "无此用户" -#: wt-status.c:140 +#: wt-status.c:141 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:167 wt-status.c:194 +#: wt-status.c:168 wt-status.c:195 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:169 wt-status.c:196 +#: wt-status.c:170 wt-status.c:197 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:173 +#: wt-status.c:174 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " （使用 \"git add <file>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:175 wt-status.c:179 +#: wt-status.c:176 wt-status.c:180 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:177 +#: wt-status.c:178 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <file>...\" 标记解决方案）" -#: wt-status.c:188 +#: wt-status.c:189 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:206 +#: wt-status.c:207 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:210 +#: wt-status.c:211 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:212 +#: wt-status.c:213 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:213 +#: wt-status.c:214 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:215 +#: wt-status.c:216 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" # 译者：注意保持前导空格 -#: wt-status.c:227 +#: wt-status.c:228 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）" -#: wt-status.c:244 +#: wt-status.c:245 msgid "bug" msgstr "bug" -#: wt-status.c:249 +#: wt-status.c:250 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:250 +#: wt-status.c:251 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:251 +#: wt-status.c:252 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:252 +#: wt-status.c:253 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:253 +#: wt-status.c:254 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:254 +#: wt-status.c:255 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:255 +#: wt-status.c:256 msgid "both modified:" msgstr "双方修改：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:285 +#: wt-status.c:286 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:287 +#: wt-status.c:288 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:289 +#: wt-status.c:290 msgid "untracked content, " msgstr "未跟踪的内容, " # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:306 +#: wt-status.c:307 #, c-format msgid "new file: %s" msgstr "新文件： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:309 +#: wt-status.c:310 #, c-format msgid "copied: %s -> %s" msgstr "拷贝： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:312 +#: wt-status.c:313 #, c-format msgid "deleted: %s" msgstr "删除： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:315 +#: wt-status.c:316 #, c-format msgid "modified: %s" msgstr "修改： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:318 +#: wt-status.c:319 #, c-format msgid "renamed: %s -> %s" msgstr "重命名： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:321 +#: wt-status.c:322 #, c-format msgid "typechange: %s" msgstr "类型变更： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:324 +#: wt-status.c:325 #, c-format msgid "unknown: %s" msgstr "未知： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:327 +#: wt-status.c:328 #, c-format msgid "unmerged: %s" msgstr "未合并： %s" -#: wt-status.c:330 +#: wt-status.c:331 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug：未处理的差异状态 %c" @@ -1367,7 +1423,7 @@ msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:806 wt-status.c:958 +#: wt-status.c:806 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" @@ -1390,8 +1446,8 @@ msgstr "当前的补丁为空。" # 译者：注意保持前导空格 #: wt-status.c:829 -msgid " (fix conflicts and then run \"git am --resolved\")" -msgstr " （解决冲突，然后运行 \"git am --resolved\"）" +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 #: wt-status.c:831 @@ -1472,41 +1528,51 @@ msgid "You are currently cherry-picking." msgstr "您正在做拣选操作。" # 译者：注意保持前导空格 +#: wt-status.c:958 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" + +# 译者：注意保持前导空格 #: wt-status.c:961 -msgid " (all conflicts fixed: run \"git commit\")" -msgstr " （解决所有冲突后，执行 \"git commit\"）" +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" -#: wt-status.c:970 +# 译者：注意保持前导空格 +#: wt-status.c:963 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" + +#: wt-status.c:972 #, c-format msgid "You are currently reverting commit %s." msgstr "您正在反转提交 %s 。" # 译者：注意保持前导空格 -#: wt-status.c:975 +#: wt-status.c:977 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:978 +#: wt-status.c:980 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:980 +#: wt-status.c:982 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:991 +#: wt-status.c:993 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您正在从分支 '%s' 开始做二分查找。" -#: wt-status.c:995 +#: wt-status.c:997 msgid "You are currently bisecting." msgstr "您正在做二分查找。" # 译者：注意保持前导空格 -#: wt-status.c:998 +#: wt-status.c:1000 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" @@ -1514,31 +1580,35 @@ msgstr " （使用 \"git bisect reset\" 以回到原有分支）" msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1184 +#: wt-status.c:1180 +msgid "rebase in progress; onto " +msgstr "变基正在进行中；至 " + +#: wt-status.c:1187 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1186 +#: wt-status.c:1189 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1189 +#: wt-status.c:1192 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1206 +#: wt-status.c:1209 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1220 +#: wt-status.c:1223 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1222 +#: wt-status.c:1225 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1226 +#: wt-status.c:1229 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1548,90 +1618,90 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1232 +#: wt-status.c:1235 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1234 +#: wt-status.c:1237 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1240 +#: wt-status.c:1243 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1245 +#: wt-status.c:1248 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1248 +#: wt-status.c:1251 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1251 +#: wt-status.c:1254 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1254 +#: wt-status.c:1257 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1257 +#: wt-status.c:1260 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1260 wt-status.c:1265 +#: wt-status.c:1263 wt-status.c:1268 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1263 +#: wt-status.c:1266 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1267 +#: wt-status.c:1270 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1375 +#: wt-status.c:1378 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:1381 +#: wt-status.c:1384 msgid "Initial commit on " msgstr "初始提交于 " # 译者：注意保持句尾空格 -#: wt-status.c:1396 +#: wt-status.c:1399 msgid "behind " msgstr "落后 " # 译者：注意保持句尾空格 -#: wt-status.c:1399 wt-status.c:1402 +#: wt-status.c:1402 wt-status.c:1405 msgid "ahead " msgstr "领先 " # 译者：注意保持句尾空格 -#: wt-status.c:1404 +#: wt-status.c:1407 msgid ", behind " msgstr "，落后 " -#: compat/precompose_utf8.c:58 builtin/clone.c:352 +#: compat/precompose_utf8.c:58 builtin/clone.c:351 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" @@ -1716,7 +1786,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:149 builtin/commit.c:233 +#: builtin/add.c:149 builtin/commit.c:238 msgid "updating files failed" msgstr "更新文件失败" @@ -1729,7 +1799,7 @@ msgstr "删除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275 +#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径 '%s' 未匹配任何文件" @@ -1738,127 +1808,127 @@ msgstr "路径 '%s' 未匹配任何文件" msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:349 +#: builtin/add.c:350 #, c-format msgid "Could not open '%s' for writing." msgstr "不能打开 '%s' 以写入。" -#: builtin/add.c:353 +#: builtin/add.c:354 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" -#: builtin/add.c:360 +#: builtin/add.c:361 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:366 +#: builtin/add.c:367 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:376 +#: builtin/add.c:377 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 -#: builtin/rm.c:206 +#: builtin/add.c:394 builtin/clean.c:851 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253 +#: builtin/rm.c:268 msgid "dry run" msgstr "演习" -#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 -#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 -#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19 +#: builtin/commit.c:1201 builtin/count-objects.c:95 builtin/fsck.c:613 +#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113 msgid "be verbose" msgstr "冗长输出" -#: builtin/add.c:396 +#: builtin/add.c:397 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 +#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:398 +#: builtin/add.c:399 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:399 +#: builtin/add.c:400 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:400 +#: builtin/add.c:401 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:401 +#: builtin/add.c:402 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:402 +#: builtin/add.c:403 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" #. takes no arguments -#: builtin/add.c:405 +#: builtin/add.c:406 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:407 +#: builtin/add.c:408 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:408 +#: builtin/add.c:409 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:409 +#: builtin/add.c:410 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:431 +#: builtin/add.c:432 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:432 +#: builtin/add.c:433 msgid "no files added" msgstr "没有文件被添加" -#: builtin/add.c:438 +#: builtin/add.c:439 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:477 +#: builtin/add.c:478 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:495 +#: builtin/add.c:496 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:525 +#: builtin/add.c:526 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:526 +#: builtin/add.c:527 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 -#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 +#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:895 +#: builtin/commit.c:298 builtin/mv.c:82 builtin/rm.c:297 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -2037,293 +2107,293 @@ msgstr "打补丁失败：%s:%ld" msgid "cannot checkout %s" msgstr "不能检出 %s" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3173 builtin/apply.c:3395 +#: builtin/apply.c:3174 builtin/apply.c:3396 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3254 builtin/apply.c:3409 +#: builtin/apply.c:3255 builtin/apply.c:3410 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 +#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3263 builtin/apply.c:3417 +#: builtin/apply.c:3264 builtin/apply.c:3418 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3365 +#: builtin/apply.c:3366 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: builtin/apply.c:3434 +#: builtin/apply.c:3435 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3436 +#: builtin/apply.c:3437 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3537 +#: builtin/apply.c:3538 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3540 +#: builtin/apply.c:3541 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: builtin/apply.c:3560 +#: builtin/apply.c:3561 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3565 +#: builtin/apply.c:3566 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配" -#: builtin/apply.c:3573 +#: builtin/apply.c:3574 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3586 +#: builtin/apply.c:3587 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 +#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:3822 +#: builtin/apply.c:3823 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:3850 +#: builtin/apply.c:3851 #, c-format -msgid "corrupt patch for subproject %s" -msgstr "子项目 %s 损坏的补丁" +msgid "corrupt patch for submodule %s" +msgstr "子模组 %s 损坏的补丁" -#: builtin/apply.c:3854 +#: builtin/apply.c:3855 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:3859 +#: builtin/apply.c:3860 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:3862 builtin/apply.c:3970 +#: builtin/apply.c:3863 builtin/apply.c:3971 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:3895 +#: builtin/apply.c:3896 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:3944 +#: builtin/apply.c:3945 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:4031 +#: builtin/apply.c:4032 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:4039 +#: builtin/apply.c:4040 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose -#: builtin/apply.c:4042 +#: builtin/apply.c:4043 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." -#: builtin/apply.c:4052 +#: builtin/apply.c:4053 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:4073 +#: builtin/apply.c:4074 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:4076 +#: builtin/apply.c:4077 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:4226 +#: builtin/apply.c:4227 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4237 +#: builtin/apply.c:4238 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "路径" -#: builtin/apply.c:4357 +#: builtin/apply.c:4358 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:4360 +#: builtin/apply.c:4361 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:4362 +#: builtin/apply.c:4363 msgid "num" msgstr "数字" -#: builtin/apply.c:4363 +#: builtin/apply.c:4364 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: builtin/apply.c:4366 +#: builtin/apply.c:4367 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:4368 +#: builtin/apply.c:4369 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:4372 +#: builtin/apply.c:4373 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: builtin/apply.c:4374 +#: builtin/apply.c:4375 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:4376 +#: builtin/apply.c:4377 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:4378 +#: builtin/apply.c:4379 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:4380 +#: builtin/apply.c:4381 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:4382 +#: builtin/apply.c:4383 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: builtin/apply.c:4384 +#: builtin/apply.c:4385 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三路合并" -#: builtin/apply.c:4386 +#: builtin/apply.c:4387 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4391 +#: builtin/apply.c:4392 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4392 +#: builtin/apply.c:4393 msgid "action" msgstr "动作" -#: builtin/apply.c:4393 +#: builtin/apply.c:4394 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4396 builtin/apply.c:4399 +#: builtin/apply.c:4397 builtin/apply.c:4400 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4402 +#: builtin/apply.c:4403 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4404 +#: builtin/apply.c:4405 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4406 +#: builtin/apply.c:4407 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4408 +#: builtin/apply.c:4409 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4411 +#: builtin/apply.c:4412 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4414 +#: builtin/apply.c:4415 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4416 +#: builtin/apply.c:4417 msgid "root" msgstr "根目录" -#: builtin/apply.c:4417 +#: builtin/apply.c:4418 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4439 +#: builtin/apply.c:4440 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" -#: builtin/apply.c:4447 +#: builtin/apply.c:4448 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4450 +#: builtin/apply.c:4451 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4466 +#: builtin/apply.c:4467 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4480 +#: builtin/apply.c:4481 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: builtin/apply.c:4486 builtin/apply.c:4496 +#: builtin/apply.c:4487 builtin/apply.c:4497 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2377,103 +2447,103 @@ msgstr "执行 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非检出当前提交" -#: builtin/blame.c:25 +#: builtin/blame.c:26 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "git blame [选项] [版本选项] [版本] [--] 文件" -#: builtin/blame.c:30 +#: builtin/blame.c:31 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:2355 +#: builtin/blame.c:2276 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:2356 +#: builtin/blame.c:2277 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:2357 +#: builtin/blame.c:2278 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:2358 +#: builtin/blame.c:2279 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:2359 +#: builtin/blame.c:2280 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:2360 +#: builtin/blame.c:2281 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:2361 +#: builtin/blame.c:2282 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:2362 +#: builtin/blame.c:2283 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:2363 +#: builtin/blame.c:2284 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:2364 +#: builtin/blame.c:2285 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:2365 +#: builtin/blame.c:2286 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:2366 +#: builtin/blame.c:2287 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的SHA1提交号（默认：关闭）" -#: builtin/blame.c:2367 +#: builtin/blame.c:2288 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:2368 +#: builtin/blame.c:2289 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:2369 +#: builtin/blame.c:2290 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:2370 +#: builtin/blame.c:2291 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:2371 +#: builtin/blame.c:2292 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:2372 +#: builtin/blame.c:2293 msgid "Use <file>'s contents as the final image" msgstr "使用 <file> 的内容作为最终的图片" -#: builtin/blame.c:2373 builtin/blame.c:2374 +#: builtin/blame.c:2294 builtin/blame.c:2295 msgid "score" msgstr "得分" -#: builtin/blame.c:2373 +#: builtin/blame.c:2294 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:2374 +#: builtin/blame.c:2295 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:2375 +#: builtin/blame.c:2296 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2375 +#: builtin/blame.c:2296 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" @@ -2707,8 +2777,8 @@ msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 -#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369 -#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 +#: builtin/branch.c:838 builtin/commit.c:1414 builtin/commit.c:1415 +#: builtin/commit.c:1416 builtin/commit.c:1417 builtin/tag.c:468 msgid "commit" msgstr "提交" @@ -2772,7 +2842,7 @@ msgstr "以列的方式显示分支" msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:860 builtin/clone.c:619 +#: builtin/branch.c:860 builtin/clone.c:630 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" @@ -2889,43 +2959,43 @@ msgstr "需要一个版本库来创建包。" msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: builtin/cat-file.c:176 +#: builtin/cat-file.c:303 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" -#: builtin/cat-file.c:177 +#: builtin/cat-file.c:304 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <对象列表>" -#: builtin/cat-file.c:195 +#: builtin/cat-file.c:341 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:196 +#: builtin/cat-file.c:342 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:197 +#: builtin/cat-file.c:343 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:199 +#: builtin/cat-file.c:345 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:200 +#: builtin/cat-file.c:346 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:202 +#: builtin/cat-file.c:348 msgid "for blob objects, run textconv on object's content" msgstr "对于数据（blob）对象，对其内容执行 textconv" -#: builtin/cat-file.c:204 +#: builtin/cat-file.c:350 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:207 +#: builtin/cat-file.c:353 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" @@ -2953,30 +3023,55 @@ msgstr "从标准输入读出文件名" msgid "input paths are terminated by a null character" msgstr "输入路径以null字符终止" -#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 +#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177 msgid "suppress progress reporting" msgstr "不显示进度报告" -#: builtin/check-ignore.c:146 +#: builtin/check-ignore.c:26 +msgid "show non-matching input paths" +msgstr "显示未匹配的输入路径" + +#: builtin/check-ignore.c:143 msgid "cannot specify pathnames with --stdin" msgstr "不能同时提供路径及 --stdin 参数" -#: builtin/check-ignore.c:149 +#: builtin/check-ignore.c:146 msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 参数共用才有意义" -#: builtin/check-ignore.c:151 +#: builtin/check-ignore.c:148 msgid "no path specified" msgstr "未指定路径" -#: builtin/check-ignore.c:155 +#: builtin/check-ignore.c:152 msgid "--quiet is only valid with a single pathname" msgstr "参数 --quiet 只在提供一个路径名时有效" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:154 msgid "cannot have both --quiet and --verbose" msgstr "不能同时提供 --quiet 和 --verbose 参数" +#: builtin/check-ignore.c:157 +msgid "--non-matching is only valid with --verbose" +msgstr "--non-matching 选项只在使用 --verbose 时有效" + +#: builtin/check-mailmap.c:8 +msgid "git check-mailmap [options] <contact>..." +msgstr "git check-mailmap [选项] <联系地址>..." + +#: builtin/check-mailmap.c:13 +msgid "also read contacts from stdin" +msgstr "还从标准输入读取联系地址" + +#: builtin/check-mailmap.c:24 +#, c-format +msgid "unable to parse contact: %s" +msgstr "不能解析联系地址：%s" + +#: builtin/check-mailmap.c:47 +msgid "no contacts specified" +msgstr "未指定联系地址" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "git checkout-index [选项] [--] [<文件>...]" @@ -3093,43 +3188,43 @@ msgstr "您需要先解决当前索引的冲突" msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" -#: builtin/checkout.c:634 +#: builtin/checkout.c:639 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:641 +#: builtin/checkout.c:646 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:644 +#: builtin/checkout.c:649 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:648 +#: builtin/checkout.c:653 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:650 builtin/checkout.c:987 +#: builtin/checkout.c:655 builtin/checkout.c:997 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:652 +#: builtin/checkout.c:657 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:708 +#: builtin/checkout.c:713 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" #. The singular version -#: builtin/checkout.c:714 +#: builtin/checkout.c:719 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3150,7 +3245,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:737 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3165,136 +3260,136 @@ msgstr "" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:762 +#: builtin/checkout.c:767 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:766 +#: builtin/checkout.c:771 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:793 builtin/checkout.c:982 +#: builtin/checkout.c:798 builtin/checkout.c:992 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #. case (1) -#: builtin/checkout.c:918 +#: builtin/checkout.c:928 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" #. case (1): want a tree -#: builtin/checkout.c:957 +#: builtin/checkout.c:967 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1006 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:999 builtin/checkout.c:1003 +#: builtin/checkout.c:1009 builtin/checkout.c:1013 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025 +#: builtin/checkout.c:1028 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1033 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90 +#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1046 +#: builtin/checkout.c:1056 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1058 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1049 +#: builtin/checkout.c:1059 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1050 +#: builtin/checkout.c:1060 msgid "detach the HEAD at named commit" msgstr "成为指向该提交的分离头指针" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:1061 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1063 msgid "new branch" msgstr "新分支" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1063 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1054 +#: builtin/checkout.c:1064 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1066 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1068 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1069 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三路合并" -#: builtin/checkout.c:1060 builtin/merge.c:217 +#: builtin/checkout.c:1070 builtin/merge.c:232 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 +#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249 msgid "style" msgstr "风格" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1072 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1065 +#: builtin/checkout.c:1075 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1067 +#: builtin/checkout.c:1077 msgid "second guess 'git checkout no-such-branch'" msgstr "再者猜测'git checkout no-such-branch'" -#: builtin/checkout.c:1091 +#: builtin/checkout.c:1101 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1118 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1125 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3303,227 +3398,330 @@ msgstr "" "不能同时更新路径并切换到分支'%s'。\n" "您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1172 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/clean.c:20 -msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." +#: builtin/clean.c:25 +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." -#: builtin/clean.c:24 +#: builtin/clean.c:29 #, c-format msgid "Removing %s\n" msgstr "正删除 %s\n" -#: builtin/clean.c:25 +#: builtin/clean.c:30 #, c-format msgid "Would remove %s\n" msgstr "将删除 %s\n" -#: builtin/clean.c:26 +#: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" msgstr "忽略版本库 %s\n" -#: builtin/clean.c:27 +#: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略版本库 %s\n" -#: builtin/clean.c:28 +#: builtin/clean.c:33 #, c-format msgid "failed to remove %s" msgstr "无法删除 %s" -#: builtin/clean.c:160 +#: builtin/clean.c:293 +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing" +msgstr "" +"帮助：\n" +"1 - 通过编号选择一个选项\n" +"foo - 通过标题选择一个选项\n" +" - （空）什么也不选择" + +#: builtin/clean.c:297 +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting" +msgstr "" +"帮助：\n" +"1 - 选择一个选项\n" +"3-5 - 选择一个范围内的所有选项\n" +"2-3,6-9 - 选择多个范围内的所有选项\n" +"foo - 通过标题选择一个选项\n" +"-... - 反选特定的选项\n" +"* - 选择所有选项\n" +" - （空）结束选择" + +#: builtin/clean.c:491 +#, c-format +msgid "Huh (%s)?" +msgstr "嗯（%s）？" + +#: builtin/clean.c:634 +#, c-format +msgid "Input ignore patterns>> " +msgstr "输入模版以排除条目>> " + +#: builtin/clean.c:671 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "警告：无法找到和 %s 匹配的条目" + +#: builtin/clean.c:692 +msgid "Select items to delete" +msgstr "选择要删除的条目" + +#: builtin/clean.c:732 +#, c-format +msgid "remove %s? " +msgstr "删除 %s？" + +#: builtin/clean.c:757 +msgid "Bye." +msgstr "再见。" + +#: builtin/clean.c:765 +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "" +"clean - 开始清理\n" +"filter by pattern - 通过模版排除要删除的条目\n" +"select by numbers - 通过数字选择要删除的条目\n" +"ask each - 针对删除逐一询问（就像 \"rm -i\"）\n" +"quit - 停止删除并退出\n" +"help - 显示本帮助\n" +"? - 显示如何在提示符下选择的帮助" + +#: builtin/clean.c:792 +msgid "*** Commands ***" +msgstr "*** 命令 ***" + +#: builtin/clean.c:793 +msgid "What now" +msgstr "请选择" + +#: builtin/clean.c:801 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "将删除如下条目：" +msgstr[1] "将删除如下条目：" + +#: builtin/clean.c:818 +msgid "No more files to clean, exiting." +msgstr "没有要清理的文件，退出。" + +#: builtin/clean.c:850 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:162 +#: builtin/clean.c:852 msgid "force" msgstr "强制" -#: builtin/clean.c:164 +#: builtin/clean.c:853 +msgid "interactive cleaning" +msgstr "交互式清除" + +#: builtin/clean.c:855 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 -#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:856 builtin/describe.c:420 builtin/grep.c:716 +#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186 msgid "pattern" msgstr "模式" -#: builtin/clean.c:166 +#: builtin/clean.c:857 msgid "add <pattern> to ignore rules" msgstr "添加<模式>到忽略规则" -#: builtin/clean.c:167 +#: builtin/clean.c:858 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:169 +#: builtin/clean.c:860 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:187 +#: builtin/clean.c:878 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:191 +#: builtin/clean.c:882 msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean" msgstr "" -"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" +"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:194 +#: builtin/clean.c:885 msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" +"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"refusing to clean" msgstr "" -"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" +"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clone.c:37 +#: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [选项] [--] <版本库> [<路径>]" -#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 -#: builtin/push.c:436 +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229 +#: builtin/push.c:462 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/clone.c:67 +#: builtin/clone.c:66 msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 msgid "create a bare repository" msgstr "创建一个裸版本库" -#: builtin/clone.c:73 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜像版本库（也是裸版本库）" -#: builtin/clone.c:75 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "从本地版本库克隆" -#: builtin/clone.c:77 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" -#: builtin/clone.c:79 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "设置为共享版本库" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c:84 builtin/init-db.c:485 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:85 builtin/init-db.c:486 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:87 +#: builtin/clone.c:86 msgid "reference repository" msgstr "引用版本库" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "名称" -#: builtin/clone.c:89 +#: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用<名称>而不是 'origin' 去跟踪上游" -#: builtin/clone.c:91 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出<分支>而不是远程HEAD" -#: builtin/clone.c:93 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661 msgid "depth" msgstr "深度" -#: builtin/clone.c:95 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:97 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:98 builtin/init-db.c:494 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:99 builtin/init-db.c:495 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:101 +#: builtin/clone.c:100 msgid "set config inside the new repository" msgstr "在新版本库中设置配置信息" -#: builtin/clone.c:254 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "引用版本库 '%s' 不是一个本地版本库。" -#: builtin/clone.c:317 +#: builtin/clone.c:316 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/clone.c:319 builtin/diff.c:77 +#: builtin/clone.c:318 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "无法枚举 '%s' 状态" -#: builtin/clone.c:321 +#: builtin/clone.c:320 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:335 +#: builtin/clone.c:334 #, c-format msgid "failed to stat %s\n" msgstr "无法枚举 %s 状态\n" -#: builtin/clone.c:357 +#: builtin/clone.c:356 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c:361 +#: builtin/clone.c:360 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:397 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -3533,90 +3731,104 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git checkout -f HEAD' 重试\n" -#: builtin/clone.c:476 +#: builtin/clone.c:475 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:550 +#: builtin/clone.c:555 +#, c-format +msgid "Checking connectivity... " +msgstr "检查连接... " + +#: builtin/clone.c:558 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必须的对象" -#: builtin/clone.c:610 +#: builtin/clone.c:560 +#, c-format +msgid "done\n" +msgstr "完成\n" + +#: builtin/clone.c:621 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:641 +#: builtin/clone.c:652 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:749 +#: builtin/clone.c:760 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:753 +#: builtin/clone.c:764 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" -#: builtin/clone.c:764 +#: builtin/clone.c:775 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:767 +#: builtin/clone.c:778 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:780 +#: builtin/clone.c:791 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:785 +#: builtin/clone.c:796 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:795 +#: builtin/clone.c:798 +msgid "--local is ignored" +msgstr "--local 被忽略" + +#: builtin/clone.c:808 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:805 +#: builtin/clone.c:818 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:818 builtin/clone.c:830 +#: builtin/clone.c:831 builtin/clone.c:843 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:821 +#: builtin/clone.c:834 #, c-format msgid "could not create work tree dir '%s'." msgstr "不能为 '%s' 创建工作区目录。" -#: builtin/clone.c:840 +#: builtin/clone.c:853 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" -#: builtin/clone.c:842 +#: builtin/clone.c:855 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:877 +#: builtin/clone.c:890 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:926 +#: builtin/clone.c:942 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:933 +#: builtin/clone.c:949 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" @@ -3652,15 +3864,15 @@ msgstr "两列之间的填充空间" msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit.c:34 +#: builtin/commit.c:35 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [选项] [--] <路径匹配>..." -#: builtin/commit.c:39 +#: builtin/commit.c:40 msgid "git status [options] [--] <pathspec>..." msgstr "git status [选项] [--] <路径匹配>..." -#: builtin/commit.c:44 +#: builtin/commit.c:45 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3683,7 +3895,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:56 +#: builtin/commit.c:57 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -3692,7 +3904,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -3708,93 +3920,93 @@ msgstr "" "\n" "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:260 +#: builtin/commit.c:265 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:302 +#: builtin/commit.c:307 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:308 +#: builtin/commit.c:313 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 +#: builtin/commit.c:346 builtin/commit.c:367 builtin/commit.c:417 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:393 +#: builtin/commit.c:398 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:395 +#: builtin/commit.c:400 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:405 +#: builtin/commit.c:410 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:425 +#: builtin/commit.c:430 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:513 builtin/commit.c:519 +#: builtin/commit.c:521 builtin/commit.c:527 #, c-format msgid "invalid commit: %s" msgstr "无效的提交：%s" -#: builtin/commit.c:542 +#: builtin/commit.c:549 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:562 +#: builtin/commit.c:569 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串：'%s'" -#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 +#: builtin/commit.c:607 builtin/commit.c:640 builtin/commit.c:963 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:612 builtin/shortlog.c:270 +#: builtin/commit.c:619 builtin/shortlog.c:271 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:614 +#: builtin/commit.c:621 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:618 +#: builtin/commit.c:625 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:624 +#: builtin/commit.c:631 msgid "commit has empty message" msgstr "提交说明为空" -#: builtin/commit.c:640 +#: builtin/commit.c:647 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:644 +#: builtin/commit.c:651 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:648 +#: builtin/commit.c:655 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/commit.c:709 +#: builtin/commit.c:716 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:720 +#: builtin/commit.c:727 #, c-format msgid "" "\n" @@ -3808,7 +4020,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:725 +#: builtin/commit.c:732 #, c-format msgid "" "\n" @@ -3822,7 +4034,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:737 +#: builtin/commit.c:744 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -3831,7 +4043,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:742 +#: builtin/commit.c:749 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -3842,355 +4054,355 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:755 +#: builtin/commit.c:762 #, c-format msgid "%sAuthor: %s" msgstr "%s作者： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:762 +#: builtin/commit.c:769 #, c-format msgid "%sCommitter: %s" msgstr "%s提交者： %s" -#: builtin/commit.c:782 +#: builtin/commit.c:789 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:819 +#: builtin/commit.c:826 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:834 builtin/tag.c:359 +#: builtin/commit.c:841 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:931 +#: builtin/commit.c:938 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" -#: builtin/commit.c:946 builtin/commit.c:1140 +#: builtin/commit.c:953 builtin/commit.c:1189 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:976 +#: builtin/commit.c:990 +msgid "--long and -z are incompatible" +msgstr "--long 和 -z 选项不兼容" + +#: builtin/commit.c:1020 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:987 +#: builtin/commit.c:1031 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:990 +#: builtin/commit.c:1034 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:992 +#: builtin/commit.c:1036 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:995 +#: builtin/commit.c:1039 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1005 +#: builtin/commit.c:1049 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1007 +#: builtin/commit.c:1051 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1015 +#: builtin/commit.c:1059 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1032 +#: builtin/commit.c:1076 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1034 +#: builtin/commit.c:1078 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1036 +#: builtin/commit.c:1080 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1038 +#: builtin/commit.c:1082 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." -#: builtin/commit.c:1048 builtin/tag.c:575 +#: builtin/commit.c:1092 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1053 +#: builtin/commit.c:1097 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1059 builtin/commit.c:1194 -msgid "--long and -z are incompatible" -msgstr "--long 和 -z 选项不兼容" - -#: builtin/commit.c:1154 builtin/commit.c:1390 +#: builtin/commit.c:1203 builtin/commit.c:1436 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1156 builtin/commit.c:1392 +#: builtin/commit.c:1205 builtin/commit.c:1438 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 +#: builtin/commit.c:1207 builtin/commit.c:1440 builtin/push.c:452 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1161 builtin/commit.c:1396 +#: builtin/commit.c:1210 builtin/commit.c:1442 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1164 builtin/commit.c:1399 +#: builtin/commit.c:1213 builtin/commit.c:1445 msgid "terminate entries with NUL" msgstr "条目以NUL字符结尾" -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 -#: builtin/fast-export.c:662 builtin/tag.c:459 +#: builtin/commit.c:1215 builtin/commit.c:1448 builtin/fast-export.c:667 +#: builtin/fast-export.c:670 builtin/tag.c:459 msgid "mode" msgstr "模式" -#: builtin/commit.c:1167 builtin/commit.c:1402 +#: builtin/commit.c:1216 builtin/commit.c:1448 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1170 +#: builtin/commit.c:1219 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1171 parse-options.h:151 +#: builtin/commit.c:1220 parse-options.h:154 msgid "when" msgstr "何时" -#: builtin/commit.c:1172 +#: builtin/commit.c:1221 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1174 +#: builtin/commit.c:1223 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1248 +#: builtin/commit.c:1294 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1250 +#: builtin/commit.c:1296 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1291 +#: builtin/commit.c:1337 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1293 +#: builtin/commit.c:1339 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1360 +#: builtin/commit.c:1406 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1361 +#: builtin/commit.c:1407 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1363 +#: builtin/commit.c:1409 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1364 builtin/tag.c:457 +#: builtin/commit.c:1410 builtin/tag.c:457 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1365 +#: builtin/commit.c:1411 msgid "author" msgstr "作者" -#: builtin/commit.c:1365 +#: builtin/commit.c:1411 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1366 builtin/gc.c:178 +#: builtin/commit.c:1412 builtin/gc.c:178 msgid "date" msgstr "日期" -#: builtin/commit.c:1366 +#: builtin/commit.c:1412 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 -#: builtin/notes.c:690 builtin/tag.c:455 +#: builtin/commit.c:1413 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "说明" -#: builtin/commit.c:1367 +#: builtin/commit.c:1413 msgid "commit message" msgstr "提交说明" -#: builtin/commit.c:1368 +#: builtin/commit.c:1414 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1369 +#: builtin/commit.c:1415 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1370 +#: builtin/commit.c:1416 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1371 +#: builtin/commit.c:1417 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1372 +#: builtin/commit.c:1418 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109 +#: builtin/commit.c:1419 builtin/log.c:1160 builtin/revert.c:111 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1374 +#: builtin/commit.c:1420 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1375 +#: builtin/commit.c:1421 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1376 +#: builtin/commit.c:1422 msgid "default" msgstr "default" -#: builtin/commit.c:1376 builtin/tag.c:460 +#: builtin/commit.c:1422 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1377 +#: builtin/commit.c:1423 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 +#: builtin/commit.c:1424 builtin/merge.c:230 builtin/tag.c:461 msgid "key id" msgstr "key id" -#: builtin/commit.c:1379 builtin/merge.c:216 +#: builtin/commit.c:1425 builtin/merge.c:231 msgid "GPG sign commit" msgstr "GPG 提交签名" #. end commit message options -#: builtin/commit.c:1382 +#: builtin/commit.c:1428 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1383 +#: builtin/commit.c:1429 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1384 +#: builtin/commit.c:1430 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1385 +#: builtin/commit.c:1431 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1386 +#: builtin/commit.c:1432 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1387 +#: builtin/commit.c:1433 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1388 +#: builtin/commit.c:1434 msgid "bypass pre-commit hook" msgstr "绕过 pre-commit 钩子" -#: builtin/commit.c:1389 +#: builtin/commit.c:1435 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1400 +#: builtin/commit.c:1446 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1401 +#: builtin/commit.c:1447 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1406 +#: builtin/commit.c:1452 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1409 +#: builtin/commit.c:1455 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1441 +#: builtin/commit.c:1488 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1479 builtin/merge.c:510 +#: builtin/commit.c:1526 builtin/merge.c:525 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1486 +#: builtin/commit.c:1533 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1493 +#: builtin/commit.c:1540 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1512 +#: builtin/commit.c:1559 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1526 +#: builtin/commit.c:1573 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1531 +#: builtin/commit.c:1578 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 +#: builtin/commit.c:1593 builtin/merge.c:861 builtin/merge.c:886 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1567 +#: builtin/commit.c:1614 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" -#: builtin/commit.c:1571 +#: builtin/commit.c:1618 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" -#: builtin/commit.c:1582 +#: builtin/commit.c:1629 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4203,115 +4415,123 @@ msgstr "" msgid "git config [options]" msgstr "git config [选项]" -#: builtin/config.c:51 +#: builtin/config.c:52 msgid "Config file location" msgstr "配置文件位置" -#: builtin/config.c:52 +#: builtin/config.c:53 msgid "use global config file" msgstr "使用全局配置文件" -#: builtin/config.c:53 +#: builtin/config.c:54 msgid "use system config file" msgstr "使用系统级配置文件" -#: builtin/config.c:54 +#: builtin/config.c:55 msgid "use repository config file" msgstr "使用版本库级配置文件" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "use given config file" msgstr "使用指定的配置文件" -#: builtin/config.c:56 +#: builtin/config.c:57 +msgid "blob-id" +msgstr "数据对象ID" + +#: builtin/config.c:57 +msgid "read config from given blob object" +msgstr "从给定的数据对象读取配置" + +#: builtin/config.c:58 msgid "Action" msgstr "操作" -#: builtin/config.c:57 +#: builtin/config.c:59 msgid "get value: name [value-regex]" msgstr "获取值：name [value-regex]" -#: builtin/config.c:58 +#: builtin/config.c:60 msgid "get all values: key [value-regex]" msgstr "获得所有的值：key [value-regex]" -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "get values for regexp: name-regex [value-regex]" msgstr "根据正则表达式获得值：name-regex [value-regex]" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "replace all matching variables: name value [value_regex]" msgstr "替换所有匹配的变量：name value [value_regex]" -#: builtin/config.c:61 +#: builtin/config.c:63 msgid "add a new variable: name value" msgstr "添加一个新的变量：name value" -#: builtin/config.c:62 +#: builtin/config.c:64 msgid "remove a variable: name [value-regex]" msgstr "删除一个变量：name [value-regex]" -#: builtin/config.c:63 +#: builtin/config.c:65 msgid "remove all matches: name [value-regex]" msgstr "删除所有匹配项：name [value-regex]" -#: builtin/config.c:64 +#: builtin/config.c:66 msgid "rename section: old-name new-name" msgstr "重命名小节：old-name new-name" -#: builtin/config.c:65 +#: builtin/config.c:67 msgid "remove a section: name" msgstr "删除一个小节：name" -#: builtin/config.c:66 +#: builtin/config.c:68 msgid "list all" msgstr "列出所有" -#: builtin/config.c:67 +#: builtin/config.c:69 msgid "open an editor" msgstr "打开一个编辑器" -#: builtin/config.c:68 builtin/config.c:69 +#: builtin/config.c:70 builtin/config.c:71 msgid "slot" msgstr "slot" -#: builtin/config.c:68 +#: builtin/config.c:70 msgid "find the color configured: [default]" msgstr "找到配置的颜色：[默认]" -#: builtin/config.c:69 +#: builtin/config.c:71 msgid "find the color setting: [stdout-is-tty]" msgstr "找到颜色设置：[stdout-is-tty]" -#: builtin/config.c:70 +#: builtin/config.c:72 msgid "Type" msgstr "类型" -#: builtin/config.c:71 +#: builtin/config.c:73 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:72 +#: builtin/config.c:74 msgid "value is decimal number" msgstr "值是十进制数" -#: builtin/config.c:73 +#: builtin/config.c:75 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:74 +#: builtin/config.c:76 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" -#: builtin/config.c:75 +#: builtin/config.c:77 msgid "Other" msgstr "其它" -#: builtin/config.c:76 +#: builtin/config.c:78 msgid "terminate values with NUL byte" msgstr "终止值是NUL字节" -#: builtin/config.c:77 +#: builtin/config.c:79 msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" @@ -4323,55 +4543,55 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" -#: builtin/describe.c:15 +#: builtin/describe.c:16 msgid "git describe [options] <committish>*" msgstr "git describe [选项] <提交号>*" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] --dirty" msgstr "git describe [选项] --dirty" -#: builtin/describe.c:233 +#: builtin/describe.c:237 #, c-format msgid "annotated tag %s not available" msgstr "注释 tag %s 无效" -#: builtin/describe.c:237 +#: builtin/describe.c:241 #, c-format msgid "annotated tag %s has no embedded name" msgstr "注释 tag %s 没有嵌入名称" -#: builtin/describe.c:239 +#: builtin/describe.c:243 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' 的确是在 '%s'" -#: builtin/describe.c:266 +#: builtin/describe.c:270 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c:269 +#: builtin/describe.c:273 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: builtin/describe.c:286 +#: builtin/describe.c:290 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有 tag 准确匹配 '%s'" -#: builtin/describe.c:288 +#: builtin/describe.c:292 #, c-format msgid "searching to describe %s\n" msgstr "搜索描述 %s\n" -#: builtin/describe.c:328 +#: builtin/describe.c:332 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c:352 +#: builtin/describe.c:359 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4380,7 +4600,7 @@ msgstr "" "没有注释 tag 能描述 '%s'。\n" "然而，有非注释 tag：尝试 --tags。" -#: builtin/describe.c:356 +#: builtin/describe.c:363 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4389,12 +4609,12 @@ msgstr "" "没有注释 tag 能描述 '%s'。\n" "尝试 --always，或者创建一些 tag。" -#: builtin/describe.c:377 +#: builtin/describe.c:384 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c:380 +#: builtin/describe.c:387 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -4403,59 +4623,63 @@ msgstr "" "发现多于 %i 个 tag，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c:402 +#: builtin/describe.c:409 msgid "find the tag that comes after the commit" msgstr "寻找提交之后的 tag（用于描述提交）" -#: builtin/describe.c:403 +#: builtin/describe.c:410 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" -#: builtin/describe.c:404 +#: builtin/describe.c:411 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:405 +#: builtin/describe.c:412 msgid "use any tag, even unannotated" msgstr "使用任意 tag，即使未带注解" -#: builtin/describe.c:406 +#: builtin/describe.c:413 msgid "always use long format" msgstr "始终使用长提交号格式" -#: builtin/describe.c:409 +#: builtin/describe.c:414 +msgid "only follow first parent" +msgstr "只跟随第一个父提交" + +#: builtin/describe.c:417 msgid "only output exact matches" msgstr "只输出精确匹配" -#: builtin/describe.c:411 +#: builtin/describe.c:419 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> 个 tags（默认：10）" -#: builtin/describe.c:413 +#: builtin/describe.c:421 msgid "only consider tags matching <pattern>" msgstr "只考虑匹配 <模式> 的 tags" -#: builtin/describe.c:415 builtin/name-rev.c:238 +#: builtin/describe.c:423 builtin/name-rev.c:322 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" -#: builtin/describe.c:416 +#: builtin/describe.c:424 msgid "mark" msgstr "标记" -#: builtin/describe.c:417 +#: builtin/describe.c:425 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）" -#: builtin/describe.c:435 +#: builtin/describe.c:443 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" -#: builtin/describe.c:461 +#: builtin/describe.c:469 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:481 +#: builtin/describe.c:489 msgid "--dirty is incompatible with committishes" msgstr "--dirty 不能与提交同时使用" @@ -4464,31 +4688,26 @@ msgstr "--dirty 不能与提交同时使用" msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:228 +#: builtin/diff.c:230 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:305 +#: builtin/diff.c:307 msgid "Not a git repository" msgstr "不是一个 git 版本库" -#: builtin/diff.c:348 +#: builtin/diff.c:350 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:353 -#, c-format -msgid "more than %d trees given: '%s'" -msgstr "提供了超过 %d 个树对象：'%s'" - -#: builtin/diff.c:363 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据（blob）对象：'%s'" -#: builtin/diff.c:371 +#: builtin/diff.c:366 #, c-format msgid "unhandled object '%s' given." msgstr "提供了无法处理的对象 '%s'。" @@ -4497,39 +4716,39 @@ msgstr "提供了无法处理的对象 '%s'。" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:658 +#: builtin/fast-export.c:666 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之后显示进度" -#: builtin/fast-export.c:660 +#: builtin/fast-export.c:668 msgid "select handling of signed tags" msgstr "选择如何处理签名 tags" -#: builtin/fast-export.c:663 +#: builtin/fast-export.c:671 msgid "select handling of tags that tag filtered objects" msgstr "选择当 tag 指向被过滤时 tags 的处理方式" -#: builtin/fast-export.c:666 +#: builtin/fast-export.c:674 msgid "Dump marks to this file" msgstr "把标记存储到这个文件" -#: builtin/fast-export.c:668 +#: builtin/fast-export.c:676 msgid "Import marks from this file" msgstr "从这个文件导入标记" -#: builtin/fast-export.c:670 +#: builtin/fast-export.c:678 msgid "Fake a tagger when tags lack one" msgstr "当 tags 缺少标记者字段时，假装提供一个" -#: builtin/fast-export.c:672 +#: builtin/fast-export.c:680 msgid "Output full tree for each commit" msgstr "每次提交都输出整个树" -#: builtin/fast-export.c:674 +#: builtin/fast-export.c:682 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" -#: builtin/fast-export.c:675 +#: builtin/fast-export.c:683 msgid "Skip output of blob data" msgstr "跳过数据对象的输出" @@ -4606,7 +4825,7 @@ msgstr "深化浅克隆的历史" msgid "convert to a complete repository" msgstr "转换为一个完整的版本库" -#: builtin/fetch.c:88 builtin/log.c:1130 +#: builtin/fetch.c:88 builtin/log.c:1177 msgid "dir" msgstr "目录" @@ -4618,77 +4837,77 @@ msgstr "在子模组路径输出的前面加上此目录" msgid "default mode for recursion" msgstr "递归的默认模式" -#: builtin/fetch.c:204 +#: builtin/fetch.c:220 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:257 +#: builtin/fetch.c:273 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:262 +#: builtin/fetch.c:278 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:276 +#: builtin/fetch.c:292 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）" -#: builtin/fetch.c:277 builtin/fetch.c:363 +#: builtin/fetch.c:293 builtin/fetch.c:379 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:288 +#: builtin/fetch.c:304 msgid "[tag update]" msgstr "[tag更新]" # 译者：注意保持前导空格 -#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 +#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359 msgid " (unable to update local ref)" msgstr " （不能更新本地引用）" -#: builtin/fetch.c:308 +#: builtin/fetch.c:324 msgid "[new tag]" msgstr "[新tag]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:327 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:314 +#: builtin/fetch.c:330 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:359 +#: builtin/fetch.c:375 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:359 +#: builtin/fetch.c:375 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:365 +#: builtin/fetch.c:381 msgid "(non-fast-forward)" msgstr "（非快进式）" -#: builtin/fetch.c:396 builtin/fetch.c:688 +#: builtin/fetch.c:412 builtin/fetch.c:718 #, c-format msgid "cannot open %s: %s\n" msgstr "无法打开 %s：%s\n" -#: builtin/fetch.c:405 +#: builtin/fetch.c:421 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:491 +#: builtin/fetch.c:520 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:502 +#: builtin/fetch.c:531 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -4698,87 +4917,87 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:552 +#: builtin/fetch.c:581 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:553 +#: builtin/fetch.c:582 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:560 +#: builtin/fetch.c:589 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:561 builtin/remote.c:1055 +#: builtin/fetch.c:590 builtin/remote.c:1055 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:678 +#: builtin/fetch.c:708 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非裸版本库的当前分支 %s" -#: builtin/fetch.c:712 +#: builtin/fetch.c:742 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:789 +#: builtin/fetch.c:823 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:792 +#: builtin/fetch.c:826 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:894 +#: builtin/fetch.c:928 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:896 builtin/remote.c:100 +#: builtin/fetch.c:930 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:915 +#: builtin/fetch.c:949 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" -#: builtin/fetch.c:935 +#: builtin/fetch.c:969 msgid "You need to specify a tag name." msgstr "您需要指定一个 tag 名称。" -#: builtin/fetch.c:981 +#: builtin/fetch.c:1015 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:983 +#: builtin/fetch.c:1017 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的版本库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1036 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个版本库参数" -#: builtin/fetch.c:1004 +#: builtin/fetch.c:1038 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用表达式没有任何意义" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1049 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1023 +#: builtin/fetch.c:1057 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用表达式没有意义" @@ -4787,9 +5006,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701 -#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243 msgid "n" msgstr "n" @@ -4946,221 +5165,221 @@ msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]" msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" -#: builtin/grep.c:365 +#: builtin/grep.c:364 #, c-format msgid "Failed to chdir: %s" msgstr "无法切换目录：%s" -#: builtin/grep.c:443 builtin/grep.c:478 +#: builtin/grep.c:442 builtin/grep.c:477 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:493 +#: builtin/grep.c:492 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:551 +#: builtin/grep.c:550 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:568 +#: builtin/grep.c:567 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/grep.c:643 +#: builtin/grep.c:642 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:645 +#: builtin/grep.c:644 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:647 +#: builtin/grep.c:646 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:649 +#: builtin/grep.c:648 msgid "search also in ignored files" msgstr "也在忽略的文件中搜索" -#: builtin/grep.c:652 +#: builtin/grep.c:651 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:654 +#: builtin/grep.c:653 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:656 +#: builtin/grep.c:655 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:658 +#: builtin/grep.c:657 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:660 +#: builtin/grep.c:659 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:663 +#: builtin/grep.c:662 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:667 +#: builtin/grep.c:666 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:670 +#: builtin/grep.c:669 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:673 +#: builtin/grep.c:672 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:676 +#: builtin/grep.c:675 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:679 +#: builtin/grep.c:678 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:680 +#: builtin/grep.c:679 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:681 +#: builtin/grep.c:680 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:683 +#: builtin/grep.c:682 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:685 +#: builtin/grep.c:684 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:687 +#: builtin/grep.c:686 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:690 +#: builtin/grep.c:689 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:692 +#: builtin/grep.c:691 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:694 +#: builtin/grep.c:693 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:695 +#: builtin/grep.c:694 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:697 +#: builtin/grep.c:696 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:699 +#: builtin/grep.c:698 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:702 +#: builtin/grep.c:701 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:705 +#: builtin/grep.c:704 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:707 +#: builtin/grep.c:706 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:708 +#: builtin/grep.c:707 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:711 +#: builtin/grep.c:710 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:713 +#: builtin/grep.c:712 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:716 +#: builtin/grep.c:715 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:718 +#: builtin/grep.c:717 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:720 +#: builtin/grep.c:719 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:732 +#: builtin/grep.c:731 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:734 +#: builtin/grep.c:733 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:736 +#: builtin/grep.c:735 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:740 +#: builtin/grep.c:739 msgid "pager" msgstr "分页" -#: builtin/grep.c:740 +#: builtin/grep.c:739 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:743 +#: builtin/grep.c:742 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:744 builtin/show-ref.c:184 +#: builtin/grep.c:743 builtin/show-ref.c:188 msgid "show usage" msgstr "显示用法" -#: builtin/grep.c:811 +#: builtin/grep.c:810 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:866 +#: builtin/grep.c:865 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本同时使用。" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:905 +#: builtin/grep.c:904 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" @@ -5200,54 +5419,54 @@ msgstr "原样存储文件不使用过滤器" msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" -#: builtin/help.c:43 +#: builtin/help.c:41 msgid "print all available commands" msgstr "打印所有可用的命令" -#: builtin/help.c:44 +#: builtin/help.c:42 msgid "print list of useful guides" msgstr "显示有用的指南列表" -#: builtin/help.c:45 +#: builtin/help.c:43 msgid "show man page" msgstr "显示 man 手册" -#: builtin/help.c:46 +#: builtin/help.c:44 msgid "show manual in web browser" msgstr "在 web 浏览器中显示手册" -#: builtin/help.c:48 +#: builtin/help.c:46 msgid "show info page" msgstr "显示 info 手册" -#: builtin/help.c:54 +#: builtin/help.c:52 msgid "git help [--all] [--guides] [--man|--web|--info] [command]" msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]" -#: builtin/help.c:66 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:94 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:107 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:115 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "无法执行 '%s'：%s" -#: builtin/help.c:218 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -5256,7 +5475,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<tool>.cmd'。" -#: builtin/help.c:230 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -5265,335 +5484,335 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" -#: builtin/help.c:351 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:368 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:376 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:422 +#: builtin/help.c:420 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: builtin/help.c:423 +#: builtin/help.c:421 msgid "A Git glossary" msgstr "Git 词汇表" -#: builtin/help.c:424 +#: builtin/help.c:422 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: builtin/help.c:425 +#: builtin/help.c:423 msgid "Defining submodule properties" msgstr "定义子模组属性" -#: builtin/help.c:426 +#: builtin/help.c:424 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: builtin/help.c:427 +#: builtin/help.c:425 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "一个 Git 教程（针对 1.5.1 或更新版本）" -#: builtin/help.c:428 +#: builtin/help.c:426 msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" -#: builtin/help.c:440 +#: builtin/help.c:438 msgid "The common Git guides are:\n" msgstr "最常用的 Git 向导有：\n" -#: builtin/help.c:462 builtin/help.c:478 +#: builtin/help.c:460 builtin/help.c:476 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:494 +#: builtin/help.c:492 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" -#: builtin/index-pack.c:182 +#: builtin/index-pack.c:184 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c:202 +#: builtin/index-pack.c:204 msgid "object of unexpected type" msgstr "意外的类型的对象" -#: builtin/index-pack.c:239 +#: builtin/index-pack.c:244 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:254 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c:255 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:262 +#: builtin/index-pack.c:267 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:274 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:285 +#: builtin/index-pack.c:290 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:295 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:309 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:306 +#: builtin/index-pack.c:311 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:329 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "包中有错误的对象位于 %lu：%s" -#: builtin/index-pack.c:446 +#: builtin/index-pack.c:451 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:495 +#: builtin/index-pack.c:500 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:503 +#: builtin/index-pack.c:508 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:516 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:542 +#: builtin/index-pack.c:547 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:549 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "包文件过早结束，缺少 %lu 字节" msgstr[1] "包文件过早结束，缺少 %lu 字节" -#: builtin/index-pack.c:570 +#: builtin/index-pack.c:575 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 -#: builtin/index-pack.c:724 builtin/index-pack.c:733 +#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 +#: builtin/index-pack.c:729 builtin/index-pack.c:738 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:664 builtin/pack-objects.c:170 +#: builtin/index-pack.c:669 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:730 +#: builtin/index-pack.c:735 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:744 +#: builtin/index-pack.c:749 #, c-format msgid "invalid blob object %s" msgstr "无效的数据（blob）对象 %s" -#: builtin/index-pack.c:759 +#: builtin/index-pack.c:763 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/index-pack.c:761 +#: builtin/index-pack.c:766 msgid "Error in object" msgstr "对象中出错" -#: builtin/index-pack.c:763 +#: builtin/index-pack.c:768 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:833 builtin/index-pack.c:863 +#: builtin/index-pack.c:838 builtin/index-pack.c:868 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c:1004 +#: builtin/index-pack.c:1009 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1004 +#: builtin/index-pack.c:1009 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1030 +#: builtin/index-pack.c:1035 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1035 +#: builtin/index-pack.c:1040 msgid "cannot fstat packfile" msgstr "不能枚举包文件状态" -#: builtin/index-pack.c:1038 +#: builtin/index-pack.c:1043 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1049 +#: builtin/index-pack.c:1054 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1072 +#: builtin/index-pack.c:1077 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1082 +#: builtin/index-pack.c:1087 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1129 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1132 +#: builtin/index-pack.c:1137 #, c-format msgid "completed with %d local objects" msgstr "完成 %d 个本地对象" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1147 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1151 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1176 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1255 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1279 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1292 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1300 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1308 +#: builtin/index-pack.c:1313 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1319 +#: builtin/index-pack.c:1324 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1352 +#: builtin/index-pack.c:1357 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1358 +#: builtin/index-pack.c:1363 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/index-pack.c:1362 builtin/index-pack.c:1535 +#: builtin/index-pack.c:1367 builtin/index-pack.c:1545 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1425 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1422 +#: builtin/index-pack.c:1427 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1474 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1481 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1509 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1547 builtin/index-pack.c:1550 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1566 +#: builtin/index-pack.c:1557 builtin/index-pack.c:1560 +#: builtin/index-pack.c:1572 builtin/index-pack.c:1576 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1580 +#: builtin/index-pack.c:1590 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1584 builtin/index-pack.c:1594 +#: builtin/index-pack.c:1594 builtin/index-pack.c:1604 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1613 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包名参数" @@ -5730,7 +5949,7 @@ msgstr "权限" msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本库是多个用户之间共享的" -#: builtin/init-db.c:493 builtin/prune-packed.c:77 +#: builtin/init-db.c:493 builtin/prune-packed.c:75 msgid "be quiet" msgstr "保持安静" @@ -5762,340 +5981,353 @@ msgstr "不能访问当前工作目录" msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/log.c:40 +#: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n" -#: builtin/log.c:41 +#: builtin/log.c:42 msgid " or: git show [options] <object>..." msgstr " 或者：git show [选项] <对象>..." -#: builtin/log.c:103 +#: builtin/log.c:124 msgid "suppress diff output" msgstr "不显示差异输出" -#: builtin/log.c:104 +#: builtin/log.c:125 msgid "show source" msgstr "显示源" -#: builtin/log.c:105 +#: builtin/log.c:126 msgid "Use mail map file" msgstr "使用邮件映射文件" -#: builtin/log.c:106 +#: builtin/log.c:127 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:199 +#: builtin/log.c:230 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:422 builtin/log.c:514 +#: builtin/log.c:453 builtin/log.c:545 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:538 +#: builtin/log.c:569 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:638 +#: builtin/log.c:669 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:720 +#: builtin/log.c:751 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:736 +#: builtin/log.c:767 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:750 +#: builtin/log.c:781 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:758 +#: builtin/log.c:789 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:860 +#: builtin/log.c:891 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:936 +#: builtin/log.c:967 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:964 +#: builtin/log.c:995 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [选项] [<从> | <修订集范围>]" -#: builtin/log.c:1009 +#: builtin/log.c:1040 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1108 +#: builtin/log.c:1155 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1111 +#: builtin/log.c:1158 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1115 +#: builtin/log.c:1162 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1117 +#: builtin/log.c:1164 msgid "generate a cover letter" msgstr "生成一封附信" -#: builtin/log.c:1119 +#: builtin/log.c:1166 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1120 +#: builtin/log.c:1167 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1121 +#: builtin/log.c:1168 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1123 +#: builtin/log.c:1170 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1125 +#: builtin/log.c:1172 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1127 +#: builtin/log.c:1174 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1130 +#: builtin/log.c:1177 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <dir>" -#: builtin/log.c:1133 +#: builtin/log.c:1180 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1136 +#: builtin/log.c:1183 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1138 +#: builtin/log.c:1185 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1140 +#: builtin/log.c:1187 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1142 +#: builtin/log.c:1189 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1143 +#: builtin/log.c:1190 msgid "header" msgstr "header" -#: builtin/log.c:1144 +#: builtin/log.c:1191 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1145 builtin/log.c:1147 +#: builtin/log.c:1192 builtin/log.c:1194 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1145 +#: builtin/log.c:1192 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1147 +#: builtin/log.c:1194 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1149 +#: builtin/log.c:1196 +msgid "ident" +msgstr "ident" + +#: builtin/log.c:1197 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "设置 From 地址为 <ident>（如若不提供，用提交者ID做为地址）" + +#: builtin/log.c:1199 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1150 +#: builtin/log.c:1200 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <message-id> 的回复" -#: builtin/log.c:1151 builtin/log.c:1154 +#: builtin/log.c:1201 builtin/log.c:1204 msgid "boundary" msgstr "边界" -#: builtin/log.c:1152 +#: builtin/log.c:1202 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1155 +#: builtin/log.c:1205 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1159 +#: builtin/log.c:1209 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1161 +#: builtin/log.c:1211 msgid "signature" msgstr "签名" -#: builtin/log.c:1162 +#: builtin/log.c:1212 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1164 +#: builtin/log.c:1214 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1248 +#: builtin/log.c:1288 +#, c-format +msgid "invalid ident line: %s" +msgstr "包含无效的身份标识：%s" + +#: builtin/log.c:1303 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1250 +#: builtin/log.c:1305 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1258 +#: builtin/log.c:1313 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1260 +#: builtin/log.c:1315 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1262 +#: builtin/log.c:1317 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1285 +#: builtin/log.c:1340 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1287 +#: builtin/log.c:1342 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1435 +#: builtin/log.c:1490 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1484 +#: builtin/log.c:1539 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:1539 +#: builtin/log.c:1594 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" -#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 +#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" -#: builtin/ls-files.c:402 +#: builtin/ls-files.c:408 msgid "git ls-files [options] [<file>...]" msgstr "git ls-files [选项] [<文件>...]" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:465 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:467 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:469 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:471 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:473 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:475 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:477 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:480 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:482 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:484 msgid "show 'other' directories' name only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:481 +#: builtin/ls-files.c:487 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:484 +#: builtin/ls-files.c:490 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:492 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:494 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:491 +#: builtin/ls-files.c:497 msgid "exclude patterns are read from <file>" msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:494 +#: builtin/ls-files.c:500 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:496 +#: builtin/ls-files.c:502 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:499 +#: builtin/ls-files.c:505 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:508 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:509 msgid "tree-ish" msgstr "树或提交" -#: builtin/ls-files.c:504 +#: builtin/ls-files.c:510 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:512 msgid "show debugging data" msgstr "显示调试数据" @@ -6147,168 +6379,168 @@ msgstr "git merge [选项] <说明> HEAD <提交>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:90 +#: builtin/merge.c:98 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:127 +#: builtin/merge.c:135 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:128 +#: builtin/merge.c:136 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:133 +#: builtin/merge.c:141 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:183 +#: builtin/merge.c:198 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:186 +#: builtin/merge.c:201 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:187 +#: builtin/merge.c:202 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:189 +#: builtin/merge.c:204 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:192 +#: builtin/merge.c:207 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:194 +#: builtin/merge.c:209 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:196 +#: builtin/merge.c:211 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:198 +#: builtin/merge.c:212 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:200 +#: builtin/merge.c:214 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:203 +#: builtin/merge.c:218 msgid "Verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 +#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:205 +#: builtin/merge.c:220 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:206 +#: builtin/merge.c:221 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:207 +#: builtin/merge.c:222 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:209 +#: builtin/merge.c:224 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c:213 +#: builtin/merge.c:228 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" -#: builtin/merge.c:242 +#: builtin/merge.c:257 msgid "could not run stash." msgstr "不能进行进度保存。" -#: builtin/merge.c:247 +#: builtin/merge.c:262 msgid "stash failed" msgstr "进度保存失败" -#: builtin/merge.c:252 +#: builtin/merge.c:267 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:271 builtin/merge.c:288 +#: builtin/merge.c:286 builtin/merge.c:303 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 -#: builtin/merge.c:318 +#: builtin/merge.c:333 msgid " (nothing to squash)" msgstr " （无可压缩）" -#: builtin/merge.c:331 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:363 +#: builtin/merge.c:378 msgid "Writing SQUASH_MSG" msgstr "写入 SQUASH_MSG" -#: builtin/merge.c:365 +#: builtin/merge.c:380 msgid "Finishing SQUASH_MSG" msgstr "完成 SQUASH_MSG" -#: builtin/merge.c:388 +#: builtin/merge.c:403 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:438 +#: builtin/merge.c:453 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:550 +#: builtin/merge.c:565 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:643 +#: builtin/merge.c:657 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/merge.c:671 +#: builtin/merge.c:685 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:685 +#: builtin/merge.c:699 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:699 +#: builtin/merge.c:713 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:788 +#: builtin/merge.c:802 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:797 +#: builtin/merge.c:811 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:803 +#: builtin/merge.c:817 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6322,52 +6554,47 @@ msgstr "" "\n" "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:827 +#: builtin/merge.c:841 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:839 +#: builtin/merge.c:853 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:904 +#: builtin/merge.c:918 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:920 +#: builtin/merge.c:934 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:961 +#: builtin/merge.c:975 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:963 +#: builtin/merge.c:977 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程版本库。" -#: builtin/merge.c:965 +#: builtin/merge.c:979 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:970 +#: builtin/merge.c:984 #, c-format -msgid "No remote tracking branch for %s from %s" -msgstr "%s 没有来自 %s 的远程跟踪分支" +msgid "No remote-tracking branch for %s from %s" +msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1057 builtin/merge.c:1214 -#, c-format -msgid "%s - not something we can merge" -msgstr "%s - 不能被合并" - -#: builtin/merge.c:1125 +#: builtin/merge.c:1140 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1141 git-pull.sh:31 +#: builtin/merge.c:1156 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6375,11 +6602,11 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1144 git-pull.sh:34 +#: builtin/merge.c:1159 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: builtin/merge.c:1148 +#: builtin/merge.c:1163 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6387,100 +6614,101 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1151 +#: builtin/merge.c:1166 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1160 +#: builtin/merge.c:1175 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1165 -msgid "You cannot combine --no-ff with --ff-only." -msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" - -#: builtin/merge.c:1172 +#: builtin/merge.c:1184 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1204 +#: builtin/merge.c:1216 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1209 +#: builtin/merge.c:1221 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1265 +#: builtin/merge.c:1226 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - 不能被合并" + +#: builtin/merge.c:1277 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1268 +#: builtin/merge.c:1280 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" #. 'N' -#: builtin/merge.c:1271 +#: builtin/merge.c:1283 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有一个 GPG 签名。" -#: builtin/merge.c:1274 +#: builtin/merge.c:1286 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: builtin/merge.c:1358 +#: builtin/merge.c:1370 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1397 +#: builtin/merge.c:1409 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1404 +#: builtin/merge.c:1416 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1436 +#: builtin/merge.c:1448 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1459 builtin/merge.c:1538 +#: builtin/merge.c:1471 builtin/merge.c:1550 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1463 +#: builtin/merge.c:1475 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1529 +#: builtin/merge.c:1541 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1543 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1540 +#: builtin/merge.c:1552 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1564 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -6646,47 +6874,51 @@ msgstr "重命名 %s 至 %s\n" msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" -#: builtin/name-rev.c:175 +#: builtin/name-rev.c:259 msgid "git name-rev [options] <commit>..." msgstr "git name-rev [选项] <提交>..." -#: builtin/name-rev.c:176 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --all" msgstr "git name-rev [选项] --all" -#: builtin/name-rev.c:177 +#: builtin/name-rev.c:261 msgid "git name-rev [options] --stdin" msgstr "git name-rev [选项] --stdin" -#: builtin/name-rev.c:229 +#: builtin/name-rev.c:313 msgid "print only names (no SHA-1)" msgstr "只打印名称（无 SHA-1）" -#: builtin/name-rev.c:230 +#: builtin/name-rev.c:314 msgid "only use tags to name the commits" msgstr "只使用 tags 来命名提交" -#: builtin/name-rev.c:232 +#: builtin/name-rev.c:316 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c:234 +#: builtin/name-rev.c:318 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c:235 +#: builtin/name-rev.c:319 msgid "read from stdin" msgstr "从标准输入读取" -#: builtin/name-rev.c:236 +#: builtin/name-rev.c:320 msgid "allow to print `undefined` names" msgstr "允许打印 `未定义` 的名称" -#: builtin/notes.c:26 +#: builtin/name-rev.c:326 +msgid "dereference tags in the input (internal use)" +msgstr "反向解析输入中的 tags（内部使用）" + +#: builtin/notes.c:24 msgid "git notes [--ref <notes_ref>] [list [<object>]]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" -#: builtin/notes.c:27 +#: builtin/notes.c:25 msgid "" "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" @@ -6694,11 +6926,11 @@ msgstr "" "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对" "象>] [<对象>]" -#: builtin/notes.c:28 +#: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" -#: builtin/notes.c:29 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" @@ -6706,255 +6938,234 @@ msgstr "" "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象" ">] [<对象>]" -#: builtin/notes.c:30 +#: builtin/notes.c:28 msgid "git notes [--ref <notes_ref>] edit [<object>]" msgstr "git notes [--ref <注解引用>] edit [<对象>]" -#: builtin/notes.c:31 +#: builtin/notes.c:29 msgid "git notes [--ref <notes_ref>] show [<object>]" msgstr "git notes [--ref <注解引用>] show [<对象>]" -#: builtin/notes.c:32 +#: builtin/notes.c:30 msgid "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" -#: builtin/notes.c:33 +#: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:32 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:35 +#: builtin/notes.c:33 msgid "git notes [--ref <notes_ref>] remove [<object>...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" -#: builtin/notes.c:36 +#: builtin/notes.c:34 msgid "git notes [--ref <notes_ref>] prune [-n | -v]" msgstr "git notes [--ref <注解引用>] prune [-n | -v]" -#: builtin/notes.c:37 +#: builtin/notes.c:35 msgid "git notes [--ref <notes_ref>] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" -#: builtin/notes.c:42 +#: builtin/notes.c:40 msgid "git notes [list [<object>]]" msgstr "git notes [list [<对象>]]" -#: builtin/notes.c:47 +#: builtin/notes.c:45 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<选项>] [<对象>]" -#: builtin/notes.c:52 +#: builtin/notes.c:50 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<选项>] <源对象> <目标对象>" -#: builtin/notes.c:53 +#: builtin/notes.c:51 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<源对象> <目标对象>]..." -#: builtin/notes.c:58 +#: builtin/notes.c:56 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<选项>] [<对象>]" -#: builtin/notes.c:63 +#: builtin/notes.c:61 msgid "git notes edit [<object>]" msgstr "git notes edit [<对象>]" -#: builtin/notes.c:68 +#: builtin/notes.c:66 msgid "git notes show [<object>]" msgstr "git notes show [<对象>]" -#: builtin/notes.c:73 +#: builtin/notes.c:71 msgid "git notes merge [<options>] <notes_ref>" msgstr "git notes merge [<选项>] <注解引用>" -#: builtin/notes.c:74 +#: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<选项>]" -#: builtin/notes.c:75 +#: builtin/notes.c:73 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<选项>]" -#: builtin/notes.c:80 +#: builtin/notes.c:78 msgid "git notes remove [<object>]" msgstr "git notes remove [<对象>]" -#: builtin/notes.c:85 +#: builtin/notes.c:83 msgid "git notes prune [<options>]" msgstr "git notes prune [<选项>]" -#: builtin/notes.c:90 +#: builtin/notes.c:88 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:139 +#: builtin/notes.c:137 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" -#: builtin/notes.c:143 +#: builtin/notes.c:141 msgid "could not read 'show' output" msgstr "不能读取 'show' 的输出" -#: builtin/notes.c:151 +#: builtin/notes.c:149 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:169 builtin/tag.c:341 +#: builtin/notes.c:167 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: builtin/notes.c:188 +#: builtin/notes.c:186 msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c:209 builtin/notes.c:972 +#: builtin/notes.c:207 builtin/notes.c:844 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" -#: builtin/notes.c:214 +#: builtin/notes.c:212 msgid "unable to write note object" msgstr "不能写注解对象" -#: builtin/notes.c:216 +#: builtin/notes.c:214 #, c-format msgid "The note contents has been left in %s" msgstr "注解内容被留在文件 %s 中" -#: builtin/notes.c:250 builtin/tag.c:540 +#: builtin/notes.c:248 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:252 builtin/tag.c:543 +#: builtin/notes.c:250 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" -#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 -#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 -#: builtin/notes.c:967 builtin/tag.c:556 +#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 +#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 +#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 +#: builtin/notes.c:839 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/notes.c:274 +#: builtin/notes.c:272 #, c-format msgid "Failed to read object '%s'." msgstr "无法读取对象 '%s'。" -#: builtin/notes.c:298 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "不能提交未初始化/未引用的注解树" - -#: builtin/notes.c:339 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "坏的 notes.rewriteMode 值：'%s'" - -#: builtin/notes.c:349 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" - -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: builtin/notes.c:376 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "坏的 %s 值：'%s'" - -#: builtin/notes.c:440 +#: builtin/notes.c:312 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/notes.c:455 +#: builtin/notes.c:327 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "无法从 '%s' 到 '%s' 拷贝注解" -#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 -#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 -#: builtin/notes.c:1032 +#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 +#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 +#: builtin/notes.c:904 msgid "too many parameters" msgstr "参数太多" -#: builtin/notes.c:512 builtin/notes.c:771 +#: builtin/notes.c:384 builtin/notes.c:643 #, c-format msgid "No note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c:534 builtin/notes.c:691 +#: builtin/notes.c:406 builtin/notes.c:563 msgid "note contents as a string" msgstr "注解内容作为一个字符串" -#: builtin/notes.c:537 builtin/notes.c:694 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents in a file" msgstr "注解内容到一个文件中" -#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 -#: builtin/notes.c:699 builtin/tag.c:474 +#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 +#: builtin/notes.c:571 builtin/tag.c:474 msgid "object" msgstr "对象" -#: builtin/notes.c:540 builtin/notes.c:697 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" -#: builtin/notes.c:543 builtin/notes.c:700 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse specified note object" msgstr "重用指定的注解对象" -#: builtin/notes.c:545 builtin/notes.c:613 +#: builtin/notes.c:417 builtin/notes.c:485 msgid "replace existing notes" msgstr "替换已存在的注解" -#: builtin/notes.c:579 +#: builtin/notes.c:451 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:584 builtin/notes.c:661 +#: builtin/notes.c:456 builtin/notes.c:533 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:614 +#: builtin/notes.c:486 msgid "read objects from stdin" msgstr "从标准输入读取对象" -#: builtin/notes.c:616 +#: builtin/notes.c:488 msgid "load rewriting config for <command> (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" -#: builtin/notes.c:634 +#: builtin/notes.c:506 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:655 +#: builtin/notes.c:527 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:667 +#: builtin/notes.c:539 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:716 +#: builtin/notes.c:588 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -6963,58 +7174,58 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:863 +#: builtin/notes.c:735 msgid "General options" msgstr "通用选项" -#: builtin/notes.c:865 +#: builtin/notes.c:737 msgid "Merge options" msgstr "合并选项" -#: builtin/notes.c:867 +#: builtin/notes.c:739 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:869 +#: builtin/notes.c:741 msgid "Committing unmerged notes" msgstr "提交未合并的注解" -#: builtin/notes.c:871 +#: builtin/notes.c:743 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c:873 +#: builtin/notes.c:745 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" -#: builtin/notes.c:875 +#: builtin/notes.c:747 msgid "abort notes merge" msgstr "中止注解合并" -#: builtin/notes.c:970 +#: builtin/notes.c:842 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:982 +#: builtin/notes.c:854 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:985 +#: builtin/notes.c:857 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:1066 +#: builtin/notes.c:938 msgid "notes_ref" msgstr "注解引用" -#: builtin/notes.c:1067 +#: builtin/notes.c:939 msgid "use notes from <notes_ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1102 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" @@ -7248,7 +7459,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:121 +#: builtin/push.c:117 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7262,7 +7473,7 @@ msgstr "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" -#: builtin/push.c:128 +#: builtin/push.c:131 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7275,12 +7486,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:136 +#: builtin/push.c:139 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:139 +#: builtin/push.c:142 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7291,7 +7502,7 @@ msgstr "" "而没有告诉我要推送什么、更新哪个远程分支。" # 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 -#: builtin/push.c:151 +#: builtin/push.c:165 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7322,23 +7533,23 @@ msgstr "" "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n" "为保持兼容，请用 'current' 代替 'simple' 模式）" -#: builtin/push.c:199 +#: builtin/push.c:225 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。" -#: builtin/push.c:206 +#: builtin/push.c:232 msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" -"before pushing again.\n" +"its remote counterpart. Integrate the remote changes (e.g.\n" +"'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n" -"再次推送前，先与远程变更合并（如 'git pull'）。详见\n" +"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:212 +#: builtin/push.c:238 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7350,35 +7561,35 @@ msgstr "" "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" "以便只推送当前分支。" -#: builtin/push.c:218 +#: builtin/push.c:244 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. Check out this branch and merge the remote changes\n" -"(e.g. 'git pull') before pushing again.\n" +"counterpart. Check out this branch and integrate the remote changes\n" +"(e.g. 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n" -"检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n" +"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:224 +#: builtin/push.c:250 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" -"to the same ref. You may want to first merge the remote changes (e.g.,\n" -"'git pull') before pushing again.\n" +"to the same ref. You may want to first integrate the remote changes\n" +"(e.g., 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n" -"一个版本库已推送了相同的引用。再次推送前，您可能需要先合并远程变更\n" -"（如 'git pull'）。\n" +"一个版本库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n" +"（如 'git pull ...'）。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:231 +#: builtin/push.c:257 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒绝因为 tag 在远程已经存在。" -#: builtin/push.c:234 +#: builtin/push.c:260 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -7387,22 +7598,22 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:294 +#: builtin/push.c:320 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:298 +#: builtin/push.c:324 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:331 +#: builtin/push.c:357 #, c-format msgid "bad repository '%s'" msgstr "坏的版本库 '%s'" -#: builtin/push.c:332 +#: builtin/push.c:358 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7423,87 +7634,87 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:347 +#: builtin/push.c:373 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:348 +#: builtin/push.c:374 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用表达式同时使用" -#: builtin/push.c:353 +#: builtin/push.c:379 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:354 +#: builtin/push.c:380 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用表达式同时使用" -#: builtin/push.c:359 +#: builtin/push.c:385 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:419 +#: builtin/push.c:445 msgid "repository" msgstr "版本库" -#: builtin/push.c:420 +#: builtin/push.c:446 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:421 +#: builtin/push.c:447 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:423 +#: builtin/push.c:449 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:424 +#: builtin/push.c:450 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送 tags（不能使用 --all or --mirror）" -#: builtin/push.c:427 +#: builtin/push.c:453 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:428 +#: builtin/push.c:454 msgid "check" msgstr "检查" -#: builtin/push.c:429 +#: builtin/push.c:455 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:431 +#: builtin/push.c:457 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:432 builtin/push.c:433 +#: builtin/push.c:458 builtin/push.c:459 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:434 +#: builtin/push.c:460 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:437 +#: builtin/push.c:463 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:439 +#: builtin/push.c:465 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:440 +#: builtin/push.c:466 msgid "push missing but relevant tags" msgstr "推送缺失的有关的 tags" -#: builtin/push.c:450 +#: builtin/push.c:476 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:452 +#: builtin/push.c:478 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" @@ -7517,70 +7728,80 @@ msgstr "" "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])" -#: builtin/read-tree.c:108 +#: builtin/read-tree.c:109 msgid "write resulting index to <file>" msgstr "将索引结果写入 <file>" -#: builtin/read-tree.c:111 +#: builtin/read-tree.c:112 msgid "only empty the index" msgstr "只是清空索引" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:114 msgid "Merging" msgstr "合并" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:116 msgid "perform a merge in addition to a read" msgstr "读取之余再执行一个合并" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:118 msgid "3-way merge if no file level merging required" msgstr "如果没有文件级合并需要，执行三路合并" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:120 msgid "3-way merge in presence of adds and removes" msgstr "存在添加和删除时，也执行三路合并" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:122 msgid "same as -m, but discard unmerged entries" msgstr "类似于 -m，但丢弃未合并的条目" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "<subdirectory>/" msgstr "<子目录>/" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "read the tree into the index under <subdirectory>/" msgstr "读取树对象到索引的 <子目录>/ 下" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:127 msgid "update working tree with merge result" msgstr "用合并的结果更新工作区" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:129 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "allow explicitly ignored files to be overwritten" msgstr "允许忽略文件中设定的文件可以被覆盖" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:133 msgid "don't check the working tree after merging" msgstr "合并后不检查工作区" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't update the index or the work tree" msgstr "不更新索引区和工作区" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:136 msgid "skip applying sparse checkout filter" msgstr "跳过应用稀疏检出过滤器" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:138 msgid "debug unpack-trees" msgstr "调试 unpack-trees" +#: builtin/reflog.c:500 +#, c-format +msgid "%s' for '%s' is not a valid timestamp" +msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" + +#: builtin/reflog.c:616 builtin/reflog.c:621 +#, c-format +msgid "'%s' is not a valid timestamp" +msgstr "'%s' 不是一个有效的时间戳" + #: builtin/remote.c:11 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" @@ -8151,98 +8372,98 @@ msgstr "无法找到 HEAD 指向的树。" msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:98 +#: builtin/reset.c:99 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:169 +#: builtin/reset.c:172 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:248 +#: builtin/reset.c:251 msgid "be quiet, only report errors" msgstr "安静模式，只报告错误" -#: builtin/reset.c:250 +#: builtin/reset.c:253 msgid "reset HEAD and index" msgstr "重置 HEAD 和索引" -#: builtin/reset.c:251 +#: builtin/reset.c:254 msgid "reset only HEAD" msgstr "只重置 HEAD" -#: builtin/reset.c:253 builtin/reset.c:255 +#: builtin/reset.c:256 builtin/reset.c:258 msgid "reset HEAD, index and working tree" msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:257 +#: builtin/reset.c:260 msgid "reset HEAD but keep local changes" msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:275 +#: builtin/reset.c:278 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "无法将 '%s' 解析为一个有效的版本。" -#: builtin/reset.c:278 builtin/reset.c:286 +#: builtin/reset.c:281 builtin/reset.c:289 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/reset.c:283 +#: builtin/reset.c:286 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "无法将 '%s' 解析为一个有效的树对象。" -#: builtin/reset.c:292 +#: builtin/reset.c:295 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:301 +#: builtin/reset.c:304 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:303 +#: builtin/reset.c:306 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:313 +#: builtin/reset.c:316 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对裸版本库进行%s重置" -#: builtin/reset.c:333 +#: builtin/reset.c:336 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:339 +#: builtin/reset.c:342 msgid "Unstaged changes after reset:" msgstr "重置后撤出暂存区的变更：" -#: builtin/reset.c:344 +#: builtin/reset.c:347 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-parse.c:339 +#: builtin/rev-parse.c:345 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [选项] -- [<参数>...]" -#: builtin/rev-parse.c:344 +#: builtin/rev-parse.c:350 msgid "keep the `--` passed as an arg" msgstr "保持 `--` 作为一个参数传递" -#: builtin/rev-parse.c:346 +#: builtin/rev-parse.c:352 msgid "stop parsing after the first non-option argument" msgstr "遇到第一个非选项参数后停止解析" -#: builtin/rev-parse.c:464 +#: builtin/rev-parse.c:470 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8272,145 +8493,165 @@ msgstr "git cherry-pick [选项] <提交号>..." msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <子命令>" -#: builtin/revert.c:70 builtin/revert.c:92 +#: builtin/revert.c:71 builtin/revert.c:94 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s：%s 不能和 %s 同时使用" -#: builtin/revert.c:103 +#: builtin/revert.c:105 msgid "end revert or cherry-pick sequence" msgstr "终止反转或拣选操作" -#: builtin/revert.c:104 +#: builtin/revert.c:106 msgid "resume revert or cherry-pick sequence" msgstr "继续反转或拣选操作" -#: builtin/revert.c:105 +#: builtin/revert.c:107 msgid "cancel revert or cherry-pick sequence" msgstr "取消反转或拣选操作" -#: builtin/revert.c:106 +#: builtin/revert.c:108 msgid "don't automatically commit" msgstr "不要自动提交" -#: builtin/revert.c:107 +#: builtin/revert.c:109 msgid "edit the commit message" msgstr "编辑提交说明" -#: builtin/revert.c:110 +#: builtin/revert.c:112 msgid "parent number" msgstr "父编号" -#: builtin/revert.c:112 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "合并策略" -#: builtin/revert.c:113 +#: builtin/revert.c:115 msgid "option" msgstr "选项" -#: builtin/revert.c:114 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "合并策略的选项" -#: builtin/revert.c:125 +#: builtin/revert.c:127 msgid "append commit name" msgstr "追加提交名称" -#: builtin/revert.c:126 +#: builtin/revert.c:128 msgid "allow fast-forward" msgstr "允许快进式" -#: builtin/revert.c:127 +#: builtin/revert.c:129 msgid "preserve initially empty commits" msgstr "保留初始化的空提交" -#: builtin/revert.c:128 +#: builtin/revert.c:130 msgid "allow commits with empty messages" msgstr "允许提交说明为空" -#: builtin/revert.c:129 +#: builtin/revert.c:131 msgid "keep redundant, empty commits" msgstr "保持多余的、空的提交" -#: builtin/revert.c:133 +#: builtin/revert.c:135 msgid "program error" msgstr "程序错误" -#: builtin/revert.c:223 +#: builtin/revert.c:225 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:238 +#: builtin/revert.c:240 msgid "cherry-pick failed" msgstr "拣选失败" -#: builtin/rm.c:15 +#: builtin/rm.c:16 msgid "git rm [options] [--] <file>..." msgstr "git rm [选项] [--] <文件>..." -#: builtin/rm.c:64 builtin/rm.c:186 -#, c-format +#: builtin/rm.c:64 msgid "" -"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"the following submodule (or one of its nested submodules)\n" +"uses a .git directory:" +msgid_plural "" +"the following submodules (or one of its nested submodules)\n" +"use a .git directory:" +msgstr[0] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" +msgstr[1] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" + +#: builtin/rm.c:70 +msgid "" +"\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -"子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n" +"\n" "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" -#: builtin/rm.c:174 -#, c-format +#: builtin/rm.c:230 +msgid "" +"the following file has staged content different from both the\n" +"file and the HEAD:" +msgid_plural "" +"the following files have staged content different from both the\n" +"file and the HEAD:" +msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" +msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" + +#: builtin/rm.c:235 msgid "" -"'%s' has staged content different from both the file and the HEAD\n" +"\n" "(use -f to force removal)" msgstr "" -"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n" +"\n" "（使用 -f 强制删除）" -#: builtin/rm.c:180 -#, c-format -msgid "" -"'%s' has changes staged in the index\n" -"(use --cached to keep the file, or -f to force removal)" -msgstr "" -"'%s' 有变更已暂存至索引中\n" -"（使用 --cached 保存文件，或用 -f 强制删除）" +#: builtin/rm.c:239 +msgid "the following file has changes staged in the index:" +msgid_plural "the following files have changes staged in the index:" +msgstr[0] "如下文件相对索引区的内容有修改" +msgstr[1] "如下文件相对索引区的内容有修改" -#: builtin/rm.c:191 -#, c-format +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" -"'%s' has local modifications\n" +"\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -"'%s' 有本地修改\n" -"（使用 --cached 保存文件，或用 -f 强制删除）" +"\n" +"（使用 --cached 保留本地文件，或用 -f 强制删除）" -#: builtin/rm.c:207 +#: builtin/rm.c:251 +msgid "the following file has local modifications:" +msgid_plural "the following files have local modifications:" +msgstr[0] "如下文件有本地修改：" +msgstr[1] "如下文件有本地修改：" + +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "不列出删除的文件" -#: builtin/rm.c:208 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "只从索引区删除" -#: builtin/rm.c:209 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "忽略文件更新状态检查" -#: builtin/rm.c:210 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "允许递归删除" -#: builtin/rm.c:212 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "即使没有匹配，也以零状态退出" -#: builtin/rm.c:283 +#: builtin/rm.c:345 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 选项不会递归删除 '%s'" -#: builtin/rm.c:322 +#: builtin/rm.c:384 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能删除 %s" @@ -8424,23 +8665,23 @@ msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" msgid "Missing author: %s" msgstr "缺少作者：%s" -#: builtin/shortlog.c:227 +#: builtin/shortlog.c:228 msgid "sort output according to the number of commits per author" msgstr "根据每个作者的提交数量排序" -#: builtin/shortlog.c:229 +#: builtin/shortlog.c:230 msgid "Suppress commit descriptions, only provides commit count" msgstr "隐藏提交说明，只提供提交数量" -#: builtin/shortlog.c:231 +#: builtin/shortlog.c:232 msgid "Show the email address of each author" msgstr "显示每个作者的电子邮件地址" -#: builtin/shortlog.c:232 +#: builtin/shortlog.c:233 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:233 +#: builtin/shortlog.c:234 msgid "Linewrap output" msgstr "折行输出" @@ -8504,23 +8745,23 @@ msgstr "显示没有任何引用的的引用" msgid "show commits in topological order" msgstr "以拓扑顺序显示提交" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:672 msgid "show only commits not on the first branch" msgstr "只显示不在第一个分支上的提交" -#: builtin/show-branch.c:673 +#: builtin/show-branch.c:674 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支可访问的合并提交" -#: builtin/show-branch.c:675 -msgid "show commits where no parent comes before its children" -msgstr "显示提交时以时间为序且父提交不能领先子提交" +#: builtin/show-branch.c:676 +msgid "topologically sort, maintaining date order where possible" +msgstr "拓扑方式排序，并尽可能地保持日期顺序" -#: builtin/show-branch.c:677 +#: builtin/show-branch.c:679 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:680 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" @@ -8536,35 +8777,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=模式] < 引用列表" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:168 msgid "only show tags (can be combined with heads)" msgstr "只显示 tags（可以和头共用）" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:169 msgid "only show heads (can be combined with tags)" msgstr "只显示头（可以和 tags 共用）" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:170 msgid "stricter reference checking, requires exact ref path" msgstr "更严格的引用检测，需要精确的引用路径" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 -msgid "show the HEAD reference" -msgstr "显示 HEAD 引用" +#: builtin/show-ref.c:173 builtin/show-ref.c:176 +msgid "show the HEAD reference, even if it would be filtered out" +msgstr "显示 HEAD 引用，即使被过滤掉" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:178 msgid "dereference tags into object IDs" msgstr "转换 tags 到对象ID" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:180 msgid "only show SHA1 hash using <n> digits" msgstr "只显示使用 <n> 个数字的 SHA1 哈希" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:184 msgid "do not print results to stdout (useful with --verify)" msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:186 msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地版本库中的引用" @@ -8976,7 +9217,7 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" msgid "only useful for debugging" msgstr "只对调试有用" -#: git.c:16 +#: git.c:17 msgid "" "'git help -a' and 'git help -g' lists available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -8985,19 +9226,23 @@ msgstr "" "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n" "'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。" -#: parse-options.h:156 +#: parse-options.h:144 +msgid "expiry date" +msgstr "逾期日期" + +#: parse-options.h:159 msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:232 +#: parse-options.h:236 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:234 +#: parse-options.h:238 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:240 +#: parse-options.h:244 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" @@ -9054,8 +9299,8 @@ msgid "Move or rename a file, a directory, or a symlink" msgstr "移动或重命名一个文件、目录或符号链接" #: common-cmds.h:21 -msgid "Fetch from and merge with another repository or a local branch" -msgstr "获取并合并另外的版本库或一个本地分支" +msgid "Fetch from and integrate with another repository or a local branch" +msgstr "获取并整合另外的版本库或一个本地分支" #: common-cmds.h:22 msgid "Update remote refs along with associated objects" @@ -9098,11 +9343,11 @@ msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_H #: git-am.sh:105 #, sh-format msgid "" -"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"When you have resolved this problem, run \"$cmdline --continue\".\n" "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" "To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" -"当您解决了此问题后，执行 \"$cmdline --resolved\"。\n" +"当您解决了此问题后，执行 \"$cmdline --continue\"。\n" "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" @@ -9155,25 +9400,34 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。\n" "请不要再使用它了。" -#: git-am.sh:477 +#: git-am.sh:479 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." -msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" +msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。" -#: git-am.sh:482 +#: git-am.sh:484 msgid "Please make up your mind. --skip or --abort?" msgstr "请下决心。--skip 或是 --abort ？" -#: git-am.sh:509 +#: git-am.sh:520 +#, sh-format +msgid "" +"Stray $dotest directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"发现了错误的 $dotest 目录。\n" +"使用 \"git am --abort\" 删除它。" + +#: git-am.sh:528 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: git-am.sh:575 +#: git-am.sh:594 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "脏的索引：不能应用补丁（脏文件：$files）" -#: git-am.sh:679 +#: git-am.sh:698 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -9184,15 +9438,15 @@ msgstr "" "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" -#: git-am.sh:706 +#: git-am.sh:725 msgid "Patch does not have a valid e-mail address." msgstr "补丁中没有一个有效的邮件地址。" -#: git-am.sh:753 +#: git-am.sh:772 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: git-am.sh:757 +#: git-am.sh:776 msgid "Commit Body is:" msgstr "提交内容为：" @@ -9200,16 +9454,16 @@ msgstr "提交内容为：" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:764 +#: git-am.sh:783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -#: git-am.sh:800 +#: git-am.sh:819 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "正应用：$FIRSTLINE" -#: git-am.sh:821 +#: git-am.sh:840 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9219,22 +9473,22 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: git-am.sh:829 +#: git-am.sh:848 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？" -#: git-am.sh:845 +#: git-am.sh:864 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: git-am.sh:855 +#: git-am.sh:874 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "补丁失败于 $msgnum $FIRSTLINE" -#: git-am.sh:858 +#: git-am.sh:877 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -9243,7 +9497,7 @@ msgstr "" "失败的补丁文件副本位于：\n" " $dotest/patch" -#: git-am.sh:876 +#: git-am.sh:895 msgid "applying to an empty history" msgstr "正应用到一个空历史上" @@ -9444,7 +9698,7 @@ msgstr "无法将多个分支合并到空分支" msgid "Cannot rebase onto multiple branches" msgstr "无法变基到多个分支" -#: git-rebase.sh:53 +#: git-rebase.sh:54 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -9455,31 +9709,50 @@ msgstr "" "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基，执行 \"git rebase --abort\"。" +#: git-rebase.sh:156 +msgid "Applied autostash." +msgstr "成功应用 autostash。" + +#: git-rebase.sh:159 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "无法保存 $stash_sha1" + #: git-rebase.sh:160 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" it at any time.\n" +msgstr "" +"应用 autostash 导致冲突。\n" +"您的修改安全地保存在 stash 中。\n" +"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" + +#: git-rebase.sh:190 msgid "The pre-rebase hook refused to rebase." msgstr "钩子 pre-rebase 拒绝变基。" -#: git-rebase.sh:165 +#: git-rebase.sh:195 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" -#: git-rebase.sh:296 +#: git-rebase.sh:329 msgid "The --exec option must be used with the --interactive option" msgstr "选项 --exec 必须和选项 --interactive 同时使用" -#: git-rebase.sh:301 +#: git-rebase.sh:334 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: git-rebase.sh:312 +#: git-rebase.sh:345 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: git-rebase.sh:319 +#: git-rebase.sh:352 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: git-rebase.sh:322 +#: git-rebase.sh:355 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -9487,12 +9760,12 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: git-rebase.sh:340 +#: git-rebase.sh:373 #, sh-format msgid "Could not move back to $head_name" msgstr "无法移回 $head_name" -#: git-rebase.sh:359 +#: git-rebase.sh:392 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -9511,56 +9784,65 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。" -#: git-rebase.sh:404 +#: git-rebase.sh:437 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" -#: git-rebase.sh:428 +#: git-rebase.sh:461 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" -#: git-rebase.sh:431 git-rebase.sh:435 +#: git-rebase.sh:464 git-rebase.sh:468 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" -#: git-rebase.sh:440 +#: git-rebase.sh:473 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交：$onto_name" -#: git-rebase.sh:463 +#: git-rebase.sh:496 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误：无此分支：$branch_name" -#: git-rebase.sh:483 +#: git-rebase.sh:519 +msgid "Cannot autostash" +msgstr "无法 autostash" + +#: git-rebase.sh:524 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "创建了 autostash: $stash_abbrev" + +#: git-rebase.sh:528 msgid "Please commit or stash them." msgstr "请提交或为它们保存进度。" -#: git-rebase.sh:501 +#: git-rebase.sh:548 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" -#: git-rebase.sh:504 +#: git-rebase.sh:552 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的，强制变基。" -#: git-rebase.sh:515 +#: git-rebase.sh:563 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto：" #. Detach HEAD and reset the tree -#: git-rebase.sh:524 +#: git-rebase.sh:572 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先，重置头指针以便在上面重放您的工作..." -#: git-rebase.sh:532 +#: git-rebase.sh:582 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" @@ -9593,6 +9875,11 @@ msgstr "无法删除临时索引（不应发生）" msgid "Cannot record working tree state" msgstr "不能记录工作区状态" +#: git-stash.sh:190 +#, sh-format +msgid "Cannot update $ref_stash with $w_commit" +msgstr "无法用 $w_commit 更新 $ref_stash" + #. TRANSLATORS: $option is an invalid option, like #. `--blah-blah'. The 7 spaces at the beginning of the #. second line correspond to "error: ". So you should line @@ -9603,7 +9890,7 @@ msgstr "不能记录工作区状态" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:202 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -9612,119 +9899,134 @@ msgstr "" "错误：'stash save' 的未知选项：$option\n" " 要提供一个描述信息，使用 git stash save -- '$option'" -#: git-stash.sh:223 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "没有要保存的本地修改" -#: git-stash.sh:227 +#: git-stash.sh:268 +msgid "" +"The following untracked files would NOT be saved but need to be removed by " +"stash save:" +msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除：" + +#: git-stash.sh:270 +msgid "" +"Aborting. Consider using either the --force or --include-untracked option." +msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。" + +#: git-stash.sh:274 msgid "Cannot initialize stash" msgstr "无法初始化 stash" -#: git-stash.sh:235 +#: git-stash.sh:278 msgid "Cannot save the current status" msgstr "无法保存当前状态" -#: git-stash.sh:253 +#: git-stash.sh:296 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: git-stash.sh:352 +#: git-stash.sh:395 msgid "No stash found." msgstr "未发现 stash。" -#: git-stash.sh:359 +#: git-stash.sh:402 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本：$REV" -#: git-stash.sh:365 +#: git-stash.sh:408 #, sh-format msgid "$reference is not valid reference" msgstr "$reference 不是有效的引用" -#: git-stash.sh:393 +#: git-stash.sh:436 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' 不是 stash 样提交" -#: git-stash.sh:404 +#: git-stash.sh:447 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' 不是一个 stash 引用" -#: git-stash.sh:412 +#: git-stash.sh:455 msgid "unable to refresh index" msgstr "无法刷新索引" -#: git-stash.sh:416 +#: git-stash.sh:459 msgid "Cannot apply a stash in the middle of a merge" msgstr "无法在合并过程中恢复进度" -#: git-stash.sh:424 +#: git-stash.sh:467 msgid "Conflicts in index. Try without --index." msgstr "索引中有冲突。尝试不使用 --index。" -#: git-stash.sh:426 +#: git-stash.sh:469 msgid "Could not save index tree" msgstr "不能保存索引树" -#: git-stash.sh:460 +#: git-stash.sh:503 msgid "Cannot unstage modified files" msgstr "无法还原修改的文件" -#: git-stash.sh:475 +#: git-stash.sh:518 msgid "Index was not unstashed." msgstr "索引的进度没有被恢复。" -#: git-stash.sh:492 +#: git-stash.sh:535 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:493 +#: git-stash.sh:536 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：不能丢弃进度条目" -#: git-stash.sh:500 +#: git-stash.sh:543 msgid "No branch name specified" msgstr "未指定分支名" -#: git-stash.sh:571 +#: git-stash.sh:615 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" -#: git-submodule.sh:91 +#: git-submodule.sh:95 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "无法从 url '$remoteurl' 剥离一个组件" -#: git-submodule.sh:196 +#: git-submodule.sh:237 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" -#: git-submodule.sh:239 +#: git-submodule.sh:281 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" -#: git-submodule.sh:251 +#: git-submodule.sh:293 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" -#: git-submodule.sh:349 +#: git-submodule.sh:403 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "只能在工作区的顶级目录中使用相对路径" + +#: git-submodule.sh:413 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:366 +#: git-submodule.sh:430 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:370 +#: git-submodule.sh:434 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9735,241 +10037,345 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:388 +#: git-submodule.sh:452 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存版本库到索引" -#: git-submodule.sh:390 +#: git-submodule.sh:454 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" -#: git-submodule.sh:398 +#: git-submodule.sh:462 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库：" -#: git-submodule.sh:400 +#: git-submodule.sh:464 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "如果您想重用此本地 git 目录而不是重新克隆自" -#: git-submodule.sh:402 +#: git-submodule.sh:466 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库" -#: git-submodule.sh:403 +#: git-submodule.sh:467 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" -#: git-submodule.sh:405 +#: git-submodule.sh:469 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:417 +#: git-submodule.sh:481 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:422 +#: git-submodule.sh:486 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:431 +#: git-submodule.sh:495 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:474 +#: git-submodule.sh:539 #, sh-format -msgid "Entering '$prefix$sm_path'" -msgstr "正在进入 '$prefix$sm_path'" +msgid "Entering '$prefix$displaypath'" +msgstr "正在进入 '$prefix$displaypath'" -#: git-submodule.sh:488 +#: git-submodule.sh:554 #, sh-format -msgid "Stopping at '$sm_path'; script returned non-zero status." -msgstr "停止于 '$sm_path'，脚本返回非零值。" +msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。" -#: git-submodule.sh:532 +#: git-submodule.sh:600 #, sh-format -msgid "No url found for submodule path '$sm_path' in .gitmodules" -msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url" +msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" -#: git-submodule.sh:541 +#: git-submodule.sh:609 #, sh-format -msgid "Failed to register url for submodule path '$sm_path'" -msgstr "无法为子模组路径 '$sm_path' 注册 url" +msgid "Failed to register url for submodule path '$displaypath'" +msgstr "无法为子模组路径 '$displaypath' 注册 url" -#: git-submodule.sh:543 +#: git-submodule.sh:611 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$sm_path'" -msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" +msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:551 +#: git-submodule.sh:619 #, sh-format -msgid "Failed to register update mode for submodule path '$sm_path'" -msgstr "无法为子模组路径 '$sm_path' 注册更新模式" +msgid "Failed to register update mode for submodule path '$displaypath'" +msgstr "无法为子模组路径 '$displaypath' 注册更新模式" -#: git-submodule.sh:588 +#: git-submodule.sh:656 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" -#: git-submodule.sh:603 +#: git-submodule.sh:673 #, sh-format -msgid "Submodule work tree '$sm_path' contains a .git directory" -msgstr "子模组工作区 '$sm_path' 包含一个 .git 目录" +msgid "Submodule work tree '$displaypath' contains a .git directory" +msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" -#: git-submodule.sh:604 +#: git-submodule.sh:674 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" -#: git-submodule.sh:610 +#: git-submodule.sh:680 #, sh-format msgid "" -"Submodule work tree '$sm_path' contains local modifications; use '-f' to " +"Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" -msgstr "子模组工作区 '$sm_path' 包含本地修改；使用 '-f' 丢弃它们" +msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们" -#: git-submodule.sh:613 +#: git-submodule.sh:683 #, sh-format -msgid "Cleared directory '$sm_path'" -msgstr "已清除目录 '$sm_path'" +msgid "Cleared directory '$displaypath'" +msgstr "已清除目录 '$displaypath'" -#: git-submodule.sh:614 +#: git-submodule.sh:684 #, sh-format -msgid "Could not remove submodule work tree '$sm_path'" -msgstr "无法移除子模组工作区 '$sm_path'" +msgid "Could not remove submodule work tree '$displaypath'" +msgstr "无法移除子模组工作区 '$displaypath'" -#: git-submodule.sh:617 +#: git-submodule.sh:687 #, sh-format -msgid "Could not create empty submodule directory '$sm_path'" -msgstr "不能创建空的子模组目录 '$sm_path'" +msgid "Could not create empty submodule directory '$displaypath'" +msgstr "不能创建空的子模组目录 '$displaypath'" -#: git-submodule.sh:626 +#: git-submodule.sh:696 #, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$sm_path'" -msgstr "子模组 '$name' ($url) 未对路径 '$sm_path' 注册" +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:731 +#: git-submodule.sh:811 #, sh-format msgid "" -"Submodule path '$prefix$sm_path' not initialized\n" +"Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -"子模组路径 '$prefix$sm_path' 没有初始化\n" +"子模组路径 '$displaypath' 没有初始化\n" "也许您想用 'update --init'？" -#: git-submodule.sh:744 +#: git-submodule.sh:824 #, sh-format -msgid "Unable to find current revision in submodule path '$prefix$sm_path'" -msgstr "无法在子模组路径 '$prefix$sm_path' 中找到当前版本" +msgid "Unable to find current revision in submodule path '$displaypath'" +msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:753 +#: git-submodule.sh:833 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:777 +#: git-submodule.sh:857 +#, sh-format +msgid "Unable to fetch in submodule path '$displaypath'" +msgstr "无法在子模组路径 '$displaypath' 中获取" + +#: git-submodule.sh:871 #, sh-format -msgid "Unable to fetch in submodule path '$prefix$sm_path'" -msgstr "无法在子模组路径 '$prefix$sm_path' 中获取" +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:791 +#: git-submodule.sh:872 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'" -msgstr "无法在子模组路径 '$prefix$sm_path' 中变基 '$sha1'" +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:792 +#: git-submodule.sh:877 #, sh-format -msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'" -msgstr "子模组路径 '$prefix$sm_path'：变基至 '$sha1'" +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:797 +#: git-submodule.sh:878 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'" -msgstr "无法合并 '$sha1' 到子模组路径 '$prefix$sm_path' 中" +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:798 +#: git-submodule.sh:883 #, sh-format -msgid "Submodule path '$prefix$sm_path': merged in '$sha1'" -msgstr "子模组路径 '$prefix$sm_path'：已合并入 '$sha1'" +msgid "" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:803 +#: git-submodule.sh:884 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'" -msgstr "无法在子模组路径 '$prefix$sm_path' 中检出 '$sha1'" +msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" -#: git-submodule.sh:804 +#: git-submodule.sh:889 #, sh-format -msgid "Submodule path '$prefix$sm_path': checked out '$sha1'" -msgstr "子模组路径 '$prefix$sm_path'：检出 '$sha1'" +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:831 +#: git-submodule.sh:890 #, sh-format -msgid "Failed to recurse into submodule path '$prefix$sm_path'" -msgstr "无法递归进子模组路径 '$prefix$sm_path'" +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:939 +#: git-submodule.sh:917 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "无法递归进子模组路径 '$displaypath'" + +#: git-submodule.sh:1025 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" #. unexpected type -#: git-submodule.sh:979 +#: git-submodule.sh:1066 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:997 +#: git-submodule.sh:1086 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_src" -msgstr " 警告：$name 未包含提交 $sha1_src" +msgid " Warn: $display_name doesn't contain commit $sha1_src" +msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:1000 +#: git-submodule.sh:1089 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_dst" -msgstr " 警告：$name 未包含提交 $sha1_dst" +msgid " Warn: $display_name doesn't contain commit $sha1_dst" +msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:1003 +#: git-submodule.sh:1092 #, sh-format -msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" -msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst" +msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:1028 +#: git-submodule.sh:1117 msgid "blob" msgstr "数据对象" -#: git-submodule.sh:1066 +#: git-submodule.sh:1155 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: git-submodule.sh:1068 +#: git-submodule.sh:1157 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: git-submodule.sh:1153 +#: git-submodule.sh:1242 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:1216 +#: git-submodule.sh:1306 #, sh-format -msgid "Synchronizing submodule url for '$prefix$sm_path'" -msgstr "为 '$prefix$sm_path' 同步子模组 url" +msgid "Synchronizing submodule url for '$displaypath'" +msgstr "为 '$displaypath' 同步子模组 url" + +#~ msgid "" +#~ "the following submodule (or one of its nested submodule)\n" +#~ "uses a .git directory:" +#~ msgid_plural "" +#~ "the following submodules (or one of its nested submodule)\n" +#~ "use a .git directory:" +#~ msgstr[0] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录：" +#~ msgstr[1] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录：" + +#~ msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +#~ msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" + +#~ msgid "Could not find section in .gitmodules where path=%s" +#~ msgstr "无法在 .gitmodules 中找到 path=%s 的小节" + +#~ msgid "Could not update .gitmodules entry %s" +#~ msgstr "不能更新 .gitmodules 条目 %s" + +#~ msgid "Could not remove .gitmodules entry for %s" +#~ msgstr "无法移除 %s 的 .gitmodules 条目" + +#~ msgid "could not find .gitmodules in index" +#~ msgstr "无法在索引中找到 .gitmodules" + +#~ msgid "reading updated .gitmodules failed" +#~ msgstr "读取更新后的 .gitmodules 失败" + +#~ msgid "unable to stat updated .gitmodules" +#~ msgstr "不能枚举更新后的 .gitmodules" + +#~ msgid "unable to remove .gitmodules from index" +#~ msgstr "不能从索引中移除 .gitmodules" + +#~ msgid "adding updated .gitmodules failed" +#~ msgstr "添加更新后的 .gitmodules 失败" + +#~ msgid "staging updated .gitmodules failed" +#~ msgstr "将更新后 .gitmodules 添加暂存区失败" + +#~ msgid "Could not set core.worktree in %s" +#~ msgstr "不能在 %s 中设置 core.worktree" + +# 译者：注意保持前导空格 +#~ msgid " (fix conflicts and then run \"git am --resolved\")" +#~ msgstr " （解决冲突，然后运行 \"git am --resolved\"）" + +# 译者：注意保持前导空格 +#~ msgid " (all conflicts fixed: run \"git commit\")" +#~ msgstr " （解决所有冲突后，执行 \"git commit\"）" + +#~ msgid "more than %d trees given: '%s'" +#~ msgstr "提供了超过 %d 个树对象：'%s'" + +#~ msgid "You cannot combine --no-ff with --ff-only." +#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" + +#~ msgid "Huh? Directory %s is in index and no submodule?" +#~ msgstr "嗯？目录 %s 在索引中并且不是子模组？" + +#~ msgid "" +#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" +#~ msgstr "" +#~ "子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n" +#~ "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" + +#~ msgid "" +#~ "'%s' has changes staged in the index\n" +#~ "(use --cached to keep the file, or -f to force removal)" +#~ msgstr "" +#~ "'%s' 有变更已暂存至索引中\n" +#~ "（使用 --cached 保存文件，或用 -f 强制删除）" + +#~ msgid "show commits where no parent comes before its children" +#~ msgstr "显示提交时以时间为序且父提交不能领先子提交" + +#~ msgid "show the HEAD reference" +#~ msgstr "显示 HEAD 引用" + +#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'" +#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" + +#~ msgid "Change flags" +#~ msgstr "修改参数" + +#~ msgid "" +#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean." +#~ msgstr "注意：没有要清理的文件；尝试按 \"t\" 切换 git-clean 的选项。" + +#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'" +#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'" #~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" #~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]" @@ -9991,10 +10397,6 @@ msgstr "为 '$prefix$sm_path' 同步子模组 url" #~ msgid "new files yourself (see 'git help status')." #~ msgstr "（参见 'git help status'）。" -#, fuzzy -#~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'" -#~ msgstr "为 '$prefix$sm_path' 同步子模组 url" - #~ msgid "use any ref in .git/refs" #~ msgstr "使用 .git/refs 里的任意引用" |