undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with v1.7.10.1

Browse Source
This commit is contained in:
Junio C Hamano 2012-05-01 21:20:46 -07:00
commit 07bc4f5870
9 changed files with 7636 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Documentation/RelNotes/1.7.10.1.txt
View File

@ -1,12 +1,22 @@
Git v1.7.10.1 Release Notes Git v1.7.10.1 Release Notes
=========================== ===========================
Additions since v1.7.10
-----------------------
Localization message files for Danish and German have been added.
Fixes since v1.7.10 Fixes since v1.7.10
------------------- -------------------
* "git add -p" is not designed to deal with unmerged paths but did * "git add -p" is not designed to deal with unmerged paths but did
not exclude them and tried to apply funny patches only to fail. not exclude them and tried to apply funny patches only to fail.
* "git blame" started missing quite a few changes from the origin
since we stopped using the diff minimalization by default in v1.7.2
era.
* When PATH contains an unreadable directory, alias expansion code * When PATH contains an unreadable directory, alias expansion code
did not kick in, and failed with an error that said "git-subcmd" did not kick in, and failed with an error that said "git-subcmd"
was not found. was not found.
@ -36,6 +46,21 @@ Fixes since v1.7.10
* Rename detection logic used to match two empty files as renames * Rename detection logic used to match two empty files as renames
during merge-recursive, leading to unnatural mismerges. during merge-recursive, leading to unnatural mismerges.
* The parser in "fast-import" did not diagnose ":9" style references
that is not followed by required SP/LF as an error.
* When "git fetch" encounters repositories with too many references,
the command line of "fetch-pack" that is run by a helper
e.g. remote-curl, may fail to hold all of them. Now such an
internal invocation can feed the references through the standard
input of "fetch-pack".
* "git fetch" that recurses into submodules on demand did not check
if it needs to go into submodules when non branches (most notably,
tags) are fetched.
* "log -p --graph" used with "--stat" had a few formatting error.
* Running "notes merge --commit" failed to perform correctly when run * Running "notes merge --commit" failed to perform correctly when run
from any directory inside $GIT_DIR/. When "notes merge" stops with from any directory inside $GIT_DIR/. When "notes merge" stops with
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
@ -47,4 +72,7 @@ Fixes since v1.7.10
$there using the upstream information to a remote unreleated to $there using the upstream information to a remote unreleated to
$there. $there.
* Giving "--continue" to a conflicted "rebase -i" session skipped a
commit that only results in changes to submodules.
Also contains minor fixes and documentation updates. Also contains minor fixes and documentation updates.

3
Documentation/git.txt
View File

@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: Documentation for older releases are available here:
* link:v1.7.10/git.html[documentation for release 1.7.10] * link:v1.7.10.1/git.html[documentation for release 1.7.10.1]
* release notes for * release notes for
link:RelNotes/1.7.10.1.txt[1.7.10.1],
link:RelNotes/1.7.10.txt[1.7.10]. link:RelNotes/1.7.10.txt[1.7.10].
* link:v1.7.9.7/git.html[documentation for release 1.7.9.7] * link:v1.7.9.7/git.html[documentation for release 1.7.9.7]

2
GIT-VERSION-GEN
View File

@ -12,7 +12,7 @@ if test -f version
then then
VN=$(cat version) || VN="$DEF_VER" VN=$(cat version) || VN="$DEF_VER"
elif test -d .git -o -f .git && elif test -d .git -o -f .git &&
VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) && VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) &&
case "$VN" in case "$VN" in
*$LF*) (exit 1) ;; *$LF*) (exit 1) ;;
v[0-9]*) v[0-9]*)

8
po/TEAMS
View File

@ -1,6 +1,14 @@
Core Git translation language teams Core Git translation language teams
(please keep the list sorted alphabetically on language field) (please keep the list sorted alphabetically on language field)
Language: da (Danish)
Repository: https://github.com/git-da/git-po/
Leader: Byrial Jensen <byrial@vip.cybercity.dk>
Language: de (German)
Repository: https://github.com/ralfth/git-po-de
Leader: Ralf Thielow <ralf.thielow@googlemail.com>
Language: is (Icelandic) Language: is (Icelandic)
Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

3503
po/da.po Normal file
View File

File diff suppressed because it is too large Load Diff

3771
po/de.po Normal file
View File

File diff suppressed because it is too large Load Diff

179
po/git.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2012-03-16 20:18+0800\n" "POT-Creation-Date: 2012-04-28 20:33+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -80,32 +80,32 @@ msgid ""
"%s" "%s"
msgstr "" msgstr ""
#: diff.c:1336 #: diff.c:1400
msgid " 0 files changed\n" msgid " 0 files changed\n"
msgstr "" msgstr ""
#: diff.c:1340 #: diff.c:1404
#, c-format #, c-format
msgid " %d file changed" msgid " %d file changed"
msgid_plural " %d files changed" msgid_plural " %d files changed"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: diff.c:1357 #: diff.c:1421
#, c-format #, c-format
msgid ", %d insertion(+)" msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)" msgid_plural ", %d insertions(+)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: diff.c:1368 #: diff.c:1432
#, c-format #, c-format
msgid ", %d deletion(-)" msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)" msgid_plural ", %d deletions(-)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: diff.c:3424 #: diff.c:3435
#, c-format #, c-format
msgid "" msgid ""
"Failed to parse --dirstat/-X option parameter:\n" "Failed to parse --dirstat/-X option parameter:\n"
@ -1365,66 +1365,66 @@ msgstr ""
msgid "unable to write temporary index file" msgid "unable to write temporary index file"
msgstr "" msgstr ""
#: builtin/commit.c:550 builtin/commit.c:556 #: builtin/commit.c:561 builtin/commit.c:567
#, c-format #, c-format
msgid "invalid commit: %s" msgid "invalid commit: %s"
msgstr "" msgstr ""
#: builtin/commit.c:579 #: builtin/commit.c:590
msgid "malformed --author parameter" msgid "malformed --author parameter"
msgstr "" msgstr ""
#: builtin/commit.c:635 #: builtin/commit.c:651
#, c-format #, c-format
msgid "Malformed ident string: '%s'" msgid "Malformed ident string: '%s'"
msgstr "" msgstr ""
#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 #: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
#, c-format #, c-format
msgid "could not lookup commit %s" msgid "could not lookup commit %s"
msgstr "" msgstr ""
#: builtin/commit.c:682 builtin/shortlog.c:296 #: builtin/commit.c:701 builtin/shortlog.c:296
#, c-format #, c-format
msgid "(reading log message from standard input)\n" msgid "(reading log message from standard input)\n"
msgstr "" msgstr ""
#: builtin/commit.c:684 #: builtin/commit.c:703
msgid "could not read log from standard input" msgid "could not read log from standard input"
msgstr "" msgstr ""
#: builtin/commit.c:688 #: builtin/commit.c:707
#, c-format #, c-format
msgid "could not read log file '%s'" msgid "could not read log file '%s'"
msgstr "" msgstr ""
#: builtin/commit.c:694 #: builtin/commit.c:713
msgid "commit has empty message" msgid "commit has empty message"
msgstr "" msgstr ""
#: builtin/commit.c:710 #: builtin/commit.c:729
msgid "could not read MERGE_MSG" msgid "could not read MERGE_MSG"
msgstr "" msgstr ""
#: builtin/commit.c:714 #: builtin/commit.c:733
msgid "could not read SQUASH_MSG" msgid "could not read SQUASH_MSG"
msgstr "" msgstr ""
#: builtin/commit.c:718 #: builtin/commit.c:737
#, c-format #, c-format
msgid "could not read '%s'" msgid "could not read '%s'"
msgstr "" msgstr ""
#: builtin/commit.c:746 #: builtin/commit.c:765
#, c-format #, c-format
msgid "could not open '%s'" msgid "could not open '%s'"
msgstr "" msgstr ""
#: builtin/commit.c:770 #: builtin/commit.c:789
msgid "could not write commit template" msgid "could not write commit template"
msgstr "" msgstr ""
#: builtin/commit.c:783 #: builtin/commit.c:799
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
@ -1434,167 +1434,172 @@ msgid ""
"and try again.\n" "and try again.\n"
msgstr "" msgstr ""
#: builtin/commit.c:796 #: builtin/commit.c:812
msgid "Please enter the commit message for your changes." msgid "Please enter the commit message for your changes."
msgstr "" msgstr ""
#: builtin/commit.c:799 #: builtin/commit.c:815
msgid "" msgid ""
" Lines starting\n" " Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n" "with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr "" msgstr ""
#: builtin/commit.c:804 #: builtin/commit.c:820
msgid "" msgid ""
" Lines starting\n" " Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n" "with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n" "An empty message aborts the commit.\n"
msgstr "" msgstr ""
#: builtin/commit.c:816 #: builtin/commit.c:832
#, c-format #, c-format
msgid "%sAuthor: %s" msgid "%sAuthor: %s"
msgstr "" msgstr ""
#: builtin/commit.c:823 #: builtin/commit.c:839
#, c-format #, c-format
msgid "%sCommitter: %s" msgid "%sCommitter: %s"
msgstr "" msgstr ""
#: builtin/commit.c:843 #: builtin/commit.c:859
msgid "Cannot read index" msgid "Cannot read index"
msgstr "" msgstr ""
#: builtin/commit.c:880 #: builtin/commit.c:896
msgid "Error building trees" msgid "Error building trees"
msgstr "" msgstr ""
#: builtin/commit.c:895 builtin/tag.c:357 #: builtin/commit.c:911 builtin/tag.c:357
#, c-format #, c-format
msgid "Please supply the message using either -m or -F option.\n" msgid "Please supply the message using either -m or -F option.\n"
msgstr "" msgstr ""
#: builtin/commit.c:975 #: builtin/commit.c:1008
#, c-format #, c-format
msgid "No existing author found with '%s'" msgid "No existing author found with '%s'"
msgstr "" msgstr ""
#: builtin/commit.c:990 builtin/commit.c:1182 #: builtin/commit.c:1023 builtin/commit.c:1217
#, c-format #, c-format
msgid "Invalid untracked files mode '%s'" msgid "Invalid untracked files mode '%s'"
msgstr "" msgstr ""
#: builtin/commit.c:1030 #: builtin/commit.c:1063
msgid "Using both --reset-author and --author does not make sense" msgid "Using both --reset-author and --author does not make sense"
msgstr "" msgstr ""
#: builtin/commit.c:1041 #: builtin/commit.c:1074
msgid "You have nothing to amend." msgid "You have nothing to amend."
msgstr "" msgstr ""
#: builtin/commit.c:1043 #: builtin/commit.c:1076
#, c-format #, c-format
msgid "You are in the middle of a %s -- cannot amend." msgid "You are in the middle of a %s -- cannot amend."
msgstr "" msgstr ""
#: builtin/commit.c:1045 #: builtin/commit.c:1078
msgid "Options --squash and --fixup cannot be used together" msgid "Options --squash and --fixup cannot be used together"
msgstr "" msgstr ""
#: builtin/commit.c:1055 #: builtin/commit.c:1088
msgid "Only one of -c/-C/-F/--fixup can be used." msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "" msgstr ""
#: builtin/commit.c:1057 #: builtin/commit.c:1090
msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "" msgstr ""
#: builtin/commit.c:1063 #: builtin/commit.c:1098
msgid "--reset-author can be used only with -C, -c or --amend." msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "" msgstr ""
#: builtin/commit.c:1080 #: builtin/commit.c:1115
msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "" msgstr ""
#: builtin/commit.c:1082 #: builtin/commit.c:1117
msgid "No paths with --include/--only does not make sense." msgid "No paths with --include/--only does not make sense."
msgstr "" msgstr ""
#: builtin/commit.c:1084 #: builtin/commit.c:1119
msgid "Clever... amending the last one with dirty index." msgid "Clever... amending the last one with dirty index."
msgstr "" msgstr ""
#: builtin/commit.c:1086 #: builtin/commit.c:1121
msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr "" msgstr ""
#: builtin/commit.c:1096 builtin/tag.c:556 #: builtin/commit.c:1131 builtin/tag.c:556
#, c-format #, c-format
msgid "Invalid cleanup mode %s" msgid "Invalid cleanup mode %s"
msgstr "" msgstr ""
#: builtin/commit.c:1101 #: builtin/commit.c:1136
msgid "Paths with -a does not make sense." msgid "Paths with -a does not make sense."
msgstr "" msgstr ""
#: builtin/commit.c:1280 #: builtin/commit.c:1315
msgid "couldn't look up newly created commit" msgid "couldn't look up newly created commit"
msgstr "" msgstr ""
#: builtin/commit.c:1282 #: builtin/commit.c:1317
msgid "could not parse newly created commit" msgid "could not parse newly created commit"
msgstr "" msgstr ""
#: builtin/commit.c:1323 #: builtin/commit.c:1358
msgid "detached HEAD" msgid "detached HEAD"
msgstr "" msgstr ""
#: builtin/commit.c:1325 #: builtin/commit.c:1360
msgid " (root-commit)" msgid " (root-commit)"
msgstr "" msgstr ""
#: builtin/commit.c:1415 #: builtin/commit.c:1450
msgid "could not parse HEAD commit" msgid "could not parse HEAD commit"
msgstr "" msgstr ""
#: builtin/commit.c:1452 builtin/merge.c:509 #: builtin/commit.c:1487 builtin/merge.c:509
#, c-format #, c-format
msgid "could not open '%s' for reading" msgid "could not open '%s' for reading"
msgstr "" msgstr ""
#: builtin/commit.c:1459 #: builtin/commit.c:1494
#, c-format #, c-format
msgid "Corrupt MERGE_HEAD file (%s)" msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "" msgstr ""
#: builtin/commit.c:1466 #: builtin/commit.c:1501
msgid "could not read MERGE_MODE" msgid "could not read MERGE_MODE"
msgstr "" msgstr ""
#: builtin/commit.c:1485 #: builtin/commit.c:1520
#, c-format #, c-format
msgid "could not read commit message: %s" msgid "could not read commit message: %s"
msgstr "" msgstr ""
#: builtin/commit.c:1499 #: builtin/commit.c:1534
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
#: builtin/commit.c:1539
#, c-format #, c-format
msgid "Aborting commit due to empty commit message.\n" msgid "Aborting commit due to empty commit message.\n"
msgstr "" msgstr ""
#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 #: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968
msgid "failed to write commit object" msgid "failed to write commit object"
msgstr "" msgstr ""
#: builtin/commit.c:1535 #: builtin/commit.c:1575
msgid "cannot lock HEAD ref" msgid "cannot lock HEAD ref"
msgstr "" msgstr ""
#: builtin/commit.c:1539 #: builtin/commit.c:1579
msgid "cannot update HEAD ref" msgid "cannot update HEAD ref"
msgstr "" msgstr ""
#: builtin/commit.c:1550 #: builtin/commit.c:1590
msgid "" msgid ""
"Repository has been updated, but unable to write\n" "Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n" "new_index file. Check that disk is not full or quota is\n"
@ -2401,51 +2406,51 @@ msgstr ""
msgid "%s - not something we can merge" msgid "%s - not something we can merge"
msgstr "" msgstr ""
#: builtin/merge.c:1385 #: builtin/merge.c:1382
#, c-format #, c-format
msgid "Updating %s..%s\n" msgid "Updating %s..%s\n"
msgstr "" msgstr ""
#: builtin/merge.c:1423 #: builtin/merge.c:1420
#, c-format #, c-format
msgid "Trying really trivial in-index merge...\n" msgid "Trying really trivial in-index merge...\n"
msgstr "" msgstr ""
#: builtin/merge.c:1430 #: builtin/merge.c:1427
#, c-format #, c-format
msgid "Nope.\n" msgid "Nope.\n"
msgstr "" msgstr ""
#: builtin/merge.c:1462 #: builtin/merge.c:1459
msgid "Not possible to fast-forward, aborting." msgid "Not possible to fast-forward, aborting."
msgstr "" msgstr ""
#: builtin/merge.c:1485 builtin/merge.c:1562 #: builtin/merge.c:1482 builtin/merge.c:1559
#, c-format #, c-format
msgid "Rewinding the tree to pristine...\n" msgid "Rewinding the tree to pristine...\n"
msgstr "" msgstr ""
#: builtin/merge.c:1489 #: builtin/merge.c:1486
#, c-format #, c-format
msgid "Trying merge strategy %s...\n" msgid "Trying merge strategy %s...\n"
msgstr "" msgstr ""
#: builtin/merge.c:1553 #: builtin/merge.c:1550
#, c-format #, c-format
msgid "No merge strategy handled the merge.\n" msgid "No merge strategy handled the merge.\n"
msgstr "" msgstr ""
#: builtin/merge.c:1555 #: builtin/merge.c:1552
#, c-format #, c-format
msgid "Merge with strategy %s failed.\n" msgid "Merge with strategy %s failed.\n"
msgstr "" msgstr ""
#: builtin/merge.c:1564 #: builtin/merge.c:1561
#, c-format #, c-format
msgid "Using the %s to prepare resolving by hand.\n" msgid "Using the %s to prepare resolving by hand.\n"
msgstr "" msgstr ""
#: builtin/merge.c:1575 #: builtin/merge.c:1572
#, c-format #, c-format
msgid "Automatic merge went well; stopped before committing as requested\n" msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "" msgstr ""
@ -2692,7 +2697,7 @@ msgstr ""
msgid "--delete only accepts plain target ref names" msgid "--delete only accepts plain target ref names"
msgstr "" msgstr ""
#: builtin/push.c:73 #: builtin/push.c:83
#, c-format #, c-format
msgid "" msgid ""
"You are not currently on a branch.\n" "You are not currently on a branch.\n"
@ -2702,7 +2707,7 @@ msgid ""
" git push %s HEAD:<name-of-remote-branch>\n" " git push %s HEAD:<name-of-remote-branch>\n"
msgstr "" msgstr ""
#: builtin/push.c:80 #: builtin/push.c:90
#, c-format #, c-format
msgid "" msgid ""
"The current branch %s has no upstream branch.\n" "The current branch %s has no upstream branch.\n"
@ -2711,27 +2716,35 @@ msgid ""
" git push --set-upstream %s %s\n" " git push --set-upstream %s %s\n"
msgstr "" msgstr ""
#: builtin/push.c:88 #: builtin/push.c:98
#, c-format #, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push." msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "" msgstr ""
#: builtin/push.c:111 #: builtin/push.c:101
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
#: builtin/push.c:127
msgid "" msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"." "You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "" msgstr ""
#: builtin/push.c:131 #: builtin/push.c:147
#, c-format #, c-format
msgid "Pushing to %s\n" msgid "Pushing to %s\n"
msgstr "" msgstr ""
#: builtin/push.c:135 #: builtin/push.c:151
#, c-format #, c-format
msgid "failed to push some refs to '%s'" msgid "failed to push some refs to '%s'"
msgstr "" msgstr ""
#: builtin/push.c:143 #: builtin/push.c:159
#, c-format #, c-format
msgid "" msgid ""
"To prevent you from losing history, non-fast-forward updates were rejected\n" "To prevent you from losing history, non-fast-forward updates were rejected\n"
@ -2739,12 +2752,12 @@ msgid ""
"'Note about fast-forwards' section of 'git push --help' for details.\n" "'Note about fast-forwards' section of 'git push --help' for details.\n"
msgstr "" msgstr ""
#: builtin/push.c:160 #: builtin/push.c:176
#, c-format #, c-format
msgid "bad repository '%s'" msgid "bad repository '%s'"
msgstr "" msgstr ""
#: builtin/push.c:161 #: builtin/push.c:177
msgid "" msgid ""
"No configured push destination.\n" "No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote " "Either specify the URL from the command-line or configure a remote "
@ -2757,31 +2770,31 @@ msgid ""
" git push <name>\n" " git push <name>\n"
msgstr "" msgstr ""
#: builtin/push.c:176 #: builtin/push.c:192
msgid "--all and --tags are incompatible" msgid "--all and --tags are incompatible"
msgstr "" msgstr ""
#: builtin/push.c:177 #: builtin/push.c:193
msgid "--all can't be combined with refspecs" msgid "--all can't be combined with refspecs"
msgstr "" msgstr ""
#: builtin/push.c:182 #: builtin/push.c:198
msgid "--mirror and --tags are incompatible" msgid "--mirror and --tags are incompatible"
msgstr "" msgstr ""
#: builtin/push.c:183 #: builtin/push.c:199
msgid "--mirror can't be combined with refspecs" msgid "--mirror can't be combined with refspecs"
msgstr "" msgstr ""
#: builtin/push.c:188 #: builtin/push.c:204
msgid "--all and --mirror are incompatible" msgid "--all and --mirror are incompatible"
msgstr "" msgstr ""
#: builtin/push.c:274 #: builtin/push.c:284
msgid "--delete is incompatible with --all, --mirror and --tags" msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "" msgstr ""
#: builtin/push.c:276 #: builtin/push.c:286
msgid "--delete doesn't make sense without any refs" msgid "--delete doesn't make sense without any refs"
msgstr "" msgstr ""

242
po/pt_PT.po
View File

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Git\n" "Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2012-03-16 20:18+0800\n" "POT-Creation-Date: 2012-03-16 20:18+0800\n"
"PO-Revision-Date: 2012-04-01 11:26+0100\n" "PO-Revision-Date: 2012-04-05 20:48+0100\n"
"Last-Translator: Marco Sousa <marcomsousa AT gmail.com>\n" "Last-Translator: Marco Sousa <marcomsousa AT gmail.com>\n"
"Language-Team: Portuguese\n" "Language-Team: Portuguese\n"
"Language: pt\n" "Language: pt\n"
@ -48,11 +48,11 @@ msgstr "%s %s não é um commit!"
#: compat/obstack.c:406 #: compat/obstack.c:406
#: compat/obstack.c:408 #: compat/obstack.c:408
msgid "memory exhausted" msgid "memory exhausted"
msgstr "memoria exausta" msgstr "memória esgotada"
#: connected.c:39 #: connected.c:39
msgid "Could not run 'git rev-list'" msgid "Could not run 'git rev-list'"
msgstr "" msgstr "Não foi possível executar 'git rev-list'"
#: connected.c:48 #: connected.c:48
#, c-format #, c-format
@ -151,8 +151,8 @@ msgstr ""
#, c-format #, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n" msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "" msgstr[0] "A sua rama está à frente de '%s' pelo commit %d.\n"
msgstr[1] "" msgstr[1] "A sua rama está à frente de '%s' pelos commites %d.\n"
#: remote.c:1613 #: remote.c:1613
#, c-format #, c-format
@ -188,7 +188,7 @@ msgstr ""
#: builtin/merge.c:1110 #: builtin/merge.c:1110
#, c-format #, c-format
msgid "Could not write to '%s'" msgid "Could not write to '%s'"
msgstr "" msgstr "Não foi possível escrever para '%s'"
#: sequencer.c:143 #: sequencer.c:143
msgid "" msgid ""
@ -208,7 +208,7 @@ msgstr ""
#: sequencer.c:768 #: sequencer.c:768
#, c-format #, c-format
msgid "Could not write to %s" msgid "Could not write to %s"
msgstr "" msgstr "Não foi possível gravar para %s"
#: sequencer.c:162 #: sequencer.c:162
#, c-format #, c-format
@ -235,11 +235,11 @@ msgstr ""
#: sequencer.c:298 #: sequencer.c:298
msgid "Your index file is unmerged." msgid "Your index file is unmerged."
msgstr "" msgstr "O seu ficheiro de índice é não fundido."
#: sequencer.c:301 #: sequencer.c:301
msgid "You do not have a valid HEAD" msgid "You do not have a valid HEAD"
msgstr "" msgstr "Você não tem uma HEAD válida"
#: sequencer.c:316 #: sequencer.c:316
#, c-format #, c-format
@ -266,7 +266,7 @@ msgstr ""
#: sequencer.c:343 #: sequencer.c:343
#, c-format #, c-format
msgid "Cannot get commit message for %s" msgid "Cannot get commit message for %s"
msgstr "" msgstr "Não é possível obter mensagem commit para %s"
#: sequencer.c:427 #: sequencer.c:427
#, c-format #, c-format
@ -291,7 +291,7 @@ msgstr ""
#: sequencer.c:453 #: sequencer.c:453
msgid "empty commit set passed" msgid "empty commit set passed"
msgstr "" msgstr "passado commit com o set vazio"
#: sequencer.c:461 #: sequencer.c:461
#, c-format #, c-format
@ -306,12 +306,12 @@ msgstr ""
#: sequencer.c:551 #: sequencer.c:551
#, c-format #, c-format
msgid "Cannot %s during a %s" msgid "Cannot %s during a %s"
msgstr "" msgstr "Não foi possível abrir %s durante um %s"
#: sequencer.c:573 #: sequencer.c:573
#, c-format #, c-format
msgid "Could not parse line %d." msgid "Could not parse line %d."
msgstr "" msgstr "Não foi possível parsear linha %d."
#: sequencer.c:578 #: sequencer.c:578
msgid "No commits parsed." msgid "No commits parsed."
@ -320,12 +320,12 @@ msgstr "Nenhum commit parseado."
#: sequencer.c:591 #: sequencer.c:591
#, c-format #, c-format
msgid "Could not open %s" msgid "Could not open %s"
msgstr "" msgstr "Não foi possível abrir %s"
#: sequencer.c:595 #: sequencer.c:595
#, c-format #, c-format
msgid "Could not read %s." msgid "Could not read %s."
msgstr "" msgstr "Não foi possível ler %s."
#: sequencer.c:602 #: sequencer.c:602
#, c-format #, c-format
@ -382,12 +382,12 @@ msgstr ""
#: sequencer.c:732 #: sequencer.c:732
#, c-format #, c-format
msgid "cannot open %s: %s" msgid "cannot open %s: %s"
msgstr "" msgstr "não foi possível abrir %s: %s"
#: sequencer.c:735 #: sequencer.c:735
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "" msgstr "não foi possível ler %s: %s"
#: sequencer.c:736 #: sequencer.c:736
msgid "unexpected end of file" msgid "unexpected end of file"
@ -401,7 +401,7 @@ msgstr ""
#: sequencer.c:765 #: sequencer.c:765
#, c-format #, c-format
msgid "Could not format %s." msgid "Could not format %s."
msgstr "" msgstr "Não foi possível formatear %s."
#: sequencer.c:927 #: sequencer.c:927
msgid "Can't revert as initial commit" msgid "Can't revert as initial commit"
@ -413,7 +413,7 @@ msgstr ""
#: wt-status.c:134 #: wt-status.c:134
msgid "Unmerged paths:" msgid "Unmerged paths:"
msgstr "" msgstr "caminhos não fundidos:"
#: wt-status.c:140 #: wt-status.c:140
#: wt-status.c:157 #: wt-status.c:157
@ -470,31 +470,31 @@ msgstr "erro"
#: wt-status.c:212 #: wt-status.c:212
msgid "both deleted:" msgid "both deleted:"
msgstr "" msgstr "eliminados em ambos:"
#: wt-status.c:213 #: wt-status.c:213
msgid "added by us:" msgid "added by us:"
msgstr "" msgstr "adicionado por nós:"
#: wt-status.c:214 #: wt-status.c:214
msgid "deleted by them:" msgid "deleted by them:"
msgstr "" msgstr "eliminados por eles:"
#: wt-status.c:215 #: wt-status.c:215
msgid "added by them:" msgid "added by them:"
msgstr "" msgstr "adicionados por eles:"
#: wt-status.c:216 #: wt-status.c:216
msgid "deleted by us:" msgid "deleted by us:"
msgstr "" msgstr "eliminados por nós:"
#: wt-status.c:217 #: wt-status.c:217
msgid "both added:" msgid "both added:"
msgstr "" msgstr "adicionados em ambos:"
#: wt-status.c:218 #: wt-status.c:218
msgid "both modified:" msgid "both modified:"
msgstr "" msgstr "modificados em ambos:"
#: wt-status.c:248 #: wt-status.c:248
msgid "new commits, " msgid "new commits, "
@ -502,11 +502,11 @@ msgstr "novos commits, "
#: wt-status.c:250 #: wt-status.c:250
msgid "modified content, " msgid "modified content, "
msgstr "" msgstr "conteúdo modificado, "
#: wt-status.c:252 #: wt-status.c:252
msgid "untracked content, " msgid "untracked content, "
msgstr "" msgstr "conteúdo não seguido"
#: wt-status.c:266 #: wt-status.c:266
#, c-format #, c-format
@ -546,7 +546,7 @@ msgstr "desconhecido: %s"
#: wt-status.c:287 #: wt-status.c:287
#, c-format #, c-format
msgid "unmerged: %s" msgid "unmerged: %s"
msgstr "" msgstr "não fundidos: %s"
#: wt-status.c:290 #: wt-status.c:290
#, c-format #, c-format
@ -559,7 +559,7 @@ msgstr "Na rama"
#: wt-status.c:720 #: wt-status.c:720
msgid "Not currently on any branch." msgid "Not currently on any branch."
msgstr "" msgstr "Não está em nenhuma rama."
#: wt-status.c:731 #: wt-status.c:731
msgid "Initial commit" msgid "Initial commit"
@ -567,7 +567,7 @@ msgstr "Commit inicial"
#: wt-status.c:745 #: wt-status.c:745
msgid "Untracked" msgid "Untracked"
msgstr "" msgstr "Não seguido"
#: wt-status.c:747 #: wt-status.c:747
msgid "Ignored" msgid "Ignored"
@ -589,7 +589,7 @@ msgstr "Sem mudanças"
#: wt-status.c:761 #: wt-status.c:761
#, c-format #, c-format
msgid "no changes added to commit%s\n" msgid "no changes added to commit%s\n"
msgstr "" msgstr "nenhuma alteração adicionado ao commit%s\n"
#: wt-status.c:763 #: wt-status.c:763
msgid " (use \"git add\" and/or \"git commit -a\")" msgid " (use \"git add\" and/or \"git commit -a\")"
@ -652,7 +652,7 @@ msgstr ""
#: builtin/add.c:67 #: builtin/add.c:67
#: builtin/commit.c:298 #: builtin/commit.c:298
msgid "updating files failed" msgid "updating files failed"
msgstr "" msgstr "Falou a atualização dos ficheiros"
#: builtin/add.c:77 #: builtin/add.c:77
#, c-format #, c-format
@ -682,16 +682,16 @@ msgstr ""
#: builtin/add.c:276 #: builtin/add.c:276
msgid "Could not read the index" msgid "Could not read the index"
msgstr "" msgstr "Não foi possível ler o indíce"
#: builtin/add.c:286 #: builtin/add.c:286
#, c-format #, c-format
msgid "Could not open '%s' for writing." msgid "Could not open '%s' for writing."
msgstr "" msgstr "Não foi possível abrir '%s' para escrever."
#: builtin/add.c:290 #: builtin/add.c:290
msgid "Could not write patch" msgid "Could not write patch"
msgstr "" msgstr "Não consegue escrever patch"
#: builtin/add.c:295 #: builtin/add.c:295
#, c-format #, c-format
@ -700,12 +700,12 @@ msgstr ""
#: builtin/add.c:297 #: builtin/add.c:297
msgid "Empty patch. Aborted." msgid "Empty patch. Aborted."
msgstr "" msgstr "Patch vazio. Aborted."
#: builtin/add.c:303 #: builtin/add.c:303
#, c-format #, c-format
msgid "Could not apply '%s'" msgid "Could not apply '%s'"
msgstr "" msgstr "Não foi possível aplicar o '%s'"
#: builtin/add.c:312 #: builtin/add.c:312
msgid "The following paths are ignored by one of your .gitignore files:\n" msgid "The following paths are ignored by one of your .gitignore files:\n"
@ -722,7 +722,7 @@ msgstr "nenhum ficheiros adicionado"
#: builtin/add.c:359 #: builtin/add.c:359
msgid "adding files failed" msgid "adding files failed"
msgstr "" msgstr "falhou a adicionar ficheiros"
#: builtin/add.c:391 #: builtin/add.c:391
msgid "-A and -u are mutually incompatible" msgid "-A and -u are mutually incompatible"
@ -748,7 +748,7 @@ msgstr ""
#: builtin/mv.c:82 #: builtin/mv.c:82
#: builtin/rm.c:162 #: builtin/rm.c:162
msgid "index file corrupt" msgid "index file corrupt"
msgstr "" msgstr "ficheiro index corrupto"
#: builtin/add.c:476 #: builtin/add.c:476
#: builtin/mv.c:229 #: builtin/mv.c:229
@ -781,7 +781,7 @@ msgstr ""
#: builtin/archive.c:65 #: builtin/archive.c:65
#, c-format #, c-format
msgid "remote error: %s" msgid "remote error: %s"
msgstr "" msgstr "erro remoto: %s"
#: builtin/archive.c:66 #: builtin/archive.c:66
msgid "git archive: protocol error" msgid "git archive: protocol error"
@ -812,7 +812,7 @@ msgstr "remota"
#: builtin/branch.c:171 #: builtin/branch.c:171
msgid "cannot use -a with -d" msgid "cannot use -a with -d"
msgstr "" msgstr "Não é possível usar -a com um -d"
#: builtin/branch.c:177 #: builtin/branch.c:177
msgid "Couldn't look up commit object for HEAD" msgid "Couldn't look up commit object for HEAD"
@ -826,7 +826,7 @@ msgstr ""
#: builtin/branch.c:192 #: builtin/branch.c:192
#, c-format #, c-format
msgid "%sbranch '%s' not found." msgid "%sbranch '%s' not found."
msgstr "" msgstr "%sbranch '%s' não encontrado."
#: builtin/branch.c:200 #: builtin/branch.c:200
#, c-format #, c-format
@ -862,17 +862,17 @@ msgstr ""
#: builtin/branch.c:394 #: builtin/branch.c:394
#, c-format #, c-format
msgid "behind %d] " msgid "behind %d] "
msgstr "" msgstr "atrás %d] "
#: builtin/branch.c:396 #: builtin/branch.c:396
#, c-format #, c-format
msgid "ahead %d] " msgid "ahead %d] "
msgstr "" msgstr "a frente %d] "
#: builtin/branch.c:398 #: builtin/branch.c:398
#, c-format #, c-format
msgid "ahead %d, behind %d] " msgid "ahead %d, behind %d] "
msgstr "" msgstr "a frente %d, atrás %d] "
#: builtin/branch.c:501 #: builtin/branch.c:501
msgid "(no branch)" msgid "(no branch)"
@ -889,16 +889,16 @@ msgstr ""
#: builtin/branch.c:589 #: builtin/branch.c:589
#, c-format #, c-format
msgid "Invalid branch name: '%s'" msgid "Invalid branch name: '%s'"
msgstr "" msgstr "Nome da rama inválida: '%s'"
#: builtin/branch.c:604 #: builtin/branch.c:604
msgid "Branch rename failed" msgid "Branch rename failed"
msgstr "" msgstr "Falhou renomeação da rama"
#: builtin/branch.c:608 #: builtin/branch.c:608
#, c-format #, c-format
msgid "Renamed a misnamed branch '%s' away" msgid "Renamed a misnamed branch '%s' away"
msgstr "" msgstr "Renomeado uma rama erronea '%s'"
#: builtin/branch.c:612 #: builtin/branch.c:612
#, c-format #, c-format
@ -986,7 +986,7 @@ msgstr ""
#: builtin/checkout.c:234 #: builtin/checkout.c:234
#: builtin/checkout.c:392 #: builtin/checkout.c:392
msgid "corrupt index file" msgid "corrupt index file"
msgstr "" msgstr "ficheiro index corrupto"
#: builtin/checkout.c:264 #: builtin/checkout.c:264
#: builtin/checkout.c:271 #: builtin/checkout.c:271
@ -1038,17 +1038,17 @@ msgstr ""
#: builtin/checkout.c:581 #: builtin/checkout.c:581
#, c-format #, c-format
msgid "Switched to a new branch '%s'\n" msgid "Switched to a new branch '%s'\n"
msgstr "" msgstr "Mudado para a nova rama '%s'\n"
#: builtin/checkout.c:583 #: builtin/checkout.c:583
#, c-format #, c-format
msgid "Switched to branch '%s'\n" msgid "Switched to branch '%s'\n"
msgstr "" msgstr "Mudado para a rama '%s'\n"
#: builtin/checkout.c:639 #: builtin/checkout.c:639
#, c-format #, c-format
msgid " ... and %d more.\n" msgid " ... and %d more.\n"
msgstr "" msgstr " ... e %d mais.\n"
#. The singular version #. The singular version
#: builtin/checkout.c:645 #: builtin/checkout.c:645
@ -1191,7 +1191,7 @@ msgstr ""
#: builtin/clean.c:179 #: builtin/clean.c:179
#, c-format #, c-format
msgid "Removing %s\n" msgid "Removing %s\n"
msgstr "" msgstr "Eliminando %s\n"
#: builtin/clean.c:162 #: builtin/clean.c:162
#: builtin/clean.c:182 #: builtin/clean.c:182
@ -1271,7 +1271,7 @@ msgstr ""
#: builtin/clone.c:639 #: builtin/clone.c:639
msgid "Too many arguments." msgid "Too many arguments."
msgstr "" msgstr "Demasiados parametros."
#: builtin/clone.c:643 #: builtin/clone.c:643
msgid "You must specify a repository to clone." msgid "You must specify a repository to clone."
@ -1315,17 +1315,17 @@ msgstr ""
#: builtin/clone.c:728 #: builtin/clone.c:728
#, c-format #, c-format
msgid "Cloning into bare repository '%s'...\n" msgid "Cloning into bare repository '%s'...\n"
msgstr "" msgstr "Clonando em um repositorio nu (bare) '%s'...\n"
#: builtin/clone.c:730 #: builtin/clone.c:730
#, c-format #, c-format
msgid "Cloning into '%s'...\n" msgid "Cloning into '%s'...\n"
msgstr "" msgstr "Clonar em '%s'...\n"
#: builtin/clone.c:786 #: builtin/clone.c:786
#, c-format #, c-format
msgid "Don't know how to clone %s" msgid "Don't know how to clone %s"
msgstr "" msgstr "Não sei como clonar %s"
#: builtin/clone.c:835 #: builtin/clone.c:835
#, c-format #, c-format
@ -1349,6 +1349,16 @@ msgid ""
"\n" "\n"
" git commit --amend --reset-author\n" " git commit --amend --reset-author\n"
msgstr "" msgstr ""
"O seu nome e endereço de e-mail foram configurados automaticamente com base\n"
"no o seu usuario e nome da maquina. Por favor, verifique se eles são precisos.\n"
"Você pode suprimir esta mensagem, configurando-los explicitamente:\n"
"\n"
" git config --global user.name \"O teu Nome\"\n"
" git config --global user.email tu@examplo.com\n"
"\n"
"Após fazer isso, você pode corregir a identidade usada em este commit com:\n"
"\n"
" git commit --amend --reset-author\n"
#: builtin/commit.c:54 #: builtin/commit.c:54
msgid "" msgid ""
@ -1386,7 +1396,7 @@ msgstr ""
#: builtin/commit.c:373 #: builtin/commit.c:373
msgid "interactive add failed" msgid "interactive add failed"
msgstr "" msgstr "falhou adicionar interativo"
#: builtin/commit.c:406 #: builtin/commit.c:406
#: builtin/commit.c:427 #: builtin/commit.c:427
@ -1401,7 +1411,7 @@ msgstr ""
#: builtin/commit.c:466 #: builtin/commit.c:466
msgid "cannot read the index" msgid "cannot read the index"
msgstr "" msgstr "não foi possível ler o indíce"
#: builtin/commit.c:486 #: builtin/commit.c:486
msgid "unable to write temporary index file" msgid "unable to write temporary index file"
@ -1442,29 +1452,29 @@ msgstr ""
#: builtin/commit.c:688 #: builtin/commit.c:688
#, c-format #, c-format
msgid "could not read log file '%s'" msgid "could not read log file '%s'"
msgstr "" msgstr "não é possivel ler o ficheiro de log '%s'"
#: builtin/commit.c:694 #: builtin/commit.c:694
msgid "commit has empty message" msgid "commit has empty message"
msgstr "" msgstr "a mensagem do commit está vazia"
#: builtin/commit.c:710 #: builtin/commit.c:710
msgid "could not read MERGE_MSG" msgid "could not read MERGE_MSG"
msgstr "" msgstr "não é possivel ler MERGE_MSG"
#: builtin/commit.c:714 #: builtin/commit.c:714
msgid "could not read SQUASH_MSG" msgid "could not read SQUASH_MSG"
msgstr "" msgstr "não é possivel ler SQUASH_MSG"
#: builtin/commit.c:718 #: builtin/commit.c:718
#, c-format #, c-format
msgid "could not read '%s'" msgid "could not read '%s'"
msgstr "" msgstr "não é possivel ler '%s'"
#: builtin/commit.c:746 #: builtin/commit.c:746
#, c-format #, c-format
msgid "could not open '%s'" msgid "could not open '%s'"
msgstr "" msgstr "não é possivel abrir '%s'"
#: builtin/commit.c:770 #: builtin/commit.c:770
msgid "could not write commit template" msgid "could not write commit template"
@ -1482,7 +1492,7 @@ msgstr ""
#: builtin/commit.c:796 #: builtin/commit.c:796
msgid "Please enter the commit message for your changes." msgid "Please enter the commit message for your changes."
msgstr "" msgstr "Por favor insira a mensagem de commit das suas alterações."
#: builtin/commit.c:799 #: builtin/commit.c:799
msgid "" msgid ""
@ -1538,7 +1548,7 @@ msgstr ""
#: builtin/commit.c:1041 #: builtin/commit.c:1041
msgid "You have nothing to amend." msgid "You have nothing to amend."
msgstr "" msgstr "Você não tem nada a corregir."
#: builtin/commit.c:1043 #: builtin/commit.c:1043
#, c-format #, c-format
@ -1725,7 +1735,7 @@ msgstr ""
#: builtin/describe.c:462 #: builtin/describe.c:462
msgid "No names found, cannot describe anything." msgid "No names found, cannot describe anything."
msgstr "" msgstr "Nenhum nome encontrado, não descreve nada."
#: builtin/describe.c:482 #: builtin/describe.c:482
msgid "--dirty is incompatible with committishes" msgid "--dirty is incompatible with committishes"
@ -1882,7 +1892,7 @@ msgstr ""
#: builtin/fetch.c:879 #: builtin/fetch.c:879
#, c-format #, c-format
msgid "Fetching %s\n" msgid "Fetching %s\n"
msgstr "" msgstr "Baixando %s\n"
#: builtin/fetch.c:881 #: builtin/fetch.c:881
#, c-format #, c-format
@ -1894,10 +1904,12 @@ msgid ""
"No remote repository specified. Please, specify either a URL or a\n" "No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched." "remote name from which new revisions should be fetched."
msgstr "" msgstr ""
"Nenhum repositório remoto especificado. Por favor, especifique um URL ou o\n"
"nome remoto a partir do qual novas revisões devem ser obtida."
#: builtin/fetch.c:918 #: builtin/fetch.c:918
msgid "You need to specify a tag name." msgid "You need to specify a tag name."
msgstr "" msgstr "Você precisa especificar um nome da etiqueta."
#: builtin/fetch.c:970 #: builtin/fetch.c:970
msgid "fetch --all does not take a repository argument" msgid "fetch --all does not take a repository argument"
@ -1919,11 +1931,11 @@ msgstr ""
#: builtin/gc.c:63 #: builtin/gc.c:63
#, c-format #, c-format
msgid "Invalid %s: '%s'" msgid "Invalid %s: '%s'"
msgstr "" msgstr "Inválido %s: '%s'"
#: builtin/gc.c:78 #: builtin/gc.c:78
msgid "Too many options specified" msgid "Too many options specified"
msgstr "" msgstr "Demasiadas opções especificadas"
#: builtin/gc.c:103 #: builtin/gc.c:103
#, c-format #, c-format
@ -2162,7 +2174,7 @@ msgstr ""
#: builtin/log.c:507 #: builtin/log.c:507
#, c-format #, c-format
msgid "Unknown type: %d" msgid "Unknown type: %d"
msgstr "" msgstr "Tipo desconhecido: %d"
#: builtin/log.c:596 #: builtin/log.c:596
msgid "format.headers without value" msgid "format.headers without value"
@ -2170,28 +2182,28 @@ msgstr ""
#: builtin/log.c:669 #: builtin/log.c:669
msgid "name of output directory is too long" msgid "name of output directory is too long"
msgstr "" msgstr "nome do diretório de saída é demasiado longo"
#: builtin/log.c:680 #: builtin/log.c:680
#, c-format #, c-format
msgid "Cannot open patch file %s" msgid "Cannot open patch file %s"
msgstr "" msgstr "Não é possivel abrir o ficheiro patch %s"
#: builtin/log.c:694 #: builtin/log.c:694
msgid "Need exactly one range." msgid "Need exactly one range."
msgstr "" msgstr "Necessita de exatamente um intervalo."
#: builtin/log.c:702 #: builtin/log.c:702
msgid "Not a range." msgid "Not a range."
msgstr "" msgstr "Não é um intervalo."
#: builtin/log.c:739 #: builtin/log.c:739
msgid "Could not extract email from committer identity." msgid "Could not extract email from committer identity."
msgstr "" msgstr "Não foi possível extrair a identidade do committer do e-mail."
#: builtin/log.c:785 #: builtin/log.c:785
msgid "Cover letter needs email format" msgid "Cover letter needs email format"
msgstr "" msgstr "Carta de apresentação necessita um modelo de e-mail"
#: builtin/log.c:879 #: builtin/log.c:879
#, c-format #, c-format
@ -2200,7 +2212,7 @@ msgstr ""
#: builtin/log.c:952 #: builtin/log.c:952
msgid "Two output directories?" msgid "Two output directories?"
msgstr "" msgstr "Dois diretórios de saída?"
#: builtin/log.c:1173 #: builtin/log.c:1173
#, c-format #, c-format
@ -2219,7 +2231,7 @@ msgstr ""
#: builtin/shortlog.c:284 #: builtin/shortlog.c:284
#, c-format #, c-format
msgid "unrecognized argument: %s" msgid "unrecognized argument: %s"
msgstr "" msgstr "argumento não reconhecido: %s"
#: builtin/log.c:1228 #: builtin/log.c:1228
msgid "--name-only does not make sense" msgid "--name-only does not make sense"
@ -2235,7 +2247,7 @@ msgstr ""
#: builtin/log.c:1255 #: builtin/log.c:1255
msgid "standard output, or directory, which one?" msgid "standard output, or directory, which one?"
msgstr "" msgstr "saída padrão, ou diretório, qual deles?"
#: builtin/log.c:1257 #: builtin/log.c:1257
#, c-format #, c-format
@ -2244,7 +2256,7 @@ msgstr ""
#: builtin/log.c:1410 #: builtin/log.c:1410
msgid "Failed to create output files" msgid "Failed to create output files"
msgstr "" msgstr "Falhou ao criar ficheiros de saída"
#: builtin/log.c:1514 #: builtin/log.c:1514
#, c-format #, c-format
@ -2270,12 +2282,12 @@ msgstr ""
#: builtin/merge.c:129 #: builtin/merge.c:129
#, c-format #, c-format
msgid "Available strategies are:" msgid "Available strategies are:"
msgstr "" msgstr "As estratégias disponíveis são:"
#: builtin/merge.c:134 #: builtin/merge.c:134
#, c-format #, c-format
msgid "Available custom strategies are:" msgid "Available custom strategies are:"
msgstr "" msgstr "Estratégias personalizadas disponíveis são:"
#: builtin/merge.c:241 #: builtin/merge.c:241
msgid "could not run stash." msgid "could not run stash."
@ -2361,7 +2373,7 @@ msgstr ""
#: builtin/merge.c:885 #: builtin/merge.c:885
#, c-format #, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "" msgstr "Não commitando um merge; usa 'git commit' para completar o merge.\n"
#: builtin/merge.c:891 #: builtin/merge.c:891
msgid "" msgid ""
@ -2374,7 +2386,7 @@ msgstr ""
#: builtin/merge.c:915 #: builtin/merge.c:915
msgid "Empty commit message." msgid "Empty commit message."
msgstr "" msgstr "Mensagem de commit vazia."
#: builtin/merge.c:927 #: builtin/merge.c:927
#, c-format #, c-format
@ -2502,7 +2514,7 @@ msgstr ""
#: builtin/merge.c:1555 #: builtin/merge.c:1555
#, c-format #, c-format
msgid "Merge with strategy %s failed.\n" msgid "Merge with strategy %s failed.\n"
msgstr "" msgstr "Fundir com a estratégia %s falhou.\n"
#: builtin/merge.c:1564 #: builtin/merge.c:1564
#, c-format #, c-format
@ -2538,15 +2550,15 @@ msgstr ""
#: builtin/mv.c:140 #: builtin/mv.c:140
msgid "source directory is empty" msgid "source directory is empty"
msgstr "" msgstr "o directorio fonte está vazio"
#: builtin/mv.c:171 #: builtin/mv.c:171
msgid "not under version control" msgid "not under version control"
msgstr "" msgstr "não está no controlo de versões"
#: builtin/mv.c:173 #: builtin/mv.c:173
msgid "destination exists" msgid "destination exists"
msgstr "" msgstr "existe destino"
#: builtin/mv.c:181 #: builtin/mv.c:181
#, c-format #, c-format
@ -2559,7 +2571,7 @@ msgstr "Não consegue subscrever"
#: builtin/mv.c:187 #: builtin/mv.c:187
msgid "multiple sources for the same target" msgid "multiple sources for the same target"
msgstr "" msgstr "múltiplas fontes para o mesmo alvo"
#: builtin/mv.c:202 #: builtin/mv.c:202
#, c-format #, c-format
@ -2569,12 +2581,12 @@ msgstr ""
#: builtin/mv.c:212 #: builtin/mv.c:212
#, c-format #, c-format
msgid "Renaming %s to %s\n" msgid "Renaming %s to %s\n"
msgstr "" msgstr "Mudar de nome %s para %s\n"
#: builtin/mv.c:215 #: builtin/mv.c:215
#, c-format #, c-format
msgid "renaming '%s' failed" msgid "renaming '%s' failed"
msgstr "" msgstr "mudar de nome '%s' falhou"
#: builtin/notes.c:139 #: builtin/notes.c:139
#, c-format #, c-format
@ -2672,7 +2684,7 @@ msgstr ""
#: builtin/notes.c:377 #: builtin/notes.c:377
#, c-format #, c-format
msgid "Bad %s value: '%s'" msgid "Bad %s value: '%s'"
msgstr "" msgstr "Inválido %s valor: '%s'"
#: builtin/notes.c:441 #: builtin/notes.c:441
#, c-format #, c-format
@ -2692,13 +2704,13 @@ msgstr ""
#: builtin/notes.c:759 #: builtin/notes.c:759
#: builtin/notes.c:1033 #: builtin/notes.c:1033
msgid "too many parameters" msgid "too many parameters"
msgstr "" msgstr "demasiado parametros"
#: builtin/notes.c:513 #: builtin/notes.c:513
#: builtin/notes.c:772 #: builtin/notes.c:772
#, c-format #, c-format
msgid "No note found for object %s." msgid "No note found for object %s."
msgstr "" msgstr "Nenhuma nota encontrada para o objecto %s."
#: builtin/notes.c:580 #: builtin/notes.c:580
#, c-format #, c-format
@ -2755,7 +2767,7 @@ msgstr ""
#: builtin/pack-objects.c:2322 #: builtin/pack-objects.c:2322
#, c-format #, c-format
msgid "option %s does not accept negative form" msgid "option %s does not accept negative form"
msgstr "" msgstr "opção %s não aceita formato negativo"
#: builtin/pack-objects.c:2326 #: builtin/pack-objects.c:2326
#, c-format #, c-format
@ -2768,7 +2780,7 @@ msgstr ""
#: builtin/push.c:63 #: builtin/push.c:63
msgid "--delete only accepts plain target ref names" msgid "--delete only accepts plain target ref names"
msgstr "" msgstr "--delete só aceita nomes simples para o ref de destino"
#: builtin/push.c:73 #: builtin/push.c:73
#, c-format #, c-format
@ -2835,7 +2847,7 @@ msgstr ""
#: builtin/push.c:176 #: builtin/push.c:176
msgid "--all and --tags are incompatible" msgid "--all and --tags are incompatible"
msgstr "" msgstr "--all e --tags are são incompatíveis"
#: builtin/push.c:177 #: builtin/push.c:177
msgid "--all can't be combined with refspecs" msgid "--all can't be combined with refspecs"
@ -2879,7 +2891,7 @@ msgstr "manter"
#: builtin/reset.c:77 #: builtin/reset.c:77
msgid "You do not have a valid HEAD." msgid "You do not have a valid HEAD."
msgstr "" msgstr "Não tens a HEAD válida."
#: builtin/reset.c:79 #: builtin/reset.c:79
msgid "Failed to find tree of HEAD." msgid "Failed to find tree of HEAD."
@ -2915,7 +2927,7 @@ msgstr ""
#: builtin/reset.c:297 #: builtin/reset.c:297
#, c-format #, c-format
msgid "Could not parse object '%s'." msgid "Could not parse object '%s'."
msgstr "" msgstr "Não foi possível analisar objeto '%s'."
#: builtin/reset.c:302 #: builtin/reset.c:302
msgid "--patch is incompatible with --{hard,mixed,soft}" msgid "--patch is incompatible with --{hard,mixed,soft}"
@ -3055,7 +3067,7 @@ msgstr ""
#: builtin/tag.c:366 #: builtin/tag.c:366
msgid "no tag message?" msgid "no tag message?"
msgstr "" msgstr "nenhuma mensaje para a etiqueta?"
#: builtin/tag.c:372 #: builtin/tag.c:372
#, c-format #, c-format
@ -3099,7 +3111,7 @@ msgstr ""
#: builtin/tag.c:545 #: builtin/tag.c:545
#, c-format #, c-format
msgid "tag '%s' already exists" msgid "tag '%s' already exists"
msgstr "" msgstr "etiqueta '%s' já existe"
#: builtin/tag.c:563 #: builtin/tag.c:563
#, c-format #, c-format
@ -3118,7 +3130,7 @@ msgstr ""
#: git-am.sh:49 #: git-am.sh:49
msgid "You need to set your committer info first" msgid "You need to set your committer info first"
msgstr "" msgstr "Necessitas primeiro de especificiar os teus dados de committer"
#: git-am.sh:136 #: git-am.sh:136
msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgid "Repository lacks necessary blobs to fall back on 3-way merge."
@ -3145,7 +3157,7 @@ msgstr ""
#: git-am.sh:357 #: git-am.sh:357
msgid "Patch format detection failed." msgid "Patch format detection failed."
msgstr "" msgstr "Falhou a detecção do formato do patch."
#: git-am.sh:411 #: git-am.sh:411
msgid "-d option is no longer supported. Do not use." msgid "-d option is no longer supported. Do not use."
@ -3187,7 +3199,7 @@ msgstr "Aplicando: $FIRSTLINE"
#: git-am.sh:840 #: git-am.sh:840
msgid "No changes -- Patch already applied." msgid "No changes -- Patch already applied."
msgstr "" msgstr "Nenhuma mudança -- Já foi aplicado o patch."
#: git-am.sh:866 #: git-am.sh:866
msgid "applying to an empty history" msgid "applying to an empty history"
@ -3307,7 +3319,7 @@ msgstr ""
#: git-pull.sh:257 #: git-pull.sh:257
msgid "Cannot rebase onto multiple branches" msgid "Cannot rebase onto multiple branches"
msgstr "" msgstr "Não é possível fazer rebase com várias ramas"
#: git-stash.sh:51 #: git-stash.sh:51
msgid "git stash clear with parameters is unimplemented" msgid "git stash clear with parameters is unimplemented"
@ -3328,7 +3340,7 @@ msgstr ""
#: git-stash.sh:140 #: git-stash.sh:140
msgid "No changes selected" msgid "No changes selected"
msgstr "" msgstr "Não há alterações seleccionadas"
#: git-stash.sh:143 #: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)" msgid "Cannot remove temporary index (can't happen)"
@ -3340,11 +3352,11 @@ msgstr ""
#: git-stash.sh:223 #: git-stash.sh:223
msgid "No local changes to save" msgid "No local changes to save"
msgstr "" msgstr "Sem alterações locais para guardar"
#: git-stash.sh:227 #: git-stash.sh:227
msgid "Cannot initialize stash" msgid "Cannot initialize stash"
msgstr "" msgstr "Não é possível inicializar o stash"
#: git-stash.sh:235 #: git-stash.sh:235
msgid "Cannot save the current status" msgid "Cannot save the current status"
@ -3401,7 +3413,7 @@ msgstr ""
#: git-stash.sh:491 #: git-stash.sh:491
#, sh-format #, sh-format
msgid "Dropped ${REV} ($s)" msgid "Dropped ${REV} ($s)"
msgstr "" msgstr "Deixado cair ${REV} ($s)"
#: git-stash.sh:492 #: git-stash.sh:492
#, sh-format #, sh-format
@ -3410,7 +3422,7 @@ msgstr ""
#: git-stash.sh:499 #: git-stash.sh:499
msgid "No branch name specified" msgid "No branch name specified"
msgstr "" msgstr "Nenhum nome para a rama especificado"
#: git-stash.sh:570 #: git-stash.sh:570
msgid "(To restore them type \"git stash apply\")" msgid "(To restore them type \"git stash apply\")"
@ -3469,7 +3481,7 @@ msgstr ""
#: git-submodule.sh:347 #: git-submodule.sh:347
#, sh-format #, sh-format
msgid "Entering '$prefix$path'" msgid "Entering '$prefix$path'"
msgstr "" msgstr "Entrando '$prefix$path'"
#: git-submodule.sh:359 #: git-submodule.sh:359
#, sh-format #, sh-format

184
po/zh_CN.po
View File

@ -12,7 +12,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Git\n" "Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2012-03-16 20:18+0800\n" "POT-Creation-Date: 2012-04-28 20:33+0800\n"
"PO-Revision-Date: 2012-01-30 00:00+0800\n" "PO-Revision-Date: 2012-01-30 00:00+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
@ -91,29 +91,29 @@ msgstr ""
"发现配置变量 'diff.dirstat' 中的错误：\n" "发现配置变量 'diff.dirstat' 中的错误：\n"
"%s" "%s"
#: diff.c:1336 #: diff.c:1400
msgid " 0 files changed\n" msgid " 0 files changed\n"
msgstr " 0 个文件被修改\n" msgstr " 0 个文件被修改\n"
#: diff.c:1340 #: diff.c:1404
#, c-format #, c-format
msgid " %d file changed" msgid " %d file changed"
msgid_plural " %d files changed" msgid_plural " %d files changed"
msgstr[0] " %d 个文件被修改" msgstr[0] " %d 个文件被修改"
#: diff.c:1357 #: diff.c:1421
#, c-format #, c-format
msgid ", %d insertion(+)" msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)" msgid_plural ", %d insertions(+)"
msgstr[0] "，插入 %d 行(+)" msgstr[0] "，插入 %d 行(+)"
#: diff.c:1368 #: diff.c:1432
#, c-format #, c-format
msgid ", %d deletion(-)" msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)" msgid_plural ", %d deletions(-)"
msgstr[0] "，删除 %d 行(-)" msgstr[0] "，删除 %d 行(-)"
#: diff.c:3424 #: diff.c:3435
#, c-format #, c-format
msgid "" msgid ""
"Failed to parse --dirstat/-X option parameter:\n" "Failed to parse --dirstat/-X option parameter:\n"
@ -1452,67 +1452,67 @@ msgstr "无法读取索引"
msgid "unable to write temporary index file" msgid "unable to write temporary index file"
msgstr "无法写临时索引文件" msgstr "无法写临时索引文件"
#: builtin/commit.c:550 builtin/commit.c:556 #: builtin/commit.c:561 builtin/commit.c:567
#, c-format #, c-format
msgid "invalid commit: %s" msgid "invalid commit: %s"
msgstr "无效的提交：%s" msgstr "无效的提交：%s"
#: builtin/commit.c:579 #: builtin/commit.c:590
msgid "malformed --author parameter" msgid "malformed --author parameter"
msgstr "非法的 --author 参数" msgstr "非法的 --author 参数"
#: builtin/commit.c:635 #: builtin/commit.c:651
#, c-format #, c-format
msgid "Malformed ident string: '%s'" msgid "Malformed ident string: '%s'"
msgstr "非法的身份字符串：'%s'" msgstr "非法的身份字符串：'%s'"
#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 #: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
#, c-format #, c-format
msgid "could not lookup commit %s" msgid "could not lookup commit %s"
msgstr "不能查询提交 %s" msgstr "不能查询提交 %s"
#: builtin/commit.c:682 builtin/shortlog.c:296 #: builtin/commit.c:701 builtin/shortlog.c:296
#, c-format #, c-format
msgid "(reading log message from standard input)\n" msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n" msgstr "（正从标准输入中读取日志信息）\n"
#: builtin/commit.c:684 #: builtin/commit.c:703
msgid "could not read log from standard input" msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息" msgstr "不能从标准输入中读取日志信息"
#: builtin/commit.c:688 #: builtin/commit.c:707
#, c-format #, c-format
msgid "could not read log file '%s'" msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'" msgstr "不能读取日志文件 '%s'"
#: builtin/commit.c:694 #: builtin/commit.c:713
msgid "commit has empty message" msgid "commit has empty message"
msgstr "提交说明为空" msgstr "提交说明为空"
#: builtin/commit.c:710 #: builtin/commit.c:729
msgid "could not read MERGE_MSG" msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG" msgstr "不能读取 MERGE_MSG"
#: builtin/commit.c:714 #: builtin/commit.c:733
msgid "could not read SQUASH_MSG" msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG" msgstr "不能读取 SQUASH_MSG"
#: builtin/commit.c:718 #: builtin/commit.c:737
#, c-format #, c-format
msgid "could not read '%s'" msgid "could not read '%s'"
msgstr "不能读取 '%s'" msgstr "不能读取 '%s'"
#: builtin/commit.c:746 #: builtin/commit.c:765
#, c-format #, c-format
msgid "could not open '%s'" msgid "could not open '%s'"
msgstr "不能打开 '%s'" msgstr "不能打开 '%s'"
#: builtin/commit.c:770 #: builtin/commit.c:789
msgid "could not write commit template" msgid "could not write commit template"
msgstr "不能写提交模版" msgstr "不能写提交模版"
# 译者：%s若翻为中文，前后不需要空格 # 译者：%s若翻为中文，前后不需要空格
#: builtin/commit.c:783 #: builtin/commit.c:799
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
@ -1527,12 +1527,12 @@ msgstr ""
"\t%s\n" "\t%s\n"
"然后重试。\n" "然后重试。\n"
#: builtin/commit.c:796 #: builtin/commit.c:812
msgid "Please enter the commit message for your changes." msgid "Please enter the commit message for your changes."
msgstr "请为您的修改输入提交说明。" msgstr "请为您的修改输入提交说明。"
# 译者：中文字符串拼接，可删除前导空格 # 译者：中文字符串拼接，可删除前导空格
#: builtin/commit.c:799 #: builtin/commit.c:815
msgid "" msgid ""
" Lines starting\n" " Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n" "with '#' will be ignored, and an empty message aborts the commit.\n"
@ -1541,7 +1541,7 @@ msgstr ""
"的行将被忽略，并且空的提交说明将会中止提交。\n" "的行将被忽略，并且空的提交说明将会中止提交。\n"
# 译者：中文字符串拼接，可删除前导空格 # 译者：中文字符串拼接，可删除前导空格
#: builtin/commit.c:804 #: builtin/commit.c:820
msgid "" msgid ""
" Lines starting\n" " Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n" "with '#' will be kept; you may remove them yourself if you want to.\n"
@ -1552,153 +1552,158 @@ msgstr ""
"中止提交。\n" "中止提交。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！ # 译者：为保证在输出中对齐，注意调整句中空格！
#: builtin/commit.c:816 #: builtin/commit.c:832
#, c-format #, c-format
msgid "%sAuthor: %s" msgid "%sAuthor: %s"
msgstr "%s作者： %s" msgstr "%s作者： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！ # 译者：为保证在输出中对齐，注意调整句中空格！
#: builtin/commit.c:823 #: builtin/commit.c:839
#, c-format #, c-format
msgid "%sCommitter: %s" msgid "%sCommitter: %s"
msgstr "%s提交者： %s" msgstr "%s提交者： %s"
#: builtin/commit.c:843 #: builtin/commit.c:859
msgid "Cannot read index" msgid "Cannot read index"
msgstr "无法读取索引" msgstr "无法读取索引"
#: builtin/commit.c:880 #: builtin/commit.c:896
msgid "Error building trees" msgid "Error building trees"
msgstr "无法创建树对象" msgstr "无法创建树对象"
#: builtin/commit.c:895 builtin/tag.c:357 #: builtin/commit.c:911 builtin/tag.c:357
#, c-format #, c-format
msgid "Please supply the message using either -m or -F option.\n" msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
#: builtin/commit.c:975 #: builtin/commit.c:1008
#, c-format #, c-format
msgid "No existing author found with '%s'" msgid "No existing author found with '%s'"
msgstr "没有找到匹配 '%s' 的作者" msgstr "没有找到匹配 '%s' 的作者"
#: builtin/commit.c:990 builtin/commit.c:1182 #: builtin/commit.c:1023 builtin/commit.c:1217
#, c-format #, c-format
msgid "Invalid untracked files mode '%s'" msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'" msgstr "无效的未追踪文件参数 '%s'"
#: builtin/commit.c:1030 #: builtin/commit.c:1063
msgid "Using both --reset-author and --author does not make sense" msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义" msgstr "同时使用 --reset-author 和 --author 没有意义"
#: builtin/commit.c:1041 #: builtin/commit.c:1074
msgid "You have nothing to amend." msgid "You have nothing to amend."
msgstr "您没有可修补的提交。" msgstr "您没有可修补的提交。"
# 译者：%s若翻为中文，前后不需要空格 # 译者：%s若翻为中文，前后不需要空格
#: builtin/commit.c:1043 #: builtin/commit.c:1076
#, c-format #, c-format
msgid "You are in the middle of a %s -- cannot amend." msgid "You are in the middle of a %s -- cannot amend."
msgstr "您正处于一个%s的过程中 -- 无法修补提交。" msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
#: builtin/commit.c:1045 #: builtin/commit.c:1078
msgid "Options --squash and --fixup cannot be used together" msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能共用" msgstr "选项 --squash 和 --fixup 不能共用"
#: builtin/commit.c:1055 #: builtin/commit.c:1088
msgid "Only one of -c/-C/-F/--fixup can be used." msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。" msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
#: builtin/commit.c:1057 #: builtin/commit.c:1090
msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。" msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
#: builtin/commit.c:1063 #: builtin/commit.c:1098
msgid "--reset-author can be used only with -C, -c or --amend." msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。" msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
#: builtin/commit.c:1080 #: builtin/commit.c:1115
msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
#: builtin/commit.c:1082 #: builtin/commit.c:1117
msgid "No paths with --include/--only does not make sense." msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。" msgstr "参数 --include/--only 不跟路径没有意义。"
#: builtin/commit.c:1084 #: builtin/commit.c:1119
msgid "Clever... amending the last one with dirty index." msgid "Clever... amending the last one with dirty index."
msgstr "聪明... 在索引不干净下修补最后的提交。" msgstr "聪明... 在索引不干净下修补最后的提交。"
#: builtin/commit.c:1086 #: builtin/commit.c:1121
msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
#: builtin/commit.c:1096 builtin/tag.c:556 #: builtin/commit.c:1131 builtin/tag.c:556
#, c-format #, c-format
msgid "Invalid cleanup mode %s" msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s" msgstr "无效的清理模式 %s"
#: builtin/commit.c:1101 #: builtin/commit.c:1136
msgid "Paths with -a does not make sense." msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项共用没有意义。" msgstr "路径和 -a 选项共用没有意义。"
#: builtin/commit.c:1280 #: builtin/commit.c:1315
msgid "couldn't look up newly created commit" msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交" msgstr "无法找到新创建的提交"
#: builtin/commit.c:1282 #: builtin/commit.c:1317
msgid "could not parse newly created commit" msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交" msgstr "不能解析新创建的提交"
#: builtin/commit.c:1323 #: builtin/commit.c:1358
msgid "detached HEAD" msgid "detached HEAD"
msgstr "分离头指针" msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格 # 译者：中文字符串拼接，可删除前导空格
#: builtin/commit.c:1325 #: builtin/commit.c:1360
msgid " (root-commit)" msgid " (root-commit)"
msgstr "（根提交）" msgstr "（根提交）"
#: builtin/commit.c:1415 #: builtin/commit.c:1450
msgid "could not parse HEAD commit" msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交" msgstr "不能解析 HEAD 提交"
#: builtin/commit.c:1452 builtin/merge.c:509 #: builtin/commit.c:1487 builtin/merge.c:509
#, c-format #, c-format
msgid "could not open '%s' for reading" msgid "could not open '%s' for reading"
msgstr "不能为读入打开 '%s'" msgstr "不能为读入打开 '%s'"
#: builtin/commit.c:1459 #: builtin/commit.c:1494
#, c-format #, c-format
msgid "Corrupt MERGE_HEAD file (%s)" msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）" msgstr "损坏的 MERGE_HEAD 文件（%s）"
#: builtin/commit.c:1466 #: builtin/commit.c:1501
msgid "could not read MERGE_MODE" msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE" msgstr "不能读取 MERGE_MODE"
#: builtin/commit.c:1485 #: builtin/commit.c:1520
#, c-format #, c-format
msgid "could not read commit message: %s" msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s" msgstr "不能读取提交说明：%s"
#: builtin/commit.c:1499 #: builtin/commit.c:1534
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交；您未更改来自模版的提交说明。\n"
#: builtin/commit.c:1539
#, c-format #, c-format
msgid "Aborting commit due to empty commit message.\n" msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n" msgstr "终止提交因为提交说明为空。\n"
#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 #: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968
msgid "failed to write commit object" msgid "failed to write commit object"
msgstr "无法写提交对象" msgstr "无法写提交对象"
#: builtin/commit.c:1535 #: builtin/commit.c:1575
msgid "cannot lock HEAD ref" msgid "cannot lock HEAD ref"
msgstr "无法锁定 HEAD 引用" msgstr "无法锁定 HEAD 引用"
#: builtin/commit.c:1539 #: builtin/commit.c:1579
msgid "cannot update HEAD ref" msgid "cannot update HEAD ref"
msgstr "无法更新 HEAD 引用" msgstr "无法更新 HEAD 引用"
#: builtin/commit.c:1550 #: builtin/commit.c:1590
msgid "" msgid ""
"Repository has been updated, but unable to write\n" "Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n" "new_index file. Check that disk is not full or quota is\n"
@ -2202,7 +2207,8 @@ msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)" "dir=<directory>)"
msgstr "" msgstr ""
"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-dir=<directory>）" "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"
"dir=<directory>）"
#: builtin/init-db.c:578 #: builtin/init-db.c:578
msgid "Cannot access current working directory" msgid "Cannot access current working directory"
@ -2531,51 +2537,51 @@ msgstr "到空分支的非快进式提交没有意义"
msgid "%s - not something we can merge" msgid "%s - not something we can merge"
msgstr "%s - 不能被合并" msgstr "%s - 不能被合并"
#: builtin/merge.c:1385 #: builtin/merge.c:1382
#, c-format #, c-format
msgid "Updating %s..%s\n" msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n" msgstr "更新 %s..%s\n"
#: builtin/merge.c:1423 #: builtin/merge.c:1420
#, c-format #, c-format
msgid "Trying really trivial in-index merge...\n" msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n" msgstr "尝试非常小的索引内合并...\n"
#: builtin/merge.c:1430 #: builtin/merge.c:1427
#, c-format #, c-format
msgid "Nope.\n" msgid "Nope.\n"
msgstr "无。\n" msgstr "无。\n"
#: builtin/merge.c:1462 #: builtin/merge.c:1459
msgid "Not possible to fast-forward, aborting." msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。" msgstr "无法快进，终止。"
#: builtin/merge.c:1485 builtin/merge.c:1562 #: builtin/merge.c:1482 builtin/merge.c:1559
#, c-format #, c-format
msgid "Rewinding the tree to pristine...\n" msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n" msgstr "将树回滚至原始状态...\n"
#: builtin/merge.c:1489 #: builtin/merge.c:1486
#, c-format #, c-format
msgid "Trying merge strategy %s...\n" msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n" msgstr "尝试合并策略 %s...\n"
#: builtin/merge.c:1553 #: builtin/merge.c:1550
#, c-format #, c-format
msgid "No merge strategy handled the merge.\n" msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n" msgstr "没有合并策略处理此合并。\n"
#: builtin/merge.c:1555 #: builtin/merge.c:1552
#, c-format #, c-format
msgid "Merge with strategy %s failed.\n" msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n" msgstr "使用策略 %s 合并失败。\n"
#: builtin/merge.c:1564 #: builtin/merge.c:1561
#, c-format #, c-format
msgid "Using the %s to prepare resolving by hand.\n" msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n" msgstr "使用 %s 以准备手工解决。\n"
#: builtin/merge.c:1575 #: builtin/merge.c:1572
#, c-format #, c-format
msgid "Automatic merge went well; stopped before committing as requested\n" msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n" msgstr "自动合并进展顺利，按要求在提交前停止\n"
@ -2824,7 +2830,7 @@ msgstr "tag 简写没有跟 <tag> 参数"
msgid "--delete only accepts plain target ref names" msgid "--delete only accepts plain target ref names"
msgstr "--delete 只接受简单的目标引用名" msgstr "--delete 只接受简单的目标引用名"
#: builtin/push.c:73 #: builtin/push.c:83
#, c-format #, c-format
msgid "" msgid ""
"You are not currently on a branch.\n" "You are not currently on a branch.\n"
@ -2838,7 +2844,7 @@ msgstr ""
"\n" "\n"
" git push %s HEAD:<name-of-remote-branch>\n" " git push %s HEAD:<name-of-remote-branch>\n"
#: builtin/push.c:80 #: builtin/push.c:90
#, c-format #, c-format
msgid "" msgid ""
"The current branch %s has no upstream branch.\n" "The current branch %s has no upstream branch.\n"
@ -2851,27 +2857,37 @@ msgstr ""
"\n" "\n"
" git push --set-upstream %s %s\n" " git push --set-upstream %s %s\n"
#: builtin/push.c:88 #: builtin/push.c:98
#, c-format #, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push." msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "当前分支 %s 有多个上游分支，拒绝推送。" msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
#: builtin/push.c:111 #: builtin/push.c:101
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
"而没有告诉我要推送什么、更新哪个远程分支。"
#: builtin/push.c:127
msgid "" msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"." "You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。" msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"
#: builtin/push.c:131 #: builtin/push.c:147
#, c-format #, c-format
msgid "Pushing to %s\n" msgid "Pushing to %s\n"
msgstr "推送到 %s\n" msgstr "推送到 %s\n"
#: builtin/push.c:135 #: builtin/push.c:151
#, c-format #, c-format
msgid "failed to push some refs to '%s'" msgid "failed to push some refs to '%s'"
msgstr "无法推送一些引用到 '%s'" msgstr "无法推送一些引用到 '%s'"
#: builtin/push.c:143 #: builtin/push.c:159
#, c-format #, c-format
msgid "" msgid ""
"To prevent you from losing history, non-fast-forward updates were rejected\n" "To prevent you from losing history, non-fast-forward updates were rejected\n"
@ -2882,12 +2898,12 @@ msgstr ""
"再次推送前先与远程变更合并（如 'git pull'）。详见\n" "再次推送前先与远程变更合并（如 'git pull'）。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。\n" "'git push --help' 中的 'Note about fast-forwards' 小节。\n"
#: builtin/push.c:160 #: builtin/push.c:176
#, c-format #, c-format
msgid "bad repository '%s'" msgid "bad repository '%s'"
msgstr "坏的版本库 '%s'" msgstr "坏的版本库 '%s'"
#: builtin/push.c:161 #: builtin/push.c:177
msgid "" msgid ""
"No configured push destination.\n" "No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote " "Either specify the URL from the command-line or configure a remote "
@ -2908,31 +2924,31 @@ msgstr ""
"\n" "\n"
" git push <name>\n" " git push <name>\n"
#: builtin/push.c:176 #: builtin/push.c:192
msgid "--all and --tags are incompatible" msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容" msgstr "--all 和 --tags 不兼容"
#: builtin/push.c:177 #: builtin/push.c:193
msgid "--all can't be combined with refspecs" msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用表达式共用" msgstr "--all 不能和引用表达式共用"
#: builtin/push.c:182 #: builtin/push.c:198
msgid "--mirror and --tags are incompatible" msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容" msgstr "--mirror 和 --tags 不兼容"
#: builtin/push.c:183 #: builtin/push.c:199
msgid "--mirror can't be combined with refspecs" msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用表达式共用" msgstr "--mirror 不能和引用表达式共用"
#: builtin/push.c:188 #: builtin/push.c:204
msgid "--all and --mirror are incompatible" msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容" msgstr "--all 和 --mirror 不兼容"
#: builtin/push.c:274 #: builtin/push.c:284
msgid "--delete is incompatible with --all, --mirror and --tags" msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
#: builtin/push.c:276 #: builtin/push.c:286
msgid "--delete doesn't make sense without any refs" msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义" msgstr "--delete 未接任何引用没有意义"