From cc76011effc295cf84a8c4b170ba834bd7b41e10 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Sat, 15 Sep 2012 10:26:13 +0800 Subject: [PATCH] l10n: Update git.pot (825 new, 24 removed messages) Generate po/git.pot from v1.7.12-437-g1084f with these i18n update(s): * i18n: mark more index-pack strings for translation * i18n: write-tree: mark parseopt strings for translation * i18n: verify-tag: mark parseopt strings for translation * i18n: verify-pack: mark parseopt strings for translation * i18n: update-server-info: mark parseopt strings for translation * i18n: update-ref: mark parseopt strings for translation * i18n: update-index: mark parseopt strings for translation * i18n: tag: mark parseopt strings for translation * i18n: symbolic-ref: mark parseopt strings for translation * i18n: show-ref: mark parseopt strings for translation * i18n: show-branch: mark parseopt strings for translation * i18n: shortlog: mark parseopt strings for translation * i18n: rm: mark parseopt strings for translation * i18n: revert, cherry-pick: mark parseopt strings for translation * i18n: rev-parse: mark parseopt strings for translation * i18n: reset: mark parseopt strings for translation * i18n: rerere: mark parseopt strings for translation * i18n: status: mark parseopt strings for translation * i18n: replace: mark parseopt strings for translation * i18n: remote: mark parseopt strings for translation * i18n: read-tree: mark parseopt strings for translation * i18n: push: mark parseopt strings for translation * i18n: prune: mark parseopt strings for translation * i18n: prune-packed: mark parseopt strings for translation * i18n: pack-refs: mark parseopt strings for translation * i18n: pack-objects: mark parseopt strings for translation * i18n: notes: mark parseopt strings for translation * i18n: name-rev: mark parseopt strings for translation * i18n: mv: mark parseopt strings for translation * i18n: mktree: mark parseopt strings for translation * i18n: merge: mark parseopt strings for translation * i18n: merge-file: mark parseopt strings for translation * i18n: merge-base: mark parseopt strings for translation * i18n: ls-tree: mark parseopt strings for translation * i18n: ls-files: mark parseopt strings for translation * i18n: log: mark parseopt strings for translation * i18n: init-db: mark parseopt strings for translation * i18n: help: mark parseopt strings for translation * i18n: hash-object: mark parseopt strings for translation * i18n: grep: mark parseopt strings for translation * i18n: gc: mark parseopt strings for translation * i18n: fsck: mark parseopt strings for translation * i18n: format-patch: mark parseopt strings for translation * i18n: for-each-ref: mark parseopt strings for translation * i18n: fmt-merge-msg: mark parseopt strings for translation * i18n: fetch: mark parseopt strings for translation * i18n: fast-export: mark parseopt strings for translation * i18n: describe: mark parseopt strings for translation * i18n: config: mark parseopt strings for translation * i18n: count-objects: mark parseopt strings for translation * i18n: commit: mark parseopt strings for translation * i18n: column: mark parseopt strings for translation * i18n: clone: mark parseopt strings for translation * i18n: clean: mark parseopt strings for translation * i18n: cherry: mark parseopt strings for translation * i18n: checkout: mark parseopt strings for translation * i18n: checkout-index: mark parseopt strings for translation * i18n: check-attr: mark parseopt strings for translation * i18n: cat-file: mark parseopt strings for translation * i18n: branch: mark parseopt strings for translation * i18n: blame: mark parseopt strings for translation * i18n: add: mark parseopt strings for translation * i18n: bisect--helper: mark parseopt strings for translation * i18n: archive: mark parseopt strings for translation * i18n: mark "style" in OPT_COLUMN() for translation Signed-off-by: Jiang Xin --- po/git.pot | 6908 ++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 5103 insertions(+), 1805 deletions(-) diff --git a/po/git.pot b/po/git.pot index 6915b02153..05177d6c8e 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 \n" -"POT-Creation-Date: 2012-09-05 06:20+0800\n" +"POT-Creation-Date: 2012-09-15 10:21+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,6 +35,91 @@ msgid "" "or use 'git commit -a'." msgstr "" +#: archive.c:10 +msgid "git archive [options] [...]" +msgstr "" + +#: archive.c:11 +msgid "git archive --list" +msgstr "" + +#: archive.c:12 +msgid "" +"git archive --remote [--exec ] [options] [...]" +msgstr "" + +#: archive.c:13 +msgid "git archive --remote [--exec ] --list" +msgstr "" + +#: archive.c:322 +msgid "fmt" +msgstr "" + +#: archive.c:322 +msgid "archive format" +msgstr "" + +#: archive.c:323 builtin/log.c:1079 +msgid "prefix" +msgstr "" + +#: archive.c:324 +msgid "prepend prefix to each pathname in the archive" +msgstr "" + +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332 +#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642 +#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537 +#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "" + +#: archive.c:326 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "" + +#: archive.c:328 +msgid "read .gitattributes in working directory" +msgstr "" + +#: archive.c:329 +msgid "report archived files on stderr" +msgstr "" + +#: archive.c:330 +msgid "store only" +msgstr "" + +#: archive.c:331 +msgid "compress faster" +msgstr "" + +#: archive.c:339 +msgid "compress better" +msgstr "" + +#: archive.c:342 +msgid "list supported archive formats" +msgstr "" + +#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "" + +#: archive.c:345 builtin/archive.c:94 +msgid "retrieve the archive from remote repository " +msgstr "" + +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616 +msgid "command" +msgstr "" + +#: archive.c:347 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "" + #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -45,7 +130,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:699 +#: bundle.c:89 builtin/commit.c:714 #, c-format msgid "could not open '%s'" msgstr "" @@ -54,7 +139,7 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 +#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290 #: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" @@ -391,189 +476,189 @@ msgstr "" msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:921 +#: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:925 +#: merge-recursive.c:926 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:941 +#: merge-recursive.c:942 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1020 merge-recursive.c:1034 +#: merge-recursive.c:1021 merge-recursive.c:1035 #, 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:1026 merge-recursive.c:1039 +#: merge-recursive.c:1027 merge-recursive.c:1040 #, 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:1080 +#: merge-recursive.c:1081 msgid "rename" msgstr "" -#: merge-recursive.c:1080 +#: merge-recursive.c:1081 msgid "renamed" msgstr "" -#: merge-recursive.c:1136 +#: merge-recursive.c:1137 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1158 +#: merge-recursive.c:1159 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1163 +#: merge-recursive.c:1164 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1217 +#: merge-recursive.c:1218 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1247 +#: merge-recursive.c:1248 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1446 +#: merge-recursive.c:1447 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1456 +#: merge-recursive.c:1457 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1461 merge-recursive.c:1659 +#: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1512 +#: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1515 +#: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modify" msgstr "" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modified" msgstr "" -#: merge-recursive.c:1573 +#: merge-recursive.c:1574 msgid "content" msgstr "" -#: merge-recursive.c:1580 +#: merge-recursive.c:1581 msgid "add/add" msgstr "" -#: merge-recursive.c:1614 +#: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1628 +#: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1632 git-submodule.sh:869 +#: merge-recursive.c:1633 git-submodule.sh:869 msgid "submodule" msgstr "" -#: merge-recursive.c:1633 +#: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1723 +#: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1748 +#: merge-recursive.c:1749 msgid "file/directory" msgstr "" -#: merge-recursive.c:1754 +#: merge-recursive.c:1755 msgid "directory/file" msgstr "" -#: merge-recursive.c:1759 +#: merge-recursive.c:1760 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1769 +#: merge-recursive.c:1770 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1786 +#: merge-recursive.c:1787 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1805 +#: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1814 +#: merge-recursive.c:1815 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1844 +#: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1889 +#: merge-recursive.c:1890 msgid "Merging:" msgstr "" -#: merge-recursive.c:1902 +#: merge-recursive.c:1903 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1939 +#: merge-recursive.c:1940 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:1996 +#: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2008 builtin/merge.c:696 +#: merge-recursive.c:2009 builtin/merge.c:696 msgid "Unable to write index." msgstr "" @@ -649,7 +734,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#: sequencer.c:160 sequencer.c:765 sequencer.c:848 #, c-format msgid "Could not write to %s" msgstr "" @@ -685,178 +770,178 @@ msgstr "" msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:324 +#: sequencer.c:327 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:329 +#: sequencer.c:332 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:395 +#: sequencer.c:398 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:398 +#: sequencer.c:401 msgid "You do not have a valid HEAD" msgstr "" -#: sequencer.c:413 +#: sequencer.c:416 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:421 +#: sequencer.c:424 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:425 +#: sequencer.c:428 #, 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:436 +#: sequencer.c:439 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:440 +#: sequencer.c:443 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:524 +#: sequencer.c:527 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:525 +#: sequencer.c:528 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:553 +#: sequencer.c:560 msgid "empty commit set passed" msgstr "" -#: sequencer.c:561 +#: sequencer.c:568 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:566 +#: sequencer.c:573 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:624 +#: sequencer.c:631 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:646 +#: sequencer.c:653 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:651 +#: sequencer.c:658 msgid "No commits parsed." msgstr "" -#: sequencer.c:664 +#: sequencer.c:671 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:668 +#: sequencer.c:675 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:675 +#: sequencer.c:682 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:703 +#: sequencer.c:710 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:706 +#: sequencer.c:713 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:718 +#: sequencer.c:725 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:739 +#: sequencer.c:746 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:740 +#: sequencer.c:747 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:744 +#: sequencer.c:751 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:760 sequencer.c:845 +#: sequencer.c:767 sequencer.c:852 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:779 sequencer.c:913 +#: sequencer.c:786 sequencer.c:920 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:781 +#: sequencer.c:788 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:783 +#: sequencer.c:790 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:805 builtin/apply.c:3987 +#: sequencer.c:812 builtin/apply.c:4005 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:808 +#: sequencer.c:815 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:809 +#: sequencer.c:816 msgid "unexpected end of file" msgstr "" -#: sequencer.c:815 +#: sequencer.c:822 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:838 +#: sequencer.c:845 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1000 +#: sequencer.c:1007 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1001 +#: sequencer.c:1008 msgid "Can't cherry-pick into empty head" msgstr "" @@ -879,12 +964,17 @@ msgstr "" msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: wrapper.c:413 +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "" + +#: wrapper.c:426 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:414 +#: wrapper.c:427 msgid "no such user" msgstr "" @@ -938,11 +1028,6 @@ msgstr "" msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:224 -#, c-format -msgid "%s files:" -msgstr "" - #: wt-status.c:227 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" @@ -1143,11 +1228,11 @@ msgid "Initial commit" msgstr "" #: wt-status.c:1011 -msgid "Untracked" +msgid "Untracked files" msgstr "" #: wt-status.c:1013 -msgid "Ignored" +msgid "Ignored files" msgstr "" #: wt-status.c:1015 @@ -1163,58 +1248,65 @@ msgstr "" msgid "No changes" msgstr "" -#: wt-status.c:1027 +#: wt-status.c:1028 #, c-format -msgid "no changes added to commit%s\n" +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1029 -msgid " (use \"git add\" and/or \"git commit -a\")" +#: wt-status.c:1031 +#, c-format +msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1031 +#: wt-status.c:1034 #, c-format -msgid "nothing added to commit but untracked files present%s\n" +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" msgstr "" -#: wt-status.c:1033 -msgid " (use \"git add\" to track)" +#: wt-status.c:1037 +#, c-format +msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 +#: wt-status.c:1040 #, c-format -msgid "nothing to commit%s\n" +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1036 -msgid " (create/copy files and use \"git add\" to track)" +#: wt-status.c:1043 wt-status.c:1048 +#, c-format +msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1039 -msgid " (use -u to show untracked files)" +#: wt-status.c:1046 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1042 -msgid " (working directory clean)" +#: wt-status.c:1050 +#, c-format +msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1150 +#: wt-status.c:1158 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1156 +#: wt-status.c:1164 msgid "Initial commit on " msgstr "" -#: wt-status.c:1171 +#: wt-status.c:1179 msgid "behind " msgstr "" -#: wt-status.c:1174 wt-status.c:1177 +#: wt-status.c:1182 wt-status.c:1185 msgid "ahead " msgstr "" -#: wt-status.c:1179 +#: wt-status.c:1187 msgid ", behind " msgstr "" @@ -1223,6 +1315,10 @@ msgstr "" msgid "failed to unlink '%s'" msgstr "" +#: builtin/add.c:19 +msgid "git add [options] [--] ..." +msgstr "" + #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" @@ -1246,7 +1342,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -1283,47 +1379,99 @@ msgstr "" msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:312 +#: builtin/add.c:313 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:352 +#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/rm.c:133 +msgid "dry run" +msgstr "" + +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 +#: builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "" + +#: builtin/add.c:322 +msgid "interactive picking" +msgstr "" + +#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 +msgid "select hunks interactively" +msgstr "" + +#: builtin/add.c:324 +msgid "edit current diff and apply" +msgstr "" + +#: builtin/add.c:325 +msgid "allow adding otherwise ignored files" +msgstr "" + +#: builtin/add.c:326 +msgid "update tracked files" +msgstr "" + +#: builtin/add.c:327 +msgid "record only the fact that the path will be added later" +msgstr "" + +#: builtin/add.c:328 +msgid "add changes from all tracked and untracked files" +msgstr "" + +#: builtin/add.c:329 +msgid "don't add, only refresh the index" +msgstr "" + +#: builtin/add.c:330 +msgid "just skip files which cannot be added because of errors" +msgstr "" + +#: builtin/add.c:331 +msgid "check if - even missing - files are ignored in dry run" +msgstr "" + +#: builtin/add.c:353 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:353 +#: builtin/add.c:354 msgid "no files added" msgstr "" -#: builtin/add.c:359 +#: builtin/add.c:360 msgid "adding files failed" msgstr "" -#: builtin/add.c:391 +#: builtin/add.c:392 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:393 +#: builtin/add.c:394 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:413 +#: builtin/add.c:414 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:414 +#: builtin/add.c:415 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "" -#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" @@ -1376,17 +1524,17 @@ msgstr "" msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1402 +#: builtin/apply.c:1420 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1459 +#: builtin/apply.c:1477 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1476 +#: builtin/apply.c:1494 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1397,403 +1545,400 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1636 +#: builtin/apply.c:1654 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1638 +#: builtin/apply.c:1656 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1664 +#: builtin/apply.c:1682 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1700 +#: builtin/apply.c:1718 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1702 +#: builtin/apply.c:1720 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1705 +#: builtin/apply.c:1723 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1851 +#: builtin/apply.c:1869 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1880 +#: builtin/apply.c:1898 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1966 +#: builtin/apply.c:1984 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2056 +#: builtin/apply.c:2074 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2060 +#: builtin/apply.c:2078 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2131 +#: builtin/apply.c:2149 msgid "oops" msgstr "" -#: builtin/apply.c:2653 +#: builtin/apply.c:2671 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2771 +#: builtin/apply.c:2789 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2783 +#: builtin/apply.c:2801 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2789 +#: builtin/apply.c:2807 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2808 +#: builtin/apply.c:2826 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2911 +#: builtin/apply.c:2929 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2917 +#: builtin/apply.c:2935 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2938 +#: builtin/apply.c:2956 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3060 +#: builtin/apply.c:3078 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 +#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3138 builtin/apply.c:3360 +#: builtin/apply.c:3156 builtin/apply.c:3378 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3219 builtin/apply.c:3374 +#: builtin/apply.c:3237 builtin/apply.c:3392 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 +#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3228 builtin/apply.c:3382 +#: builtin/apply.c:3246 builtin/apply.c:3400 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3330 +#: builtin/apply.c:3348 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3399 +#: builtin/apply.c:3417 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3401 +#: builtin/apply.c:3419 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3502 +#: builtin/apply.c:3520 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3505 +#: builtin/apply.c:3523 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3525 +#: builtin/apply.c:3543 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3530 +#: builtin/apply.c:3548 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3538 +#: builtin/apply.c:3556 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3551 +#: builtin/apply.c:3569 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3749 +#: builtin/apply.c:3767 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3777 +#: builtin/apply.c:3795 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3781 +#: builtin/apply.c:3799 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3786 +#: builtin/apply.c:3804 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3789 builtin/apply.c:3897 +#: builtin/apply.c:3807 builtin/apply.c:3915 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3822 +#: builtin/apply.c:3840 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3871 +#: builtin/apply.c:3889 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3958 +#: builtin/apply.c:3976 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3966 +#: builtin/apply.c:3984 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3969 +#: builtin/apply.c:3987 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3979 +#: builtin/apply.c:3997 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4000 +#: builtin/apply.c:4018 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4003 +#: builtin/apply.c:4021 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4153 +#: builtin/apply.c:4171 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4164 +#: builtin/apply.c:4182 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4283 builtin/apply.c:4286 +#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/fetch.c:63 msgid "path" msgstr "" -#: builtin/apply.c:4284 +#: builtin/apply.c:4302 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4287 +#: builtin/apply.c:4305 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4289 +#: builtin/apply.c:4307 msgid "num" msgstr "" -#: builtin/apply.c:4290 +#: builtin/apply.c:4308 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4293 +#: builtin/apply.c:4311 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4295 +#: builtin/apply.c:4313 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4299 -msgid "shows number of added and deleted lines in decimal notation" +#: builtin/apply.c:4317 +msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4301 +#: builtin/apply.c:4319 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4303 +#: builtin/apply.c:4321 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4305 +#: builtin/apply.c:4323 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4307 +#: builtin/apply.c:4325 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4309 +#: builtin/apply.c:4327 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4311 +#: builtin/apply.c:4329 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4313 +#: builtin/apply.c:4331 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4315 +#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4318 +#: builtin/apply.c:4336 msgid "ensure at least lines of context match" msgstr "" -#: builtin/apply.c:4319 +#: builtin/apply.c:4337 msgid "action" msgstr "" -#: builtin/apply.c:4320 +#: builtin/apply.c:4338 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4323 builtin/apply.c:4326 +#: builtin/apply.c:4341 builtin/apply.c:4344 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4329 +#: builtin/apply.c:4347 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4331 +#: builtin/apply.c:4349 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4333 +#: builtin/apply.c:4351 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4335 +#: builtin/apply.c:4353 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4336 -msgid "be verbose" -msgstr "" - -#: builtin/apply.c:4338 +#: builtin/apply.c:4356 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4341 +#: builtin/apply.c:4359 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4343 +#: builtin/apply.c:4361 msgid "root" msgstr "" -#: builtin/apply.c:4344 +#: builtin/apply.c:4362 msgid "prepend to all filenames" msgstr "" -#: builtin/apply.c:4366 +#: builtin/apply.c:4384 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4374 +#: builtin/apply.c:4392 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4377 +#: builtin/apply.c:4395 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4393 +#: builtin/apply.c:4411 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4407 +#: builtin/apply.c:4425 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4413 builtin/apply.c:4423 +#: builtin/apply.c:4431 builtin/apply.c:4441 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1835,2883 +1980,5817 @@ msgstr "" msgid "git archive: expected a flush" msgstr "" -#: builtin/branch.c:144 +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "" + +#: builtin/blame.c:30 builtin/shortlog.c:15 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "" + +#: builtin/blame.c:2316 +msgid "Show blame entries as we find them, incrementally" +msgstr "" + +#: builtin/blame.c:2317 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "" + +#: builtin/blame.c:2318 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "" + +#: builtin/blame.c:2319 +msgid "Show work cost statistics" +msgstr "" + +#: builtin/blame.c:2320 +msgid "Show output score for blame entries" +msgstr "" + +#: builtin/blame.c:2321 +msgid "Show original filename (Default: auto)" +msgstr "" + +#: builtin/blame.c:2322 +msgid "Show original linenumber (Default: off)" +msgstr "" + +#: builtin/blame.c:2323 +msgid "Show in a format designed for machine consumption" +msgstr "" + +#: builtin/blame.c:2324 +msgid "Show porcelain format with per-line commit information" +msgstr "" + +#: builtin/blame.c:2325 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "" + +#: builtin/blame.c:2326 +msgid "Show raw timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2327 +msgid "Show long commit SHA1 (Default: off)" +msgstr "" + +#: builtin/blame.c:2328 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2329 +msgid "Show author email instead of name (Default: off)" +msgstr "" + +#: builtin/blame.c:2330 +msgid "Ignore whitespace differences" +msgstr "" + +#: builtin/blame.c:2331 +msgid "Spend extra cycles to find better match" +msgstr "" + +#: builtin/blame.c:2332 +msgid "Use revisions from instead of calling git-rev-list" +msgstr "" + +#: builtin/blame.c:2333 +msgid "Use 's contents as the final image" +msgstr "" + +#: builtin/blame.c:2334 builtin/blame.c:2335 +msgid "score" +msgstr "" + +#: builtin/blame.c:2334 +msgid "Find line copies within and across files" +msgstr "" + +#: builtin/blame.c:2335 +msgid "Find line movements within and across files" +msgstr "" + +#: builtin/blame.c:2336 +msgid "n,m" +msgstr "" + +#: builtin/blame.c:2336 +msgid "Process only line range n,m, counting from 1" +msgstr "" + +#: builtin/branch.c:23 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "" + +#: builtin/branch.c:24 +msgid "git branch [options] [-l] [-f] []" +msgstr "" + +#: builtin/branch.c:25 +msgid "git branch [options] [-r] (-d | -D) ..." +msgstr "" + +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [] " +msgstr "" + +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:180 +#: builtin/branch.c:181 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:186 +#: builtin/branch.c:187 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:191 +#: builtin/branch.c:192 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:202 +#: builtin/branch.c:203 #, c-format msgid "remote branch '%s' not found." msgstr "" -#: builtin/branch.c:203 +#: builtin/branch.c:204 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:210 +#: builtin/branch.c:211 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:216 +#: builtin/branch.c:217 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:225 +#: builtin/branch.c:226 #, c-format msgid "Error deleting remote branch '%s'" msgstr "" -#: builtin/branch.c:226 +#: builtin/branch.c:227 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:233 +#: builtin/branch.c:234 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:234 +#: builtin/branch.c:235 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:239 +#: builtin/branch.c:240 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:337 +#: builtin/branch.c:338 #, c-format msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:409 +#: builtin/branch.c:410 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:411 +#: builtin/branch.c:412 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:415 +#: builtin/branch.c:416 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:417 +#: builtin/branch.c:418 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:420 +#: builtin/branch.c:421 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:423 +#: builtin/branch.c:424 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:535 +#: builtin/branch.c:537 msgid "(no branch)" msgstr "" -#: builtin/branch.c:600 +#: builtin/branch.c:602 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:613 +#: builtin/branch.c:615 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:623 +#: builtin/branch.c:625 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:642 +#: builtin/branch.c:644 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:646 +#: builtin/branch.c:648 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:670 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:692 +#: builtin/branch.c:694 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:783 -msgid "Failed to resolve HEAD as a valid ref." +#: builtin/branch.c:724 +msgid "Generic options" msgstr "" -#: builtin/branch.c:788 builtin/clone.c:561 -msgid "HEAD not found below refs/heads!" +#: builtin/branch.c:726 +msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:808 -msgid "--column and --verbose are incompatible" +#: builtin/branch.c:727 +msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:857 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" +#: builtin/branch.c:728 +msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/bundle.c:47 -#, c-format -msgid "%s is okay\n" +#: builtin/branch.c:730 +msgid "change upstream info" msgstr "" -#: builtin/bundle.c:56 -msgid "Need a repository to create a bundle." +#: builtin/branch.c:734 +msgid "use colored output" msgstr "" -#: builtin/bundle.c:60 -msgid "Need a repository to unbundle." +#: builtin/branch.c:735 +msgid "act on remote-tracking branches" msgstr "" -#: builtin/checkout.c:114 builtin/checkout.c:147 -#, c-format -msgid "path '%s' does not have our version" +#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 +#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396 +#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470 +msgid "commit" msgstr "" -#: builtin/checkout.c:116 builtin/checkout.c:149 -#, c-format -msgid "path '%s' does not have their version" +#: builtin/branch.c:739 builtin/branch.c:745 +msgid "print only branches that contain the commit" msgstr "" -#: builtin/checkout.c:132 -#, c-format -msgid "path '%s' does not have all necessary versions" +#: builtin/branch.c:751 +msgid "Specific git-branch actions:" msgstr "" -#: builtin/checkout.c:176 -#, c-format -msgid "path '%s' does not have necessary versions" +#: builtin/branch.c:752 +msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/checkout.c:193 -#, c-format -msgid "path '%s': cannot merge" +#: builtin/branch.c:754 +msgid "delete fully merged branch" msgstr "" -#: builtin/checkout.c:210 -#, c-format -msgid "Unable to add merge result for '%s'" +#: builtin/branch.c:755 +msgid "delete branch (even if not merged)" msgstr "" -#: builtin/checkout.c:235 builtin/checkout.c:392 -msgid "corrupt index file" +#: builtin/branch.c:756 +msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/checkout.c:265 builtin/checkout.c:272 -#, c-format -msgid "path '%s' is unmerged" +#: builtin/branch.c:757 +msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 -#: builtin/merge.c:811 -msgid "unable to write new index file" +#: builtin/branch.c:758 +msgid "list branch names" msgstr "" -#: builtin/checkout.c:414 -msgid "you need to resolve your current index first" +#: builtin/branch.c:759 +msgid "create the branch's reflog" msgstr "" -#: builtin/checkout.c:533 -#, c-format -msgid "Can not do reflog for '%s'\n" +#: builtin/branch.c:761 +msgid "edit the description for the branch" msgstr "" -#: builtin/checkout.c:566 -msgid "HEAD is now at" +#: builtin/branch.c:762 +msgid "force creation (when already exists)" msgstr "" -#: builtin/checkout.c:573 -#, c-format -msgid "Reset branch '%s'\n" +#: builtin/branch.c:765 +msgid "print only not merged branches" msgstr "" -#: builtin/checkout.c:576 -#, c-format -msgid "Already on '%s'\n" +#: builtin/branch.c:771 +msgid "print only merged branches" msgstr "" -#: builtin/checkout.c:580 -#, c-format -msgid "Switched to and reset branch '%s'\n" +#: builtin/branch.c:775 +msgid "list branches in columns" +msgstr "" + +#: builtin/branch.c:788 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:793 builtin/clone.c:561 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:813 +msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/checkout.c:582 +#: builtin/branch.c:864 #, c-format -msgid "Switched to a new branch '%s'\n" +msgid "branch '%s' does not exist" msgstr "" -#: builtin/checkout.c:584 +#: builtin/branch.c:876 #, c-format -msgid "Switched to branch '%s'\n" +msgid "Branch '%s' has no upstream information" +msgstr "" + +#: builtin/branch.c:891 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/checkout.c:640 +#: builtin/branch.c:894 #, c-format -msgid " ... and %d more.\n" +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" msgstr "" -#. The singular version -#: builtin/checkout.c:646 +#: builtin/branch.c:911 #, c-format msgid "" -"Warning: you are leaving %d commit behind, not connected to\n" -"any of your branches:\n" "\n" -"%s\n" -msgid_plural "" -"Warning: you are leaving %d commits behind, not connected to\n" -"any of your branches:\n" +"If you wanted to make '%s' track '%s', do this:\n" "\n" -"%s\n" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#: builtin/checkout.c:664 +#: builtin/branch.c:912 #, c-format -msgid "" -"If you want to keep them by creating a new branch, this may be a good time\n" -"to do so with:\n" -"\n" -" git branch new_branch_name %s\n" -"\n" +msgid " git branch -d %s\n" msgstr "" -#: builtin/checkout.c:694 -msgid "internal error in revision walk" +#: builtin/branch.c:913 +#, c-format +msgid " git branch --set-upstream-to %s\n" msgstr "" -#: builtin/checkout.c:698 -msgid "Previous HEAD position was" +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" msgstr "" -#: builtin/checkout.c:724 builtin/checkout.c:919 -msgid "You are on a branch yet to be born" +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." msgstr "" -#. case (1) -#: builtin/checkout.c:855 -#, c-format -msgid "invalid reference: %s" +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." msgstr "" -#. case (1): want a tree -#: builtin/checkout.c:894 -#, c-format -msgid "reference is not a tree: %s" +#: builtin/cat-file.c:247 +msgid "git cat-file (-t|-s|-e|-p||--textconv) " msgstr "" -#: builtin/checkout.c:976 -msgid "-B cannot be used with -b" +#: builtin/cat-file.c:248 +msgid "git cat-file (--batch|--batch-check) < " msgstr "" -#: builtin/checkout.c:985 -msgid "--patch is incompatible with all other options" +#: builtin/cat-file.c:266 +msgid " can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/checkout.c:988 -msgid "--detach cannot be used with -b/-B/--orphan" +#: builtin/cat-file.c:267 +msgid "show object type" msgstr "" -#: builtin/checkout.c:990 -msgid "--detach cannot be used with -t" +#: builtin/cat-file.c:268 +msgid "show object size" msgstr "" -#: builtin/checkout.c:996 -msgid "--track needs a branch name" +#: builtin/cat-file.c:270 +msgid "exit with zero when there's no error" msgstr "" -#: builtin/checkout.c:1003 -msgid "Missing branch name; try -b" +#: builtin/cat-file.c:271 +msgid "pretty-print object's content" msgstr "" -#: builtin/checkout.c:1009 -msgid "--orphan and -b|-B are mutually exclusive" +#: builtin/cat-file.c:273 +msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/checkout.c:1011 -msgid "--orphan cannot be used with -t" +#: builtin/cat-file.c:275 +msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/checkout.c:1021 -msgid "git checkout: -f and -m are incompatible" +#: builtin/cat-file.c:278 +msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/checkout.c:1055 -msgid "invalid path specification" +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." msgstr "" -#: builtin/checkout.c:1063 -#, c-format -msgid "" -"git checkout: updating paths is incompatible with switching branches.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-a | --all | attr...] < " msgstr "" -#: builtin/checkout.c:1065 -msgid "git checkout: updating paths is incompatible with switching branches." +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" msgstr "" -#: builtin/checkout.c:1070 -msgid "git checkout: --detach does not take a path argument" +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" msgstr "" -#: builtin/checkout.c:1073 -msgid "" -"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" -"checking out of the index." +#: builtin/check-attr.c:21 builtin/hash-object.c:75 +msgid "read file names from stdin" msgstr "" -#: builtin/checkout.c:1092 -msgid "Cannot switch branch to a non-commit." +#: builtin/check-attr.c:23 +msgid "input paths are terminated by a null character" msgstr "" -#: builtin/checkout.c:1095 -msgid "--ours/--theirs is incompatible with switching branches." +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [...]" msgstr "" -#: builtin/clean.c:78 -msgid "-x and -X cannot be used together" +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" msgstr "" -#: builtin/clean.c:82 -msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" msgstr "" -#: builtin/clean.c:85 -msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" msgstr "" -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" msgstr "" -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" msgstr "" -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" msgstr "" -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" msgstr "" -#: builtin/clone.c:243 -#, c-format -msgid "reference repository '%s' is not a local directory." +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend " msgstr "" -#: builtin/clone.c:306 -#, c-format -msgid "failed to create directory '%s'" +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" msgstr "" -#: builtin/clone.c:308 builtin/diff.c:77 -#, c-format -msgid "failed to stat '%s'" +#: builtin/checkout.c:25 +msgid "git checkout [options] " msgstr "" -#: builtin/clone.c:310 -#, c-format -msgid "%s exists and is not a directory" +#: builtin/checkout.c:26 +msgid "git checkout [options] [] -- ..." msgstr "" -#: builtin/clone.c:324 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format -msgid "failed to stat %s\n" +msgid "path '%s' does not have our version" msgstr "" -#: builtin/clone.c:346 +#: builtin/checkout.c:118 builtin/checkout.c:151 #, c-format -msgid "failed to create link '%s'" +msgid "path '%s' does not have their version" msgstr "" -#: builtin/clone.c:350 +#: builtin/checkout.c:134 #, c-format -msgid "failed to copy file to '%s'" +msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/clone.c:373 +#: builtin/checkout.c:178 #, c-format -msgid "done.\n" +msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/clone.c:443 +#: builtin/checkout.c:195 #, c-format -msgid "Could not find remote branch %s to clone." -msgstr "" - -#: builtin/clone.c:552 -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgid "path '%s': cannot merge" msgstr "" -#: builtin/clone.c:642 -msgid "Too many arguments." +#: builtin/checkout.c:212 +#, c-format +msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/clone.c:646 -msgid "You must specify a repository to clone." +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 +#: builtin/checkout.c:245 +#, c-format +msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/clone.c:657 +#: builtin/checkout.c:248 builtin/checkout.c:251 #, c-format -msgid "--bare and --origin %s options are incompatible." +msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/clone.c:671 +#: builtin/checkout.c:254 #, c-format -msgid "repository '%s' does not exist" +msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/clone.c:676 -msgid "--depth is ignored in local clones; use file:// instead." +#: builtin/checkout.c:265 builtin/checkout.c:426 +msgid "corrupt index file" msgstr "" -#: builtin/clone.c:686 +#: builtin/checkout.c:295 builtin/checkout.c:302 #, c-format -msgid "destination path '%s' already exists and is not an empty directory." +msgid "path '%s' is unmerged" msgstr "" -#: builtin/clone.c:696 -#, c-format -msgid "working tree '%s' already exists." +#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586 +#: builtin/merge.c:811 +msgid "unable to write new index file" msgstr "" -#: builtin/clone.c:709 builtin/clone.c:723 -#, c-format -msgid "could not create leading directories of '%s'" +#: builtin/checkout.c:448 +msgid "you need to resolve your current index first" msgstr "" -#: builtin/clone.c:712 +#: builtin/checkout.c:569 #, c-format -msgid "could not create work tree dir '%s'." +msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/clone.c:731 +#: builtin/checkout.c:602 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:609 #, c-format -msgid "Cloning into bare repository '%s'...\n" +msgid "Reset branch '%s'\n" msgstr "" -#: builtin/clone.c:733 +#: builtin/checkout.c:612 #, c-format -msgid "Cloning into '%s'...\n" +msgid "Already on '%s'\n" msgstr "" -#: builtin/clone.c:789 +#: builtin/checkout.c:616 #, c-format -msgid "Don't know how to clone %s" +msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/clone.c:838 +#: builtin/checkout.c:618 #, c-format -msgid "Remote branch %s not found in upstream %s" +msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/clone.c:845 -msgid "You appear to have cloned an empty repository." +#: builtin/checkout.c:620 +#, c-format +msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/column.c:51 -msgid "--command must be the first argument" +#: builtin/checkout.c:676 +#, c-format +msgid " ... and %d more.\n" msgstr "" -#: builtin/commit.c:43 +#. The singular version +#: builtin/checkout.c:682 +#, c-format msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" "\n" -"After doing this, you may fix the identity used for this commit with:\n" +"%s\n" +msgid_plural "" +"Warning: you are leaving %d commits behind, not connected to\n" +"any of your branches:\n" "\n" -" git commit --amend --reset-author\n" -msgstr "" - -#: builtin/commit.c:55 -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 "" +"%s\n" +msgstr[0] "" +msgstr[1] "" -#: builtin/commit.c:60 +#: builtin/checkout.c:700 +#, c-format msgid "" -"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" -"If you wish to commit it anyway, use:\n" +"If you want to keep them by creating a new branch, this may be a good time\n" +"to do so with:\n" "\n" -" git commit --allow-empty\n" +" git branch new_branch_name %s\n" "\n" -"Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:256 -msgid "failed to unpack HEAD tree object" +#: builtin/checkout.c:730 +msgid "internal error in revision walk" msgstr "" -#: builtin/commit.c:298 -msgid "unable to create temporary index" +#: builtin/checkout.c:734 +msgid "Previous HEAD position was" msgstr "" -#: builtin/commit.c:304 -msgid "interactive add failed" +#: builtin/checkout.c:761 builtin/checkout.c:950 +msgid "You are on a branch yet to be born" msgstr "" -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 -msgid "unable to write new_index file" +#. case (1) +#: builtin/checkout.c:886 +#, c-format +msgid "invalid reference: %s" msgstr "" -#: builtin/commit.c:389 -msgid "cannot do a partial commit during a merge." +#. case (1): want a tree +#: builtin/checkout.c:925 +#, c-format +msgid "reference is not a tree: %s" msgstr "" -#: builtin/commit.c:391 -msgid "cannot do a partial commit during a cherry-pick." +#: builtin/checkout.c:961 +msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/commit.c:401 -msgid "cannot read the index" +#: builtin/checkout.c:964 builtin/checkout.c:968 +#, c-format +msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/commit.c:421 -msgid "unable to write temporary index file" +#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 +#: builtin/checkout.c:983 +#, c-format +msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/commit.c:496 builtin/commit.c:502 +#: builtin/checkout.c:988 #, c-format -msgid "invalid commit: %s" +msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/commit.c:525 -msgid "malformed --author parameter" +#: builtin/checkout.c:1009 builtin/gc.c:177 +msgid "suppress progress reporting" msgstr "" -#: builtin/commit.c:585 -#, c-format -msgid "Malformed ident string: '%s'" +#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" msgstr "" -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 -#, c-format -msgid "could not lookup commit %s" +#: builtin/checkout.c:1011 +msgid "create and checkout a new branch" msgstr "" -#: builtin/commit.c:635 builtin/shortlog.c:296 -#, c-format -msgid "(reading log message from standard input)\n" +#: builtin/checkout.c:1013 +msgid "create/reset and checkout a branch" msgstr "" -#: builtin/commit.c:637 -msgid "could not read log from standard input" +#: builtin/checkout.c:1014 +msgid "create reflog for new branch" msgstr "" -#: builtin/commit.c:641 -#, c-format -msgid "could not read log file '%s'" +#: builtin/checkout.c:1015 +msgid "detach the HEAD at named commit" msgstr "" -#: builtin/commit.c:647 -msgid "commit has empty message" +#: builtin/checkout.c:1016 +msgid "set upstream info for new branch" msgstr "" -#: builtin/commit.c:663 -msgid "could not read MERGE_MSG" +#: builtin/checkout.c:1018 +msgid "new branch" msgstr "" -#: builtin/commit.c:667 -msgid "could not read SQUASH_MSG" +#: builtin/checkout.c:1018 +msgid "new unparented branch" msgstr "" -#: builtin/commit.c:671 -#, c-format -msgid "could not read '%s'" +#: builtin/checkout.c:1019 +msgid "checkout our version for unmerged files" msgstr "" -#: builtin/commit.c:723 -msgid "could not write commit template" +#: builtin/checkout.c:1021 +msgid "checkout their version for unmerged files" msgstr "" -#: builtin/commit.c:734 -#, c-format -msgid "" -"\n" -"It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" -"and try again.\n" +#: builtin/checkout.c:1023 +msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/commit.c:739 -#, c-format -msgid "" -"\n" -"It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" -"and try again.\n" +#: builtin/checkout.c:1024 +msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/commit.c:751 -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +#: builtin/checkout.c:1025 builtin/merge.c:215 +msgid "update ignored files (default)" msgstr "" -#: builtin/commit.c:756 -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '#' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" +#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 +msgid "style" msgstr "" -#: builtin/commit.c:769 -#, c-format -msgid "%sAuthor: %s" +#: builtin/checkout.c:1027 +msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/commit.c:776 -#, c-format -msgid "%sCommitter: %s" +#: builtin/checkout.c:1030 +msgid "second guess 'git checkout no-such-branch'" msgstr "" -#: builtin/commit.c:796 -msgid "Cannot read index" +#: builtin/checkout.c:1054 +msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/commit.c:833 -msgid "Error building trees" +#: builtin/checkout.c:1071 +msgid "--track needs a branch name" msgstr "" -#: builtin/commit.c:848 builtin/tag.c:361 -#, c-format -msgid "Please supply the message using either -m or -F option.\n" +#: builtin/checkout.c:1078 +msgid "Missing branch name; try -b" msgstr "" -#: builtin/commit.c:945 -#, c-format -msgid "No existing author found with '%s'" +#: builtin/checkout.c:1113 +msgid "invalid path specification" msgstr "" -#: builtin/commit.c:960 builtin/commit.c:1160 +#: builtin/checkout.c:1120 #, c-format -msgid "Invalid untracked files mode '%s'" -msgstr "" - -#: builtin/commit.c:1000 -msgid "Using both --reset-author and --author does not make sense" -msgstr "" - -#: builtin/commit.c:1011 -msgid "You have nothing to amend." -msgstr "" - -#: builtin/commit.c:1014 -msgid "You are in the middle of a merge -- cannot amend." -msgstr "" - -#: builtin/commit.c:1016 -msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "" - -#: builtin/commit.c:1019 -msgid "Options --squash and --fixup cannot be used together" -msgstr "" - -#: builtin/commit.c:1029 -msgid "Only one of -c/-C/-F/--fixup can be used." +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/commit.c:1031 -msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +#: builtin/checkout.c:1125 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/commit.c:1039 -msgid "--reset-author can be used only with -C, -c or --amend." +#: builtin/checkout.c:1129 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." msgstr "" -#: builtin/commit.c:1056 -msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +#: builtin/clean.c:19 +msgid "git clean [-d] [-f] [-n] [-q] [-e ] [-x | -X] [--] ..." msgstr "" -#: builtin/commit.c:1058 -msgid "No paths with --include/--only does not make sense." +#: builtin/clean.c:51 +msgid "do not print names of files removed" msgstr "" -#: builtin/commit.c:1060 -msgid "Clever... amending the last one with dirty index." +#: builtin/clean.c:53 +msgid "force" msgstr "" -#: builtin/commit.c:1062 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +#: builtin/clean.c:55 +msgid "remove whole directories" msgstr "" -#: builtin/commit.c:1072 builtin/tag.c:577 -#, c-format -msgid "Invalid cleanup mode %s" +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 +msgid "pattern" msgstr "" -#: builtin/commit.c:1077 -msgid "Paths with -a does not make sense." +#: builtin/clean.c:57 +msgid "add to ignore rules" msgstr "" -#: builtin/commit.c:1260 -msgid "couldn't look up newly created commit" +#: builtin/clean.c:58 +msgid "remove ignored files, too" msgstr "" -#: builtin/commit.c:1262 -msgid "could not parse newly created commit" +#: builtin/clean.c:60 +msgid "remove only ignored files" msgstr "" -#: builtin/commit.c:1303 -msgid "detached HEAD" +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" msgstr "" -#: builtin/commit.c:1305 -msgid " (root-commit)" +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" -#: builtin/commit.c:1449 -msgid "could not parse HEAD commit" +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" msgstr "" -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/clean.c:155 builtin/clean.c:176 #, c-format -msgid "could not open '%s' for reading" +msgid "Would remove %s\n" msgstr "" -#: builtin/commit.c:1494 +#: builtin/clean.c:159 builtin/clean.c:179 #, c-format -msgid "Corrupt MERGE_HEAD file (%s)" -msgstr "" - -#: builtin/commit.c:1501 -msgid "could not read MERGE_MODE" +msgid "Removing %s\n" msgstr "" -#: builtin/commit.c:1520 +#: builtin/clean.c:162 builtin/clean.c:182 #, c-format -msgid "could not read commit message: %s" +msgid "failed to remove %s" msgstr "" -#: builtin/commit.c:1534 +#: builtin/clean.c:166 #, c-format -msgid "Aborting commit; you did not edit the message.\n" +msgid "Would not remove %s\n" msgstr "" -#: builtin/commit.c:1539 +#: builtin/clean.c:168 #, c-format -msgid "Aborting commit due to empty commit message.\n" +msgid "Not removing %s\n" msgstr "" -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 -msgid "failed to write commit object" +#: builtin/clone.c:36 +msgid "git clone [options] [--] []" msgstr "" -#: builtin/commit.c:1575 -msgid "cannot lock HEAD ref" +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/push.c:399 +msgid "force progress reporting" msgstr "" -#: builtin/commit.c:1579 -msgid "cannot update HEAD ref" +#: builtin/clone.c:66 +msgid "don't create a checkout" msgstr "" -#: builtin/commit.c:1590 -msgid "" -"Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" -"not exceeded, and then \"git reset HEAD\" to recover." +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" msgstr "" -#: builtin/describe.c:234 -#, c-format -msgid "annotated tag %s not available" +#: builtin/clone.c:72 +msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/describe.c:238 -#, c-format -msgid "annotated tag %s has no embedded name" +#: builtin/clone.c:74 +msgid "to clone from a local repository" msgstr "" -#: builtin/describe.c:240 -#, c-format -msgid "tag '%s' is really '%s' here" +#: builtin/clone.c:76 +msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/describe.c:267 -#, c-format -msgid "Not a valid object name %s" +#: builtin/clone.c:78 +msgid "setup as shared repository" msgstr "" -#: builtin/describe.c:270 -#, c-format -msgid "%s is not a valid '%s' object" +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" msgstr "" -#: builtin/describe.c:287 -#, c-format -msgid "no tag exactly matches '%s'" +#: builtin/clone.c:83 builtin/init-db.c:485 +msgid "template-directory" msgstr "" -#: builtin/describe.c:289 -#, c-format -msgid "searching to describe %s\n" +#: builtin/clone.c:84 builtin/init-db.c:486 +msgid "directory from which templates will be used" msgstr "" -#: builtin/describe.c:329 -#, c-format -msgid "finished search at %s\n" +#: builtin/clone.c:86 +msgid "reference repository" msgstr "" -#: builtin/describe.c:353 -#, c-format -msgid "" -"No annotated tags can describe '%s'.\n" -"However, there were unannotated tags: try --tags." +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" msgstr "" -#: builtin/describe.c:357 -#, c-format -msgid "" -"No tags can describe '%s'.\n" -"Try --always, or create some tags." +#: builtin/clone.c:88 +msgid "use instead of 'origin' to track upstream" msgstr "" -#: builtin/describe.c:378 -#, c-format -msgid "traversed %lu commits\n" +#: builtin/clone.c:90 +msgid "checkout instead of the remote's HEAD" msgstr "" -#: builtin/describe.c:381 -#, c-format -msgid "" -"more than %i tags found; listed %i most recent\n" -"gave up search at %s\n" +#: builtin/clone.c:92 +msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/describe.c:436 -msgid "--long is incompatible with --abbrev=0" +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747 +msgid "depth" msgstr "" -#: builtin/describe.c:462 -msgid "No names found, cannot describe anything." +#: builtin/clone.c:94 +msgid "create a shallow clone of that depth" msgstr "" -#: builtin/describe.c:482 -msgid "--dirty is incompatible with committishes" +#: builtin/clone.c:96 +msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/diff.c:79 -#, c-format -msgid "'%s': not a regular file or symlink" +#: builtin/clone.c:97 builtin/init-db.c:494 +msgid "gitdir" msgstr "" -#: builtin/diff.c:224 -#, c-format -msgid "invalid option: %s" +#: builtin/clone.c:98 builtin/init-db.c:495 +msgid "separate git dir from working tree" msgstr "" -#: builtin/diff.c:301 -msgid "Not a git repository" +#: builtin/clone.c:99 +msgid "key=value" msgstr "" -#: builtin/diff.c:344 -#, c-format -msgid "invalid object '%s' given." +#: builtin/clone.c:100 +msgid "set config inside the new repository" msgstr "" -#: builtin/diff.c:349 +#: builtin/clone.c:243 #, c-format -msgid "more than %d trees given: '%s'" +msgid "reference repository '%s' is not a local directory." msgstr "" -#: builtin/diff.c:359 +#: builtin/clone.c:306 #, c-format -msgid "more than two blobs given: '%s'" +msgid "failed to create directory '%s'" msgstr "" -#: builtin/diff.c:367 +#: builtin/clone.c:308 builtin/diff.c:77 #, c-format -msgid "unhandled object '%s' given." -msgstr "" - -#: builtin/fetch.c:200 -msgid "Couldn't find remote ref HEAD" +msgid "failed to stat '%s'" msgstr "" -#: builtin/fetch.c:253 +#: builtin/clone.c:310 #, c-format -msgid "object %s not found" +msgid "%s exists and is not a directory" msgstr "" -#: builtin/fetch.c:259 -msgid "[up to date]" +#: builtin/clone.c:324 +#, c-format +msgid "failed to stat %s\n" msgstr "" -#: builtin/fetch.c:273 +#: builtin/clone.c:346 #, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgid "failed to create link '%s'" msgstr "" -#: builtin/fetch.c:274 builtin/fetch.c:360 -msgid "[rejected]" +#: builtin/clone.c:350 +#, c-format +msgid "failed to copy file to '%s'" msgstr "" -#: builtin/fetch.c:285 -msgid "[tag update]" +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" msgstr "" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 -msgid " (unable to update local ref)" +#: builtin/clone.c:443 +#, c-format +msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/fetch.c:305 -msgid "[new tag]" +#: builtin/clone.c:552 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/fetch.c:308 -msgid "[new branch]" +#: builtin/clone.c:642 +msgid "Too many arguments." msgstr "" -#: builtin/fetch.c:311 -msgid "[new ref]" +#: builtin/clone.c:646 +msgid "You must specify a repository to clone." msgstr "" -#: builtin/fetch.c:356 -msgid "unable to update local ref" +#: builtin/clone.c:657 +#, c-format +msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/fetch.c:356 -msgid "forced update" +#: builtin/clone.c:671 +#, c-format +msgid "repository '%s' does not exist" msgstr "" -#: builtin/fetch.c:362 -msgid "(non-fast-forward)" +#: builtin/clone.c:676 +msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/clone.c:686 #, c-format -msgid "cannot open %s: %s\n" +msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/fetch.c:402 +#: builtin/clone.c:696 #, c-format -msgid "%s did not send all necessary objects\n" +msgid "working tree '%s' already exists." msgstr "" -#: builtin/fetch.c:488 +#: builtin/clone.c:709 builtin/clone.c:723 #, c-format -msgid "From %.*s\n" +msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/fetch.c:499 +#: builtin/clone.c:712 #, c-format -msgid "" -"some local refs could not be updated; try running\n" -" 'git remote prune %s' to remove any old, conflicting branches" +msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/fetch.c:549 +#: builtin/clone.c:731 #, c-format -msgid " (%s will become dangling)" +msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/fetch.c:550 +#: builtin/clone.c:733 #, c-format -msgid " (%s has become dangling)" -msgstr "" - -#: builtin/fetch.c:557 -msgid "[deleted]" -msgstr "" - -#: builtin/fetch.c:558 builtin/remote.c:1055 -msgid "(none)" +msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/fetch.c:675 +#: builtin/clone.c:789 #, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" +msgid "Don't know how to clone %s" msgstr "" -#: builtin/fetch.c:709 +#: builtin/clone.c:838 #, c-format -msgid "Don't know how to fetch from %s" +msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/fetch.c:786 -#, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" +#: builtin/clone.c:845 +msgid "You appear to have cloned an empty repository." msgstr "" -#: builtin/fetch.c:789 -#, c-format -msgid "Option \"%s\" is ignored for %s\n" +#: builtin/column.c:9 +msgid "git column [options]" msgstr "" -#: builtin/fetch.c:888 -#, c-format -msgid "Fetching %s\n" +#: builtin/column.c:26 +msgid "lookup config vars" msgstr "" -#: builtin/fetch.c:890 builtin/remote.c:100 -#, c-format -msgid "Could not fetch %s" +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" msgstr "" -#: builtin/fetch.c:907 -msgid "" -"No remote repository specified. Please, specify either a URL or a\n" -"remote name from which new revisions should be fetched." +#: builtin/column.c:29 +msgid "Maximum width" msgstr "" -#: builtin/fetch.c:927 -msgid "You need to specify a tag name." +#: builtin/column.c:30 +msgid "Padding space on left border" msgstr "" -#: builtin/fetch.c:979 -msgid "fetch --all does not take a repository argument" +#: builtin/column.c:31 +msgid "Padding space on right border" msgstr "" -#: builtin/fetch.c:981 -msgid "fetch --all does not make sense with refspecs" +#: builtin/column.c:32 +msgid "Padding space between columns" msgstr "" -#: builtin/fetch.c:992 -#, c-format -msgid "No such remote or remote group: %s" +#: builtin/column.c:51 +msgid "--command must be the first argument" msgstr "" -#: builtin/fetch.c:1000 -msgid "Fetching a group and specifying refspecs does not make sense" +#: builtin/commit.c:33 +msgid "git commit [options] [--] ..." msgstr "" -#: builtin/gc.c:63 -#, c-format -msgid "Invalid %s: '%s'" +#: builtin/commit.c:38 +msgid "git status [options] [--] ..." msgstr "" -#: builtin/gc.c:90 -#, c-format -msgid "insanely long object directory %.*s" +#: builtin/commit.c:43 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" msgstr "" -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" +#: builtin/commit.c:55 +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/gc.c:224 -#, c-format +#: builtin/commit.c:60 msgid "" -"Auto packing the repository for optimum performance. You may also\n" -"run \"git gc\" manually. See \"git help gc\" for more information.\n" +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" +"\n" +" git commit --allow-empty\n" +"\n" +"Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/gc.c:251 -msgid "" -"There are too many unreachable loose objects; run 'git prune' to remove them." +#: builtin/commit.c:256 +msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/grep.c:216 -#, c-format -msgid "grep: failed to create thread: %s" +#: builtin/commit.c:298 +msgid "unable to create temporary index" msgstr "" -#: builtin/grep.c:454 -#, c-format -msgid "Failed to chdir: %s" +#: builtin/commit.c:304 +msgid "interactive add failed" msgstr "" -#: builtin/grep.c:530 builtin/grep.c:564 -#, c-format -msgid "unable to read tree (%s)" +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +msgid "unable to write new_index file" msgstr "" -#: builtin/grep.c:578 -#, c-format -msgid "unable to grep from object of type %s" +#: builtin/commit.c:389 +msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/grep.c:636 -#, c-format -msgid "switch `%c' expects a numerical value" +#: builtin/commit.c:391 +msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/grep.c:653 -#, c-format -msgid "cannot open '%s'" +#: builtin/commit.c:401 +msgid "cannot read the index" msgstr "" -#: builtin/grep.c:917 -msgid "no pattern given." +#: builtin/commit.c:421 +msgid "unable to write temporary index file" msgstr "" -#: builtin/grep.c:931 +#: builtin/commit.c:510 builtin/commit.c:516 #, c-format -msgid "bad object %s" +msgid "invalid commit: %s" msgstr "" -#: builtin/grep.c:972 -msgid "--open-files-in-pager only works on the worktree" +#: builtin/commit.c:539 +msgid "malformed --author parameter" msgstr "" -#: builtin/grep.c:995 -msgid "--cached or --untracked cannot be used with --no-index." +#: builtin/commit.c:600 +#, c-format +msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/grep.c:1000 -msgid "--no-index or --untracked cannot be used with revs." +#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985 +#, c-format +msgid "could not lookup commit %s" msgstr "" -#: builtin/grep.c:1003 -msgid "--[no-]exclude-standard cannot be used for tracked contents." +#: builtin/commit.c:650 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/grep.c:1011 -msgid "both --cached and trees are given." +#: builtin/commit.c:652 +msgid "could not read log from standard input" msgstr "" -#: builtin/help.c:65 +#: builtin/commit.c:656 #, c-format -msgid "unrecognized help format '%s'" +msgid "could not read log file '%s'" msgstr "" -#: builtin/help.c:93 -msgid "Failed to start emacsclient." +#: builtin/commit.c:662 +msgid "commit has empty message" msgstr "" -#: builtin/help.c:106 -msgid "Failed to parse emacsclient version." +#: builtin/commit.c:678 +msgid "could not read MERGE_MSG" msgstr "" -#: builtin/help.c:114 -#, c-format -msgid "emacsclient version '%d' too old (< 22)." +#: builtin/commit.c:682 +msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/commit.c:686 #, c-format -msgid "failed to exec '%s': %s" +msgid "could not read '%s'" msgstr "" -#: builtin/help.c:217 +#: builtin/commit.c:738 +msgid "could not write commit template" +msgstr "" + +#: builtin/commit.c:749 #, c-format msgid "" -"'%s': path for unsupported man viewer.\n" -"Please consider using 'man..cmd' instead." +"\n" +"It looks like you may be committing a merge.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" msgstr "" -#: builtin/help.c:229 +#: builtin/commit.c:754 #, c-format msgid "" -"'%s': cmd for supported man viewer.\n" -"Please consider using 'man..path' instead." +"\n" +"It looks like you may be committing a cherry-pick.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" msgstr "" -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" +#: builtin/commit.c:766 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/help.c:367 +#: builtin/commit.c:771 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:784 #, c-format -msgid "'%s': unknown man viewer." +msgid "%sAuthor: %s" msgstr "" -#: builtin/help.c:384 -msgid "no man viewer handled the request" +#: builtin/commit.c:791 +#, c-format +msgid "%sCommitter: %s" msgstr "" -#: builtin/help.c:392 -msgid "no info viewer handled the request" +#: builtin/commit.c:811 +msgid "Cannot read index" msgstr "" -#: builtin/help.c:447 builtin/help.c:454 -#, c-format -msgid "usage: %s%s" +#: builtin/commit.c:848 +msgid "Error building trees" msgstr "" -#: builtin/help.c:470 +#: builtin/commit.c:863 builtin/tag.c:361 #, c-format -msgid "`git %s' is aliased to `%s'" +msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/index-pack.c:170 +#: builtin/commit.c:960 #, c-format -msgid "object type mismatch at %s" +msgid "No existing author found with '%s'" msgstr "" -#: builtin/index-pack.c:190 -msgid "object of unexpected type" +#: builtin/commit.c:975 builtin/commit.c:1175 +#, c-format +msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/index-pack.c:227 -#, c-format -msgid "cannot fill %d byte" -msgid_plural "cannot fill %d bytes" -msgstr[0] "" -msgstr[1] "" +#: builtin/commit.c:1015 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" -#: builtin/index-pack.c:237 -msgid "early EOF" +#: builtin/commit.c:1026 +msgid "You have nothing to amend." msgstr "" -#: builtin/index-pack.c:238 -msgid "read error on input" +#: builtin/commit.c:1029 +msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/index-pack.c:250 -msgid "used more bytes than were available" +#: builtin/commit.c:1031 +msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/index-pack.c:257 -msgid "pack too large for current definition of off_t" +#: builtin/commit.c:1034 +msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/index-pack.c:273 -#, c-format -msgid "unable to create '%s'" +#: builtin/commit.c:1044 +msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/index-pack.c:278 -#, c-format -msgid "cannot open packfile '%s'" +#: builtin/commit.c:1046 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/index-pack.c:292 -msgid "pack signature mismatch" +#: builtin/commit.c:1054 +msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/index-pack.c:312 -#, c-format -msgid "pack has bad object at offset %lu: %s" +#: builtin/commit.c:1071 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/index-pack.c:434 -#, c-format -msgid "inflate returned %d" +#: builtin/commit.c:1073 +msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/index-pack.c:483 -msgid "offset value overflow for delta base object" +#: builtin/commit.c:1075 +msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/index-pack.c:491 -msgid "delta base offset is out of bound" +#: builtin/commit.c:1077 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/index-pack.c:499 +#: builtin/commit.c:1087 builtin/tag.c:577 #, c-format -msgid "unknown object type %d" +msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/index-pack.c:530 -msgid "cannot pread pack file" +#: builtin/commit.c:1092 +msgid "Paths with -a does not make sense." msgstr "" -#: builtin/index-pack.c:532 -#, 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/commit.c:1189 builtin/commit.c:1417 +msgid "show status concisely" +msgstr "" -#: builtin/index-pack.c:558 -msgid "serious inflate inconsistency" +#: builtin/commit.c:1191 builtin/commit.c:1419 +msgid "show branch information" msgstr "" -#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 -#: builtin/index-pack.c:712 builtin/index-pack.c:721 -#, c-format -msgid "SHA1 COLLISION FOUND WITH %s !" +#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389 +msgid "machine-readable output" msgstr "" -#: builtin/index-pack.c:652 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:262 -#, c-format -msgid "unable to read %s" +#: builtin/commit.c:1196 builtin/commit.c:1423 +msgid "terminate entries with NUL" msgstr "" -#: builtin/index-pack.c:718 -#, c-format -msgid "cannot read existing object %s" +#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636 +#: builtin/fast-export.c:639 builtin/tag.c:461 +msgid "mode" msgstr "" -#: builtin/index-pack.c:732 -#, c-format -msgid "invalid blob object %s" +#: builtin/commit.c:1199 builtin/commit.c:1426 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/index-pack.c:747 -#, c-format -msgid "invalid %s" +#: builtin/commit.c:1202 +msgid "show ignored files" msgstr "" -#: builtin/index-pack.c:749 -msgid "Error in object" +#: builtin/commit.c:1203 parse-options.h:151 +msgid "when" msgstr "" -#: builtin/index-pack.c:751 -#, c-format -msgid "Not all child objects of %s are reachable" +#: builtin/commit.c:1204 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" msgstr "" -#: builtin/index-pack.c:821 builtin/index-pack.c:847 -msgid "failed to apply delta" +#: builtin/commit.c:1206 +msgid "list untracked files in columns" msgstr "" -#: builtin/index-pack.c:986 -msgid "Receiving objects" +#: builtin/commit.c:1275 +msgid "couldn't look up newly created commit" msgstr "" -#: builtin/index-pack.c:986 -msgid "Indexing objects" +#: builtin/commit.c:1277 +msgid "could not parse newly created commit" msgstr "" -#: builtin/index-pack.c:1012 -msgid "pack is corrupted (SHA1 mismatch)" +#: builtin/commit.c:1318 +msgid "detached HEAD" msgstr "" -#: builtin/index-pack.c:1017 -msgid "cannot fstat packfile" +#: builtin/commit.c:1320 +msgid " (root-commit)" msgstr "" -#: builtin/index-pack.c:1020 -msgid "pack has junk at the end" +#: builtin/commit.c:1387 +msgid "suppress summary after successful commit" msgstr "" -#: builtin/index-pack.c:1031 -msgid "confusion beyond insanity in parse_pack_objects()" +#: builtin/commit.c:1388 +msgid "show diff in commit message template" msgstr "" -#: builtin/index-pack.c:1054 -msgid "Resolving deltas" +#: builtin/commit.c:1390 +msgid "Commit message options" msgstr "" -#: builtin/index-pack.c:1105 -msgid "confusion beyond insanity" +#: builtin/commit.c:1391 builtin/tag.c:459 +msgid "read message from file" msgstr "" -#: builtin/index-pack.c:1124 -#, c-format -msgid "pack has %d unresolved delta" -msgid_plural "pack has %d unresolved deltas" -msgstr[0] "" -msgstr[1] "" - -#: builtin/index-pack.c:1149 -#, c-format -msgid "unable to deflate appended object (%d)" +#: builtin/commit.c:1392 +msgid "author" msgstr "" -#: builtin/index-pack.c:1228 -#, c-format -msgid "local object %s is corrupt" +#: builtin/commit.c:1392 +msgid "override author for commit" msgstr "" -#: builtin/index-pack.c:1252 -msgid "error while closing pack file" +#: builtin/commit.c:1393 builtin/gc.c:178 +msgid "date" msgstr "" -#: builtin/index-pack.c:1265 -#, c-format -msgid "cannot write keep file '%s'" +#: builtin/commit.c:1393 +msgid "override date for commit" msgstr "" -#: builtin/index-pack.c:1273 -#, c-format -msgid "cannot close written keep file '%s'" +#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534 +#: builtin/notes.c:691 builtin/tag.c:457 +msgid "message" msgstr "" -#: builtin/index-pack.c:1286 -msgid "cannot store pack file" +#: builtin/commit.c:1394 +msgid "commit message" msgstr "" -#: builtin/index-pack.c:1297 -msgid "cannot store index file" +#: builtin/commit.c:1395 +msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/index-pack.c:1398 -#, c-format -msgid "Cannot open existing pack file '%s'" +#: builtin/commit.c:1396 +msgid "reuse message from specified commit" msgstr "" -#: builtin/index-pack.c:1400 -#, c-format -msgid "Cannot open existing pack idx file for '%s'" +#: builtin/commit.c:1397 +msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/index-pack.c:1447 -#, c-format -msgid "non delta: %d object" -msgid_plural "non delta: %d objects" -msgstr[0] "" -msgstr[1] "" +#: builtin/commit.c:1398 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" -#: builtin/index-pack.c:1454 -#, c-format -msgid "chain length = %d: %lu object" -msgid_plural "chain length = %d: %lu objects" -msgstr[0] "" -msgstr[1] "" +#: builtin/commit.c:1399 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "" -#: builtin/index-pack.c:1481 -msgid "Cannot come back to cwd" +#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109 +msgid "add Signed-off-by:" msgstr "" -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 -#, c-format -msgid "bad %s" +#: builtin/commit.c:1401 +msgid "use specified template file" msgstr "" -#: builtin/index-pack.c:1558 -msgid "--fix-thin cannot be used without --stdin" +#: builtin/commit.c:1402 +msgid "force edit of commit" msgstr "" -#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" +#: builtin/commit.c:1403 +msgid "default" msgstr "" -#: builtin/index-pack.c:1581 -msgid "--verify with no packfile name given" +#: builtin/commit.c:1403 builtin/tag.c:462 +msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/init-db.c:35 -#, c-format -msgid "Could not make %s writable by group" +#: builtin/commit.c:1404 +msgid "include status in commit message template" msgstr "" -#: builtin/init-db.c:62 -#, c-format -msgid "insanely long template name %s" +#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463 +msgid "key id" msgstr "" -#: builtin/init-db.c:67 -#, c-format -msgid "cannot stat '%s'" +#: builtin/commit.c:1406 builtin/merge.c:214 +msgid "GPG sign commit" msgstr "" -#: builtin/init-db.c:73 -#, c-format -msgid "cannot stat template '%s'" +#. end commit message options +#: builtin/commit.c:1409 +msgid "Commit contents options" msgstr "" -#: builtin/init-db.c:80 -#, c-format -msgid "cannot opendir '%s'" +#: builtin/commit.c:1410 +msgid "commit all changed files" msgstr "" -#: builtin/init-db.c:97 -#, c-format -msgid "cannot readlink '%s'" +#: builtin/commit.c:1411 +msgid "add specified files to index for commit" msgstr "" -#: builtin/init-db.c:99 -#, c-format -msgid "insanely long symlink %s" +#: builtin/commit.c:1412 +msgid "interactively add files" msgstr "" -#: builtin/init-db.c:102 -#, c-format -msgid "cannot symlink '%s' '%s'" +#: builtin/commit.c:1413 +msgid "interactively add changes" msgstr "" -#: builtin/init-db.c:106 -#, c-format -msgid "cannot copy '%s' to '%s'" +#: builtin/commit.c:1414 +msgid "commit only specified files" msgstr "" -#: builtin/init-db.c:110 -#, c-format -msgid "ignoring template %s" +#: builtin/commit.c:1415 +msgid "bypass pre-commit hook" msgstr "" -#: builtin/init-db.c:133 -#, c-format -msgid "insanely long template path %s" +#: builtin/commit.c:1416 +msgid "show what would be committed" msgstr "" -#: builtin/init-db.c:141 -#, c-format -msgid "templates not found %s" +#: builtin/commit.c:1424 +msgid "amend previous commit" msgstr "" -#: builtin/init-db.c:154 -#, c-format -msgid "not copying templates of a wrong format version %d from '%s'" +#: builtin/commit.c:1425 +msgid "bypass post-rewrite hook" msgstr "" -#: builtin/init-db.c:192 -#, c-format -msgid "insane git directory %s" +#: builtin/commit.c:1430 +msgid "ok to record an empty change" msgstr "" -#: builtin/init-db.c:323 builtin/init-db.c:326 -#, c-format -msgid "%s already exists" +#: builtin/commit.c:1433 +msgid "ok to record a change with an empty message" msgstr "" -#: builtin/init-db.c:355 -#, c-format -msgid "unable to handle file type %d" +#: builtin/commit.c:1464 +msgid "could not parse HEAD commit" msgstr "" -#: builtin/init-db.c:358 +#: builtin/commit.c:1502 builtin/merge.c:508 #, c-format -msgid "unable to move %s to %s" +msgid "could not open '%s' for reading" msgstr "" -#: builtin/init-db.c:363 +#: builtin/commit.c:1509 #, c-format -msgid "Could not create git link %s" +msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#. -#. * TRANSLATORS: The first '%s' is either "Reinitialized -#. * existing" or "Initialized empty", the second " shared" or -#. * "", and the last '%s%s' is the verbatim directory name. -#. -#: builtin/init-db.c:420 -#, c-format -msgid "%s%s Git repository in %s%s\n" +#: builtin/commit.c:1516 +msgid "could not read MERGE_MODE" msgstr "" -#: builtin/init-db.c:421 -msgid "Reinitialized existing" +#: builtin/commit.c:1535 +#, c-format +msgid "could not read commit message: %s" msgstr "" -#: builtin/init-db.c:421 -msgid "Initialized empty" +#: builtin/commit.c:1549 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/init-db.c:422 -msgid " shared" +#: builtin/commit.c:1554 +#, c-format +msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/init-db.c:441 -msgid "cannot tell cwd" +#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960 +msgid "failed to write commit object" msgstr "" -#: builtin/init-db.c:522 builtin/init-db.c:529 -#, c-format -msgid "cannot mkdir %s" +#: builtin/commit.c:1590 +msgid "cannot lock HEAD ref" msgstr "" -#: builtin/init-db.c:533 -#, c-format -msgid "cannot chdir to %s" +#: builtin/commit.c:1594 +msgid "cannot update HEAD ref" msgstr "" -#: builtin/init-db.c:555 -#, c-format +#: builtin/commit.c:1605 msgid "" -"%s (or --work-tree=) not allowed without specifying %s (or --git-" -"dir=)" +"Repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full or quota is\n" +"not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -#: builtin/init-db.c:579 -msgid "Cannot access current working directory" +#: builtin/config.c:7 +msgid "git config [options]" msgstr "" -#: builtin/init-db.c:586 -#, c-format -msgid "Cannot access work tree '%s'" +#: builtin/config.c:52 +msgid "Config file location" msgstr "" -#: builtin/log.c:189 -#, c-format -msgid "Final output: %d %s\n" +#: builtin/config.c:53 +msgid "use global config file" msgstr "" -#: builtin/log.c:403 builtin/log.c:494 -#, c-format -msgid "Could not read object %s" +#: builtin/config.c:54 +msgid "use system config file" msgstr "" -#: builtin/log.c:518 -#, c-format -msgid "Unknown type: %d" +#: builtin/config.c:55 +msgid "use repository config file" msgstr "" -#: builtin/log.c:608 -msgid "format.headers without value" +#: builtin/config.c:56 +msgid "use given config file" msgstr "" -#: builtin/log.c:682 -msgid "name of output directory is too long" +#: builtin/config.c:57 +msgid "Action" msgstr "" -#: builtin/log.c:693 -#, c-format -msgid "Cannot open patch file %s" +#: builtin/config.c:58 +msgid "get value: name [value-regex]" msgstr "" -#: builtin/log.c:707 -msgid "Need exactly one range." +#: builtin/config.c:59 +msgid "get all values: key [value-regex]" msgstr "" -#: builtin/log.c:715 -msgid "Not a range." +#: builtin/config.c:60 +msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/log.c:789 -msgid "Cover letter needs email format" +#: builtin/config.c:61 +msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/log.c:862 -#, c-format -msgid "insane in-reply-to: %s" +#: builtin/config.c:62 +msgid "add a new variable: name value" msgstr "" -#: builtin/log.c:935 -msgid "Two output directories?" +#: builtin/config.c:63 +msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/log.c:1157 -#, c-format -msgid "bogus committer info %s" +#: builtin/config.c:64 +msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/log.c:1202 -msgid "-n and -k are mutually exclusive." +#: builtin/config.c:65 +msgid "rename section: old-name new-name" msgstr "" -#: builtin/log.c:1204 -msgid "--subject-prefix and -k are mutually exclusive." +#: builtin/config.c:66 +msgid "remove a section: name" msgstr "" -#: builtin/log.c:1212 -msgid "--name-only does not make sense" +#: builtin/config.c:67 +msgid "list all" msgstr "" -#: builtin/log.c:1214 -msgid "--name-status does not make sense" +#: builtin/config.c:68 +msgid "open an editor" msgstr "" -#: builtin/log.c:1216 -msgid "--check does not make sense" +#: builtin/config.c:69 builtin/config.c:70 +msgid "slot" msgstr "" -#: builtin/log.c:1239 -msgid "standard output, or directory, which one?" +#: builtin/config.c:69 +msgid "find the color configured: [default]" msgstr "" -#: builtin/log.c:1241 -#, c-format -msgid "Could not create directory '%s'" +#: builtin/config.c:70 +msgid "find the color setting: [stdout-is-tty]" msgstr "" -#: builtin/log.c:1394 -msgid "Failed to create output files" +#: builtin/config.c:71 +msgid "Type" msgstr "" -#: builtin/log.c:1498 -#, c-format -msgid "" -"Could not find a tracked remote branch, please specify manually.\n" +#: builtin/config.c:72 +msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 -#, c-format -msgid "Unknown commit %s" +#: builtin/config.c:73 +msgid "value is decimal number" msgstr "" -#: builtin/merge.c:90 -msgid "switch `m' requires a value" +#: builtin/config.c:74 +msgid "value is --bool or --int" msgstr "" -#: builtin/merge.c:127 -#, c-format -msgid "Could not find merge strategy '%s'.\n" +#: builtin/config.c:75 +msgid "value is a path (file or directory name)" msgstr "" -#: builtin/merge.c:128 -#, c-format -msgid "Available strategies are:" +#: builtin/config.c:76 +msgid "Other" msgstr "" -#: builtin/merge.c:133 -#, c-format -msgid "Available custom strategies are:" +#: builtin/config.c:77 +msgid "terminate values with NUL byte" msgstr "" -#: builtin/merge.c:240 -msgid "could not run stash." +#: builtin/config.c:78 +msgid "respect include directives on lookup" msgstr "" -#: builtin/merge.c:245 -msgid "stash failed" +#: builtin/count-objects.c:69 +msgid "git count-objects [-v]" msgstr "" -#: builtin/merge.c:250 -#, c-format -msgid "not a valid object: %s" +#: builtin/describe.c:15 +msgid "git describe [options] *" msgstr "" -#: builtin/merge.c:269 builtin/merge.c:286 -msgid "read-tree failed" +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" msgstr "" -#: builtin/merge.c:316 -msgid " (nothing to squash)" +#: builtin/describe.c:234 +#, c-format +msgid "annotated tag %s not available" msgstr "" -#: builtin/merge.c:329 +#: builtin/describe.c:238 #, c-format -msgid "Squash commit -- not updating HEAD\n" +msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/merge.c:361 -msgid "Writing SQUASH_MSG" +#: builtin/describe.c:240 +#, c-format +msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/merge.c:363 -msgid "Finishing SQUASH_MSG" +#: builtin/describe.c:267 +#, c-format +msgid "Not a valid object name %s" msgstr "" -#: builtin/merge.c:386 +#: builtin/describe.c:270 #, c-format -msgid "No merge message -- not updating HEAD\n" +msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/merge.c:436 +#: builtin/describe.c:287 #, c-format -msgid "'%s' does not point to a commit" +msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/merge.c:535 +#: builtin/describe.c:289 #, c-format -msgid "Bad branch.%s.mergeoptions string: %s" +msgid "searching to describe %s\n" msgstr "" -#: builtin/merge.c:628 -msgid "git write-tree failed to write a tree" +#: builtin/describe.c:329 +#, c-format +msgid "finished search at %s\n" msgstr "" -#: builtin/merge.c:678 -msgid "failed to read the cache" +#: builtin/describe.c:353 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." msgstr "" -#: builtin/merge.c:709 -msgid "Not handling anything other than two heads merge." +#: builtin/describe.c:357 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." msgstr "" -#: builtin/merge.c:723 +#: builtin/describe.c:378 #, c-format -msgid "Unknown option for merge-recursive: -X%s" +msgid "traversed %lu commits\n" msgstr "" -#: builtin/merge.c:737 +#: builtin/describe.c:381 #, c-format -msgid "unable to write %s" +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" msgstr "" -#: builtin/merge.c:876 -#, c-format -msgid "Could not read from '%s'" +#: builtin/describe.c:403 +msgid "find the tag that comes after the commit" msgstr "" -#: builtin/merge.c:885 -#, c-format -msgid "Not committing merge; use 'git commit' to complete the merge.\n" +#: builtin/describe.c:404 +msgid "debug search strategy on stderr" msgstr "" -#: builtin/merge.c:891 -msgid "" -"Please enter a commit message to explain why this merge is necessary,\n" -"especially if it merges an updated upstream into a topic branch.\n" -"\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" -"the commit.\n" +#: builtin/describe.c:405 +msgid "use any ref in .git/refs" msgstr "" -#: builtin/merge.c:915 -msgid "Empty commit message." +#: builtin/describe.c:406 +msgid "use any tag in .git/refs/tags" msgstr "" -#: builtin/merge.c:927 -#, c-format -msgid "Wonderful.\n" +#: builtin/describe.c:407 +msgid "always use long format" msgstr "" -#: builtin/merge.c:992 -#, c-format -msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +#: builtin/describe.c:410 +msgid "only output exact matches" msgstr "" -#: builtin/merge.c:1008 -#, c-format -msgid "'%s' is not a commit" +#: builtin/describe.c:412 +msgid "consider most recent tags (default: 10)" msgstr "" -#: builtin/merge.c:1049 -msgid "No current branch." +#: builtin/describe.c:414 +msgid "only consider tags matching " msgstr "" -#: builtin/merge.c:1051 -msgid "No remote for the current branch." +#: builtin/describe.c:416 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/merge.c:1053 -msgid "No default upstream defined for the current branch." +#: builtin/describe.c:417 +msgid "mark" msgstr "" -#: builtin/merge.c:1058 -#, c-format -msgid "No remote tracking branch for %s from %s" +#: builtin/describe.c:418 +msgid "append on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/merge.c:1145 builtin/merge.c:1302 +#: builtin/describe.c:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "" + +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." +msgstr "" + +#: builtin/describe.c:482 +msgid "--dirty is incompatible with committishes" +msgstr "" + +#: builtin/diff.c:79 #, c-format -msgid "%s - not something we can merge" +msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/merge.c:1213 -msgid "There is no merge to abort (MERGE_HEAD missing)." +#: builtin/diff.c:224 +#, c-format +msgid "invalid option: %s" msgstr "" -#: builtin/merge.c:1229 git-pull.sh:31 -msgid "" -"You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +#: builtin/diff.c:301 +msgid "Not a git repository" msgstr "" -#: builtin/merge.c:1232 git-pull.sh:34 -msgid "You have not concluded your merge (MERGE_HEAD exists)." +#: builtin/diff.c:344 +#, c-format +msgid "invalid object '%s' given." msgstr "" -#: builtin/merge.c:1236 -msgid "" -"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +#: builtin/diff.c:349 +#, c-format +msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/merge.c:1239 -msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +#: builtin/diff.c:359 +#, c-format +msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/merge.c:1248 -msgid "You cannot combine --squash with --no-ff." +#: builtin/diff.c:367 +#, c-format +msgid "unhandled object '%s' given." msgstr "" -#: builtin/merge.c:1253 -msgid "You cannot combine --no-ff with --ff-only." +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/merge.c:1260 -msgid "No commit specified and merge.defaultToUpstream not set." +#: builtin/fast-export.c:635 +msgid "show progress after objects" msgstr "" -#: builtin/merge.c:1292 -msgid "Can merge only exactly one commit into empty head" +#: builtin/fast-export.c:637 +msgid "select handling of signed tags" msgstr "" -#: builtin/merge.c:1295 -msgid "Squash commit into empty head not supported yet" +#: builtin/fast-export.c:640 +msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/merge.c:1297 -msgid "Non-fast-forward commit does not make sense into an empty head" +#: builtin/fast-export.c:643 +msgid "Dump marks to this file" msgstr "" -#: builtin/merge.c:1412 -#, c-format -msgid "Updating %s..%s\n" +#: builtin/fast-export.c:645 +msgid "Import marks from this file" msgstr "" -#: builtin/merge.c:1450 -#, c-format -msgid "Trying really trivial in-index merge...\n" +#: builtin/fast-export.c:647 +msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/merge.c:1457 -#, c-format -msgid "Nope.\n" +#: builtin/fast-export.c:649 +msgid "Output full tree for each commit" msgstr "" -#: builtin/merge.c:1489 -msgid "Not possible to fast-forward, aborting." +#: builtin/fast-export.c:651 +msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/merge.c:1512 builtin/merge.c:1591 -#, c-format -msgid "Rewinding the tree to pristine...\n" +#: builtin/fast-export.c:652 +msgid "Skip output of blob data" msgstr "" -#: builtin/merge.c:1516 -#, c-format -msgid "Trying merge strategy %s...\n" +#: builtin/fetch.c:20 +msgid "git fetch [] [ [...]]" msgstr "" -#: builtin/merge.c:1582 -#, c-format -msgid "No merge strategy handled the merge.\n" +#: builtin/fetch.c:21 +msgid "git fetch [] " msgstr "" -#: builtin/merge.c:1584 -#, c-format -msgid "Merge with strategy %s failed.\n" +#: builtin/fetch.c:22 +msgid "git fetch --multiple [] [( | )...]" msgstr "" -#: builtin/merge.c:1593 -#, c-format -msgid "Using the %s to prepare resolving by hand.\n" +#: builtin/fetch.c:23 +msgid "git fetch --all []" msgstr "" -#: builtin/merge.c:1605 -#, c-format -msgid "Automatic merge went well; stopped before committing as requested\n" +#: builtin/fetch.c:60 +msgid "fetch from all remotes" msgstr "" -#: builtin/mv.c:108 -#, c-format -msgid "Checking rename of '%s' to '%s'\n" +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/mv.c:112 -msgid "bad source" +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" msgstr "" -#: builtin/mv.c:115 -msgid "can not move directory into itself" +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" msgstr "" -#: builtin/mv.c:118 -msgid "cannot move directory over file" +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" msgstr "" -#: builtin/mv.c:128 -#, c-format -msgid "Huh? %.*s is in index?" +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" msgstr "" -#: builtin/mv.c:140 -msgid "source directory is empty" +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/mv.c:171 -msgid "not under version control" +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/mv.c:173 -msgid "destination exists" +#: builtin/fetch.c:74 +msgid "on-demand" msgstr "" -#: builtin/mv.c:181 -#, c-format -msgid "overwriting '%s'" +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" msgstr "" -#: builtin/mv.c:184 -msgid "Cannot overwrite" +#: builtin/fetch.c:79 +msgid "keep downloaded pack" msgstr "" -#: builtin/mv.c:187 -msgid "multiple sources for the same target" +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" msgstr "" -#: builtin/mv.c:202 -#, c-format -msgid "%s, source=%s, destination=%s" +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" msgstr "" -#: builtin/mv.c:212 -#, c-format -msgid "Renaming %s to %s\n" +#: builtin/fetch.c:85 builtin/log.c:1083 +msgid "dir" msgstr "" -#: builtin/mv.c:215 builtin/remote.c:731 -#, c-format -msgid "renaming '%s' failed" +#: builtin/fetch.c:86 +msgid "prepend this to submodule path output" msgstr "" -#: builtin/notes.c:139 -#, c-format -msgid "unable to start 'show' for object '%s'" +#: builtin/fetch.c:89 +msgid "default mode for recursion" msgstr "" -#: builtin/notes.c:145 -msgid "can't fdopen 'show' output fd" +#: builtin/fetch.c:201 +msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/notes.c:155 +#: builtin/fetch.c:254 #, c-format -msgid "failed to close pipe to 'show' for object '%s'" +msgid "object %s not found" msgstr "" -#: builtin/notes.c:158 -#, c-format -msgid "failed to finish 'show' for object '%s'" +#: builtin/fetch.c:260 +msgid "[up to date]" msgstr "" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/fetch.c:274 #, c-format -msgid "could not create file '%s'" +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/notes.c:189 -msgid "Please supply the note contents using either -m or -F option" +#: builtin/fetch.c:275 builtin/fetch.c:361 +msgid "[rejected]" msgstr "" -#: builtin/notes.c:210 builtin/notes.c:973 -#, c-format -msgid "Removing note for object %s\n" +#: builtin/fetch.c:286 +msgid "[tag update]" msgstr "" -#: builtin/notes.c:215 -msgid "unable to write note object" +#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341 +msgid " (unable to update local ref)" msgstr "" -#: builtin/notes.c:217 -#, c-format -msgid "The note contents has been left in %s" +#: builtin/fetch.c:306 +msgid "[new tag]" msgstr "" -#: builtin/notes.c:251 builtin/tag.c:542 -#, c-format -msgid "cannot read '%s'" +#: builtin/fetch.c:309 +msgid "[new branch]" msgstr "" -#: builtin/notes.c:253 builtin/tag.c:545 -#, c-format -msgid "could not open or read '%s'" +#: builtin/fetch.c:312 +msgid "[new ref]" msgstr "" -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." +#: builtin/fetch.c:357 +msgid "unable to update local ref" msgstr "" -#: builtin/notes.c:275 -#, c-format -msgid "Failed to read object '%s'." +#: builtin/fetch.c:357 +msgid "forced update" msgstr "" -#: builtin/notes.c:299 -msgid "Cannot commit uninitialized/unreferenced notes tree" +#: builtin/fetch.c:363 +msgid "(non-fast-forward)" msgstr "" -#: builtin/notes.c:340 +#: builtin/fetch.c:394 builtin/fetch.c:686 #, c-format -msgid "Bad notes.rewriteMode value: '%s'" +msgid "cannot open %s: %s\n" msgstr "" -#: builtin/notes.c:350 +#: builtin/fetch.c:403 #, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgid "%s did not send all necessary objects\n" msgstr "" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/fetch.c:489 #, c-format -msgid "Bad %s value: '%s'" +msgid "From %.*s\n" msgstr "" -#: builtin/notes.c:441 +#: builtin/fetch.c:500 #, c-format -msgid "Malformed input line: '%s'." +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/notes.c:456 +#: builtin/fetch.c:550 +#, c-format +msgid " (%s will become dangling)" +msgstr "" + +#: builtin/fetch.c:551 +#, c-format +msgid " (%s has become dangling)" +msgstr "" + +#: builtin/fetch.c:558 +msgid "[deleted]" +msgstr "" + +#: builtin/fetch.c:559 builtin/remote.c:1055 +msgid "(none)" +msgstr "" + +#: builtin/fetch.c:676 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:710 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:787 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:790 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:892 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:894 builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:913 +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:933 +msgid "You need to specify a tag name." +msgstr "" + +#: builtin/fetch.c:985 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:987 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:998 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:1006 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/fmt-merge-msg.c:13 +msgid "git fmt-merge-msg [-m ] [--log[=]|--no-log] [--file ]" +msgstr "" + +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "" + +#: builtin/fmt-merge-msg.c:654 +msgid "populate log with at most entries from shortlog" +msgstr "" + +#: builtin/fmt-merge-msg.c:657 +msgid "alias for --log (deprecated)" +msgstr "" + +#: builtin/fmt-merge-msg.c:660 +msgid "text" +msgstr "" + +#: builtin/fmt-merge-msg.c:661 +msgid "use as start of message" +msgstr "" + +#: builtin/fmt-merge-msg.c:662 +msgid "file to read from" +msgstr "" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] []" +msgstr "" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "" + +#: builtin/for-each-ref.c:1003 +msgid "show only matched refs" +msgstr "" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [...]" +msgstr "" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "" + +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "" + +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "" + +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" +msgstr "" + +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "" + +#: builtin/gc.c:221 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:224 +#, c-format +msgid "" +"Auto packing the repository for optimum performance. You may also\n" +"run \"git gc\" manually. See \"git help gc\" for more information.\n" +msgstr "" + +#: builtin/gc.c:251 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:22 +msgid "git grep [options] [-e] [...] [[--] ...]" +msgstr "" + +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "" + +#: builtin/grep.c:454 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:530 builtin/grep.c:564 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:578 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:636 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:653 +#, c-format +msgid "cannot open '%s'" +msgstr "" + +#: builtin/grep.c:728 +msgid "search in index instead of in the work tree" +msgstr "" + +#: builtin/grep.c:730 +msgid "find in contents not managed by git" +msgstr "" + +#: builtin/grep.c:732 +msgid "search in both tracked and untracked files" +msgstr "" + +#: builtin/grep.c:734 +msgid "search also in ignored files" +msgstr "" + +#: builtin/grep.c:737 +msgid "show non-matching lines" +msgstr "" + +#: builtin/grep.c:739 +msgid "case insensitive matching" +msgstr "" + +#: builtin/grep.c:741 +msgid "match patterns only at word boundaries" +msgstr "" + +#: builtin/grep.c:743 +msgid "process binary files as text" +msgstr "" + +#: builtin/grep.c:745 +msgid "don't match patterns in binary files" +msgstr "" + +#: builtin/grep.c:748 +msgid "descend at most levels" +msgstr "" + +#: builtin/grep.c:752 +msgid "use extended POSIX regular expressions" +msgstr "" + +#: builtin/grep.c:755 +msgid "use basic POSIX regular expressions (default)" +msgstr "" + +#: builtin/grep.c:758 +msgid "interpret patterns as fixed strings" +msgstr "" + +#: builtin/grep.c:761 +msgid "use Perl-compatible regular expressions" +msgstr "" + +#: builtin/grep.c:764 +msgid "show line numbers" +msgstr "" + +#: builtin/grep.c:765 +msgid "don't show filenames" +msgstr "" + +#: builtin/grep.c:766 +msgid "show filenames" +msgstr "" + +#: builtin/grep.c:768 +msgid "show filenames relative to top directory" +msgstr "" + +#: builtin/grep.c:770 +msgid "show only filenames instead of matching lines" +msgstr "" + +#: builtin/grep.c:772 +msgid "synonym for --files-with-matches" +msgstr "" + +#: builtin/grep.c:775 +msgid "show only the names of files without match" +msgstr "" + +#: builtin/grep.c:777 +msgid "print NUL after filenames" +msgstr "" + +#: builtin/grep.c:779 +msgid "show the number of matches instead of matching lines" +msgstr "" + +#: builtin/grep.c:780 +msgid "highlight matches" +msgstr "" + +#: builtin/grep.c:782 +msgid "print empty line between matches from different files" +msgstr "" + +#: builtin/grep.c:784 +msgid "show filename only once above matches from same file" +msgstr "" + +#: builtin/grep.c:787 +msgid "show context lines before and after matches" +msgstr "" + +#: builtin/grep.c:790 +msgid "show context lines before matches" +msgstr "" + +#: builtin/grep.c:792 +msgid "show context lines after matches" +msgstr "" + +#: builtin/grep.c:793 +msgid "shortcut for -C NUM" +msgstr "" + +#: builtin/grep.c:796 +msgid "show a line with the function name before matches" +msgstr "" + +#: builtin/grep.c:798 +msgid "show the surrounding function" +msgstr "" + +#: builtin/grep.c:801 +msgid "read patterns from file" +msgstr "" + +#: builtin/grep.c:803 +msgid "match " +msgstr "" + +#: builtin/grep.c:805 +msgid "combine patterns specified with -e" +msgstr "" + +#: builtin/grep.c:817 +msgid "indicate hit with exit status without output" +msgstr "" + +#: builtin/grep.c:819 +msgid "show only matches from files that match all patterns" +msgstr "" + +#: builtin/grep.c:822 +msgid "pager" +msgstr "" + +#: builtin/grep.c:822 +msgid "show matching files in the pager" +msgstr "" + +#: builtin/grep.c:825 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "" + +#: builtin/grep.c:826 builtin/show-ref.c:201 +msgid "show usage" +msgstr "" + +#: builtin/grep.c:917 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:931 +#, c-format +msgid "bad object %s" +msgstr "" + +#: builtin/grep.c:972 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:995 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:1000 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "" + +#: builtin/grep.c:1003 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "" + +#: builtin/grep.c:1011 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t ] [-w] [--path=|--no-filters] [--stdin] [--] " +"..." +msgstr "" + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < " +msgstr "" + +#: builtin/hash-object.c:72 +msgid "type" +msgstr "" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "" + +#: builtin/help.c:43 +msgid "print all available commands" +msgstr "" + +#: builtin/help.c:44 +msgid "show man page" +msgstr "" + +#: builtin/help.c:45 +msgid "show manual in web browser" +msgstr "" + +#: builtin/help.c:47 +msgid "show info page" +msgstr "" + +#: builtin/help.c:53 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "" + +#: builtin/help.c:65 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "" + +#: builtin/help.c:93 +msgid "Failed to start emacsclient." +msgstr "" + +#: builtin/help.c:106 +msgid "Failed to parse emacsclient version." +msgstr "" + +#: builtin/help.c:114 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "" + +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "" + +#: builtin/help.c:217 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man..cmd' instead." +msgstr "" + +#: builtin/help.c:229 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man..path' instead." +msgstr "" + +#: builtin/help.c:299 +msgid "The most commonly used git commands are:" +msgstr "" + +#: builtin/help.c:367 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "" + +#: builtin/help.c:384 +msgid "no man viewer handled the request" +msgstr "" + +#: builtin/help.c:392 +msgid "no info viewer handled the request" +msgstr "" + +#: builtin/help.c:447 builtin/help.c:454 +#, c-format +msgid "usage: %s%s" +msgstr "" + +#: builtin/help.c:470 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "" + +#: builtin/index-pack.c:170 +#, c-format +msgid "object type mismatch at %s" +msgstr "" + +#: builtin/index-pack.c:190 +msgid "object of unexpected type" +msgstr "" + +#: builtin/index-pack.c:227 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:237 +msgid "early EOF" +msgstr "" + +#: builtin/index-pack.c:238 +msgid "read error on input" +msgstr "" + +#: builtin/index-pack.c:250 +msgid "used more bytes than were available" +msgstr "" + +#: builtin/index-pack.c:257 +msgid "pack too large for current definition of off_t" +msgstr "" + +#: builtin/index-pack.c:273 +#, c-format +msgid "unable to create '%s'" +msgstr "" + +#: builtin/index-pack.c:278 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "" + +#: builtin/index-pack.c:292 +msgid "pack signature mismatch" +msgstr "" + +#: builtin/index-pack.c:294 +#, c-format +msgid "pack version % unsupported" +msgstr "" + +#: builtin/index-pack.c:312 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "" + +#: builtin/index-pack.c:434 +#, c-format +msgid "inflate returned %d" +msgstr "" + +#: builtin/index-pack.c:483 +msgid "offset value overflow for delta base object" +msgstr "" + +#: builtin/index-pack.c:491 +msgid "delta base offset is out of bound" +msgstr "" + +#: builtin/index-pack.c:499 +#, c-format +msgid "unknown object type %d" +msgstr "" + +#: builtin/index-pack.c:530 +msgid "cannot pread pack file" +msgstr "" + +#: builtin/index-pack.c:532 +#, 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:558 +msgid "serious inflate inconsistency" +msgstr "" + +#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 +#: builtin/index-pack.c:712 builtin/index-pack.c:721 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "" + +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:262 +#, c-format +msgid "unable to read %s" +msgstr "" + +#: builtin/index-pack.c:718 +#, c-format +msgid "cannot read existing object %s" +msgstr "" + +#: builtin/index-pack.c:732 +#, c-format +msgid "invalid blob object %s" +msgstr "" + +#: builtin/index-pack.c:747 +#, c-format +msgid "invalid %s" +msgstr "" + +#: builtin/index-pack.c:749 +msgid "Error in object" +msgstr "" + +#: builtin/index-pack.c:751 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "" + +#: builtin/index-pack.c:821 builtin/index-pack.c:847 +msgid "failed to apply delta" +msgstr "" + +#: builtin/index-pack.c:986 +msgid "Receiving objects" +msgstr "" + +#: builtin/index-pack.c:986 +msgid "Indexing objects" +msgstr "" + +#: builtin/index-pack.c:1012 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "" + +#: builtin/index-pack.c:1017 +msgid "cannot fstat packfile" +msgstr "" + +#: builtin/index-pack.c:1020 +msgid "pack has junk at the end" +msgstr "" + +#: builtin/index-pack.c:1031 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "" + +#: builtin/index-pack.c:1054 +msgid "Resolving deltas" +msgstr "" + +#: builtin/index-pack.c:1064 +#, c-format +msgid "unable to create thread: %s" +msgstr "" + +#: builtin/index-pack.c:1106 +msgid "confusion beyond insanity" +msgstr "" + +#: builtin/index-pack.c:1112 +#, c-format +msgid "completed with %d local objects" +msgstr "" + +#: builtin/index-pack.c:1121 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "" + +#: builtin/index-pack.c:1125 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1150 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "" + +#: builtin/index-pack.c:1229 +#, c-format +msgid "local object %s is corrupt" +msgstr "" + +#: builtin/index-pack.c:1253 +msgid "error while closing pack file" +msgstr "" + +#: builtin/index-pack.c:1266 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "" + +#: builtin/index-pack.c:1274 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "" + +#: builtin/index-pack.c:1287 +msgid "cannot store pack file" +msgstr "" + +#: builtin/index-pack.c:1298 +msgid "cannot store index file" +msgstr "" + +#: builtin/index-pack.c:1331 +#, c-format +msgid "bad pack.indexversion=%" +msgstr "" + +#: builtin/index-pack.c:1337 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "" + +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "" + +#: builtin/index-pack.c:1399 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "" + +#: builtin/index-pack.c:1401 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "" + +#: builtin/index-pack.c:1448 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1455 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1482 +msgid "Cannot come back to cwd" +msgstr "" + +#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 +#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 +#, c-format +msgid "bad %s" +msgstr "" + +#: builtin/index-pack.c:1559 +msgid "--fix-thin cannot be used without --stdin" +msgstr "" + +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "" + +#: builtin/index-pack.c:1582 +msgid "--verify with no packfile name given" +msgstr "" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "" + +#: builtin/init-db.c:323 builtin/init-db.c:326 +#, c-format +msgid "%s already exists" +msgstr "" + +#: builtin/init-db.c:355 +#, c-format +msgid "unable to handle file type %d" +msgstr "" + +#: builtin/init-db.c:358 +#, c-format +msgid "unable to move %s to %s" +msgstr "" + +#: builtin/init-db.c:363 +#, c-format +msgid "Could not create git link %s" +msgstr "" + +#. +#. * TRANSLATORS: The first '%s' is either "Reinitialized +#. * existing" or "Initialized empty", the second " shared" or +#. * "", and the last '%s%s' is the verbatim directory name. +#. +#: builtin/init-db.c:420 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "" + +#: builtin/init-db.c:421 +msgid "Reinitialized existing" +msgstr "" + +#: builtin/init-db.c:421 +msgid "Initialized empty" +msgstr "" + +#: builtin/init-db.c:422 +msgid " shared" +msgstr "" + +#: builtin/init-db.c:441 +msgid "cannot tell cwd" +msgstr "" + +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=] [--shared" +"[=]] [directory]" +msgstr "" + +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "" + +#: builtin/init-db.c:491 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "" + +#: builtin/init-db.c:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "" + +#: builtin/init-db.c:522 builtin/init-db.c:529 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#: builtin/init-db.c:533 +#, c-format +msgid "cannot chdir to %s" +msgstr "" + +#: builtin/init-db.c:555 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" + +#: builtin/init-db.c:579 +msgid "Cannot access current working directory" +msgstr "" + +#: builtin/init-db.c:586 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "" + +#: builtin/log.c:37 +msgid "git log [] [..] [[--] ...]\n" +msgstr "" + +#: builtin/log.c:38 +msgid " or: git show [options] ..." +msgstr "" + +#: builtin/log.c:100 +msgid "suppress diff output" +msgstr "" + +#: builtin/log.c:101 +msgid "show source" +msgstr "" + +#: builtin/log.c:102 +msgid "decorate options" +msgstr "" + +#: builtin/log.c:189 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:403 builtin/log.c:494 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:518 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:608 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:682 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:693 +#, c-format +msgid "Cannot open patch file %s" +msgstr "" + +#: builtin/log.c:707 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:715 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:789 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:862 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:890 +msgid "git format-patch [options] [ | ]" +msgstr "" + +#: builtin/log.c:935 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1063 +msgid "use [PATCH n/m] even with a single patch" +msgstr "" + +#: builtin/log.c:1066 +msgid "use [PATCH] even with multiple patches" +msgstr "" + +#: builtin/log.c:1070 +msgid "print patches to standard out" +msgstr "" + +#: builtin/log.c:1072 +msgid "generate a cover letter" +msgstr "" + +#: builtin/log.c:1074 +msgid "use simple number sequence for output file names" +msgstr "" + +#: builtin/log.c:1075 +msgid "sfx" +msgstr "" + +#: builtin/log.c:1076 +msgid "use instead of '.patch'" +msgstr "" + +#: builtin/log.c:1078 +msgid "start numbering patches at instead of 1" +msgstr "" + +#: builtin/log.c:1080 +msgid "Use [] instead of [PATCH]" +msgstr "" + +#: builtin/log.c:1083 +msgid "store resulting files in " +msgstr "" + +#: builtin/log.c:1086 +msgid "don't strip/add [PATCH]" +msgstr "" + +#: builtin/log.c:1089 +msgid "don't output binary diffs" +msgstr "" + +#: builtin/log.c:1091 +msgid "don't include a patch matching a commit upstream" +msgstr "" + +#: builtin/log.c:1093 +msgid "show patch format instead of default (patch + stat)" +msgstr "" + +#: builtin/log.c:1095 +msgid "Messaging" +msgstr "" + +#: builtin/log.c:1096 +msgid "header" +msgstr "" + +#: builtin/log.c:1097 +msgid "add email header" +msgstr "" + +#: builtin/log.c:1098 builtin/log.c:1100 +msgid "email" +msgstr "" + +#: builtin/log.c:1098 +msgid "add To: header" +msgstr "" + +#: builtin/log.c:1100 +msgid "add Cc: header" +msgstr "" + +#: builtin/log.c:1102 +msgid "message-id" +msgstr "" + +#: builtin/log.c:1103 +msgid "make first mail a reply to " +msgstr "" + +#: builtin/log.c:1104 builtin/log.c:1107 +msgid "boundary" +msgstr "" + +#: builtin/log.c:1105 +msgid "attach the patch" +msgstr "" + +#: builtin/log.c:1108 +msgid "inline the patch" +msgstr "" + +#: builtin/log.c:1112 +msgid "enable message threading, styles: shallow, deep" +msgstr "" + +#: builtin/log.c:1114 +msgid "signature" +msgstr "" + +#: builtin/log.c:1115 +msgid "add a signature" +msgstr "" + +#: builtin/log.c:1117 +msgid "don't print the patch filenames" +msgstr "" + +#: builtin/log.c:1157 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1202 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1204 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1212 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1214 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1216 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1239 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1241 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1394 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1443 +msgid "git cherry [-v] [ [ []]]" +msgstr "" + +#: builtin/log.c:1498 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify manually.\n" +msgstr "" + +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/ls-files.c:408 +msgid "git ls-files [options] [...]" +msgstr "" + +#: builtin/ls-files.c:463 +msgid "identify the file status with tags" +msgstr "" + +#: builtin/ls-files.c:465 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "" + +#: builtin/ls-files.c:467 +msgid "show cached files in the output (default)" +msgstr "" + +#: builtin/ls-files.c:469 +msgid "show deleted files in the output" +msgstr "" + +#: builtin/ls-files.c:471 +msgid "show modified files in the output" +msgstr "" + +#: builtin/ls-files.c:473 +msgid "show other files in the output" +msgstr "" + +#: builtin/ls-files.c:475 +msgid "show ignored files in the output" +msgstr "" + +#: builtin/ls-files.c:478 +msgid "show staged contents' object name in the output" +msgstr "" + +#: builtin/ls-files.c:480 +msgid "show files on the filesystem that need to be removed" +msgstr "" + +#: builtin/ls-files.c:482 +msgid "show 'other' directories' name only" +msgstr "" + +#: builtin/ls-files.c:485 +msgid "don't show empty directories" +msgstr "" + +#: builtin/ls-files.c:488 +msgid "show unmerged files in the output" +msgstr "" + +#: builtin/ls-files.c:490 +msgid "show resolve-undo information" +msgstr "" + +#: builtin/ls-files.c:492 +msgid "skip files matching pattern" +msgstr "" + +#: builtin/ls-files.c:495 +msgid "exclude patterns are read from " +msgstr "" + +#: builtin/ls-files.c:498 +msgid "read additional per-directory exclude patterns in " +msgstr "" + +#: builtin/ls-files.c:500 +msgid "add the standard git exclusions" +msgstr "" + +#: builtin/ls-files.c:503 +msgid "make the output relative to the project top directory" +msgstr "" + +#: builtin/ls-files.c:506 +msgid "if any is not in the index, treat this as an error" +msgstr "" + +#: builtin/ls-files.c:507 +msgid "tree-ish" +msgstr "" + +#: builtin/ls-files.c:508 +msgid "pretend that paths removed since are still present" +msgstr "" + +#: builtin/ls-files.c:510 +msgid "show debugging data" +msgstr "" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [] [...]" +msgstr "" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "" + +#: builtin/ls-tree.c:142 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "" + +#: builtin/merge.c:43 +msgid "git merge [options] [...]" +msgstr "" + +#: builtin/merge.c:44 +msgid "git merge [options] HEAD " +msgstr "" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "" + +#: builtin/merge.c:90 +msgid "switch `m' requires a value" +msgstr "" + +#: builtin/merge.c:127 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:128 +#, c-format +msgid "Available strategies are:" +msgstr "" + +#: builtin/merge.c:133 +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +#: builtin/merge.c:183 +msgid "do not show a diffstat at the end of the merge" +msgstr "" + +#: builtin/merge.c:186 +msgid "show a diffstat at the end of the merge" +msgstr "" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "" + +#: builtin/merge.c:189 +msgid "add (at most ) entries from shortlog to merge commit message" +msgstr "" + +#: builtin/merge.c:192 +msgid "create a single commit instead of doing a merge" +msgstr "" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "" + +#: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112 +msgid "strategy" +msgstr "" + +#: builtin/merge.c:203 +msgid "merge strategy to use" +msgstr "" + +#: builtin/merge.c:204 +msgid "option=value" +msgstr "" + +#: builtin/merge.c:205 +msgid "option for selected merge strategy" +msgstr "" + +#: builtin/merge.c:207 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "" + +#: builtin/merge.c:211 +msgid "abort the current in-progress merge" +msgstr "" + +#: builtin/merge.c:240 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:245 +msgid "stash failed" +msgstr "" + +#: builtin/merge.c:250 +#, c-format +msgid "not a valid object: %s" +msgstr "" + +#: builtin/merge.c:269 builtin/merge.c:286 +msgid "read-tree failed" +msgstr "" + +#: builtin/merge.c:316 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:329 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:361 +msgid "Writing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:436 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:535 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:628 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:678 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:709 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:723 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:737 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:876 +#, c-format +msgid "Could not read from '%s'" +msgstr "" + +#: builtin/merge.c:885 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" + +#: builtin/merge.c:891 +msgid "" +"Please enter a commit message to explain why this merge is necessary,\n" +"especially if it merges an updated upstream into a topic branch.\n" +"\n" +"Lines starting with '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" + +#: builtin/merge.c:915 +msgid "Empty commit message." +msgstr "" + +#: builtin/merge.c:927 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:992 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:1008 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:1049 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:1051 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:1053 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1058 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1145 builtin/merge.c:1302 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1213 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1229 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:1232 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1236 +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:1239 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1248 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:1253 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:1260 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" + +#: builtin/merge.c:1292 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1295 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1297 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1412 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1450 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1457 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1489 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1512 builtin/merge.c:1591 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1516 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1582 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1584 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1593 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1605 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" + +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] ..." +msgstr "" + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus ..." +msgstr "" + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent ..." +msgstr "" + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor " +msgstr "" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " +"file2" +msgstr "" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig_file/file2" +msgstr "" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "" + +#: builtin/mv.c:14 +msgid "git mv [options] ... " +msgstr "" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "" + +#: builtin/mv.c:108 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "" + +#: builtin/mv.c:112 +msgid "bad source" +msgstr "" + +#: builtin/mv.c:115 +msgid "can not move directory into itself" +msgstr "" + +#: builtin/mv.c:118 +msgid "cannot move directory over file" +msgstr "" + +#: builtin/mv.c:128 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "" + +#: builtin/mv.c:140 +msgid "source directory is empty" +msgstr "" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "" + +#: builtin/mv.c:202 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "" + +#: builtin/mv.c:215 builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "" + +#: builtin/name-rev.c:175 +msgid "git name-rev [options] ..." +msgstr "" + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "" + +#: builtin/name-rev.c:232 +msgid "only use refs matching " +msgstr "" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" +msgstr "" + +#: builtin/name-rev.c:235 +msgid "read from stdin" +msgstr "" + +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "" + +#: builtin/notes.c:23 +msgid "git notes [--ref ] [list []]" +msgstr "" + +#: builtin/notes.c:24 +msgid "" +"git notes [--ref ] add [-f] [-m | -F | (-c | -C) " +"] []" +msgstr "" + +#: builtin/notes.c:25 +msgid "git notes [--ref ] copy [-f] " +msgstr "" + +#: builtin/notes.c:26 +msgid "" +"git notes [--ref ] append [-m | -F | (-c | -C) " +"] []" +msgstr "" + +#: builtin/notes.c:27 +msgid "git notes [--ref ] edit []" +msgstr "" + +#: builtin/notes.c:28 +msgid "git notes [--ref ] show []" +msgstr "" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref ] merge [-v | -q] [-s ] " +msgstr "" + +#: builtin/notes.c:30 +msgid "git notes merge --commit [-v | -q]" +msgstr "" + +#: builtin/notes.c:31 +msgid "git notes merge --abort [-v | -q]" +msgstr "" + +#: builtin/notes.c:32 +msgid "git notes [--ref ] remove [...]" +msgstr "" + +#: builtin/notes.c:33 +msgid "git notes [--ref ] prune [-n | -v]" +msgstr "" + +#: builtin/notes.c:34 +msgid "git notes [--ref ] get-ref" +msgstr "" + +#: builtin/notes.c:39 +msgid "git notes [list []]" +msgstr "" + +#: builtin/notes.c:44 +msgid "git notes add [] []" +msgstr "" + +#: builtin/notes.c:49 +msgid "git notes copy [] " +msgstr "" + +#: builtin/notes.c:50 +msgid "git notes copy --stdin [ ]..." +msgstr "" + +#: builtin/notes.c:55 +msgid "git notes append [] []" +msgstr "" + +#: builtin/notes.c:60 +msgid "git notes edit []" +msgstr "" + +#: builtin/notes.c:65 +msgid "git notes show []" +msgstr "" + +#: builtin/notes.c:70 +msgid "git notes merge [] " +msgstr "" + +#: builtin/notes.c:71 +msgid "git notes merge --commit []" +msgstr "" + +#: builtin/notes.c:72 +msgid "git notes merge --abort []" +msgstr "" + +#: builtin/notes.c:77 +msgid "git notes remove []" +msgstr "" + +#: builtin/notes.c:82 +msgid "git notes prune []" +msgstr "" + +#: builtin/notes.c:87 +msgid "git notes get-ref" +msgstr "" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:175 builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:210 builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:251 builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "" + +#: builtin/notes.c:253 builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "" + +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:350 +#, 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:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:456 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 -#: builtin/notes.c:1033 -msgid "too many parameters" +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 +#: builtin/notes.c:1033 +msgid "too many parameters" +msgstr "" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "" + +#: builtin/notes.c:535 builtin/notes.c:692 +msgid "note contents as a string" +msgstr "" + +#: builtin/notes.c:538 builtin/notes.c:695 +msgid "note contents in a file" +msgstr "" + +#: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697 +#: builtin/notes.c:700 builtin/tag.c:476 +msgid "object" +msgstr "" + +#: builtin/notes.c:541 builtin/notes.c:698 +msgid "reuse and edit specified note object" +msgstr "" + +#: builtin/notes.c:544 builtin/notes.c:701 +msgid "reuse specified note object" +msgstr "" + +#: builtin/notes.c:546 builtin/notes.c:614 +msgid "replace existing notes" +msgstr "" + +#: builtin/notes.c:580 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:585 builtin/notes.c:662 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:615 +msgid "read objects from stdin" +msgstr "" + +#: builtin/notes.c:617 +msgid "load rewriting config for (implies --stdin)" +msgstr "" + +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:656 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:717 +#, 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:864 +msgid "General options" +msgstr "" + +#: builtin/notes.c:866 +msgid "Merge options" +msgstr "" + +#: builtin/notes.c:868 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" + +#: builtin/notes.c:870 +msgid "Committing unmerged notes" +msgstr "" + +#: builtin/notes.c:872 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" + +#: builtin/notes.c:874 +msgid "Aborting notes merge resolution" +msgstr "" + +#: builtin/notes.c:876 +msgid "abort notes merge" +msgstr "" + +#: builtin/notes.c:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:983 +msgid "attempt to remove non-existent note is not an error" +msgstr "" + +#: builtin/notes.c:986 +msgid "read object names from the standard input" +msgstr "" + +#: builtin/notes.c:1067 +msgid "notes_ref" +msgstr "" + +#: builtin/notes.c:1068 +msgid "use notes from " +msgstr "" + +#: builtin/notes.c:1103 builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "" + +#: builtin/pack-objects.c:183 builtin/pack-objects.c:186 +#, c-format +msgid "deflate error (%d)" +msgstr "" + +#: builtin/pack-objects.c:2398 +#, c-format +msgid "unsupported index version %s" +msgstr "" + +#: builtin/pack-objects.c:2402 +#, c-format +msgid "bad index version '%s'" +msgstr "" + +#: builtin/pack-objects.c:2425 +#, c-format +msgid "option %s does not accept negative form" +msgstr "" + +#: builtin/pack-objects.c:2429 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "" + +#: builtin/pack-objects.c:2448 +msgid "do not show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2450 +msgid "show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2452 +msgid "show progress meter during object writing phase" +msgstr "" + +#: builtin/pack-objects.c:2455 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +#: builtin/pack-objects.c:2456 +msgid "version[,offset]" +msgstr "" + +#: builtin/pack-objects.c:2457 +msgid "write the pack index file in the specified idx format version" +msgstr "" + +#: builtin/pack-objects.c:2460 +msgid "maximum size of each output pack file" +msgstr "" + +#: builtin/pack-objects.c:2462 +msgid "ignore borrowed objects from alternate object store" +msgstr "" + +#: builtin/pack-objects.c:2464 +msgid "ignore packed objects" +msgstr "" + +#: builtin/pack-objects.c:2466 +msgid "limit pack window by objects" +msgstr "" + +#: builtin/pack-objects.c:2468 +msgid "limit pack window by memory in addition to object limit" +msgstr "" + +#: builtin/pack-objects.c:2470 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "" + +#: builtin/pack-objects.c:2472 +msgid "reuse existing deltas" +msgstr "" + +#: builtin/pack-objects.c:2474 +msgid "reuse existing objects" +msgstr "" + +#: builtin/pack-objects.c:2476 +msgid "use OFS_DELTA objects" +msgstr "" + +#: builtin/pack-objects.c:2478 +msgid "use threads when searching for best delta matches" +msgstr "" + +#: builtin/pack-objects.c:2480 +msgid "do not create an empty pack output" +msgstr "" + +#: builtin/pack-objects.c:2482 +msgid "read revision arguments from standard input" +msgstr "" + +#: builtin/pack-objects.c:2484 +msgid "limit the objects to those that are not yet packed" +msgstr "" + +#: builtin/pack-objects.c:2487 +msgid "include objects reachable from any reference" +msgstr "" + +#: builtin/pack-objects.c:2490 +msgid "include objects referred by reflog entries" +msgstr "" + +#: builtin/pack-objects.c:2493 +msgid "output pack to stdout" +msgstr "" + +#: builtin/pack-objects.c:2495 +msgid "include tag objects that refer to objects to be packed" +msgstr "" + +#: builtin/pack-objects.c:2497 +msgid "keep unreachable objects" +msgstr "" + +#: builtin/pack-objects.c:2498 parse-options.h:141 +msgid "time" +msgstr "" + +#: builtin/pack-objects.c:2499 +msgid "unpack unreachable objects newer than