diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/TEAMS | 10 | ||||
| -rw-r--r-- | po/bg.po | 10404 | ||||
| -rw-r--r-- | po/da.po | 3503 | ||||
| -rw-r--r-- | po/de.po | 1810 | ||||
| -rw-r--r-- | po/fr.po | 1823 | ||||
| -rw-r--r-- | po/git.pot | 1719 | ||||
| -rw-r--r-- | po/nl.po | 3493 | ||||
| -rw-r--r-- | po/sv.po | 1774 | ||||
| -rw-r--r-- | po/vi.po | 2482 | ||||
| -rw-r--r-- | po/zh_CN.po | 1856 |
10 files changed, 16480 insertions, 12394 deletions
@@ -1,9 +1,9 @@ Core Git translation language teams (please keep the list sorted alphabetically on language field) -Language: da (Danish) -Repository: https://github.com/git-da/git-po/ -Leader: Byrial Jensen <byrial@vip.cybercity.dk> +Language: bg (Bulgarian) +Repository: https://github.com/git-l10n/git-po +Leader: Alexander Shopov <ash@kambanaria.org> Language: de (German) Repository: https://github.com/ralfth/git-po-de @@ -25,10 +25,6 @@ Repository: https://github.com/quizzlo/git-po-it/ Leader: Marco Paolone <marcopaolone AT gmail.com> Members: Stefano Lattarini <stefano.lattarini AT gmail.com> -Language: nl (Dutch) -Repository: https://github.com/vfr-nl/git-po/ -Leader: Vincent van Ravesteijn <vfr@lyx.org> - Language: pt_PT (Portuguese - Portugal) Repository: https://github.com/marcomsousa/git-l10n-pt_PT/ Leader: Marco Sousa <marcomsousa AT gmail.com> diff --git a/po/bg.po b/po/bg.po new file mode 100644 index 0000000000..fb450b2414 --- /dev/null +++ b/po/bg.po @@ -0,0 +1,10404 @@ +# Bulgarian translation of git po-file. +# Copyright (C) 2014 Alexander Shopov <ash@kambanaria.org>. +# This file is distributed under the same license as the git package. +# Alexander Shopov <ash@kambanaria.org>, 2014. +# +# ======================== +# DICTIONARY TO MERGE IN GIT GUI +# ------------------------ +# range интервал +# unreachable object недостижим обект +# dangling objects обект извън клон +# fast-forward тривиално сливане +# stale remote старо хранилище +# rebase пребазирам +# force (push) принудително изтласквам +# stash/index индекс +# ======================== +# RECHECK +# ------------------------ +# HEAD as a reference vs head of a branch +# +# ======================== +# GENERATE STATS +# ------------------------ +# grep ^#: bg.po | cut -c4- |tr ' ' '\n'| sed -e 's/:[0-9][0-9]*//' -e 's%.*/%%' -e 's/[.][^.]*$//' > OUT +# sort -u OUT > UNIQUE +# for i in `cat UNIQUE`; do echo `grep "^$i$" OUT | wc -l` $i ; done | sort -nr > STATS +# ======================== +# DONE strings +# ------------------------ +# 222 +# ======================== +# REMAINING strings +# ------------------------ +# 1988 +# ======================== +# DONE alphabetical ordering +# ------------------------ +# +# advice, fsck, gc, help, parse-options, reflog, remote, rm, run-command +# +# ======================== +# REMAINING alphabetical ordering +# ------------------------ +# +# add, apply, archive, attr, bisect--helper, blame, branch, bundle, cat-file, check-attr, check-ignore, check-mailmap, +# checkout, checkout-index, clean, clone, column, commit, common-cmds, config, connected, count-objects, date, describe, +# diff, diffcore-order, fast-export, fetch, fmt-merge-msg, for-each-ref, git, git-am, git-bisect, git-pull, git-rebase, +# git-stash, git-submodule, gpg-interface, grep, hash-object, index-pack, init-db, log, ls-files, ls-tree, merge, +# merge-base, merge-file, merge-recursive, mktree, mv, name-rev, notes, notes-utils, object, obstack, pack-objects, +# pack-refs, pathspec, precompose_utf8, prune, prune-packed, push, read-tree, repack, replace, rerere, reset, revert, +# rev-parse, sequencer, sha1_name, shortlog, show-branch, show-ref, submodule, symbolic-ref, tag, update-index, +# update-ref, update-server-info, urlmatch, verify-pack, verify-tag, wrapper, write-tree, wt-status +# +# +# ======================== +# MOST IMPORTANT strings ordering +# ------------------------ +# 144 [remote] 68 fetch 28 blame 16 [parse-options] +# 137 commit 64 grep 27 git-rebase 12 [gc] +# 115 branch 46 push 24 revert 12 [fsck] +# 102 wt-status 38 add 21 common-cmds 3 reflog +# 78 checkout 34 config 21 [rm] +# 77 log 33 reset 21 mv +# 69 clone 29 git-stash 13 diff +# +# ======================== +# WHOLE STATISTICS strings ordering +# ------------------------ +# 144 remote 54 git-submodule 27 ls-files 12 pathspec 8 replace 3 prune-packed +# 137 commit 48 push 27 git-rebase 12 name-rev 8 git-pull 3 pack-refs +# 115 branch 41 help 24 revert 12 gc 8 fmt-merge-msg 3 count-objects +# 111 apply 40 pack-objects 24 mv 12 fsck 7 symbolic-ref 3 connected +# 102 wt-status 39 init-db 21 rm 12 checkout-index 6 gpg-interface 3 bisect--helper +# 100 notes 38 add 21 common-cmds 11 date 6 check-attr 2 verify-tag +# 97 merge 35 archive 19 show-branch 11 column 5 write-tree 2 update-server-info +# 78 checkout 34 config 19 read-tree 10 urlmatch 5 sha1_name 2 run-command +# 77 log 33 reset 19 bundle 10 shortlog 5 rev-parse 2 rerere +# 69 clone 32 clean 17 repack 10 merge-file 5 prune 2 obstack +# 68 index-pack 30 git-am 16 parse-options 10 merge-base 4 wrapper 2 advice +# 68 fetch 30 describe 14 submodule 10 ls-tree 4 notes-utils 1 precompose_utf8 +# 64 grep 29 git-stash 14 show-ref 10 hash-object 4 mktree 1 object +# 58 tag 29 git-bisect 14 fast-export 10 for-each-ref 4 check-mailmap 1 git +# 56 sequencer 28 update-index 13 diff 10 cat-file 3 verify-pack 1 diffcore-order +# 55 merge-recursive 28 blame 13 check-ignore 9 update-ref 3 reflog 1 attr +msgid "" +msgstr "" +"Project-Id-Version: git master\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2014-01-18 07:42+0800\n" +"PO-Revision-Date: 2014-01-28 19:05+0200\n" +"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" +"Language-Team: Bulgarian <dict@fsa-bg.org>\n" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: advice.c:57 +#, c-format +msgid "hint: %.*s\n" +msgstr "Подсказка: %.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:87 +msgid "" +"Fix them up in the work tree,\n" +"and then use 'git add/rm <file>' as\n" +"appropriate to mark resolution and make a commit,\n" +"or use 'git commit -a'." +msgstr "" +"Редактирайте ги в работното дърво,\n" +"и тогава ползвайте „git add/rm <file>“,\n" +"за да отбележите коригирането им и ги\n" +"подадете или просто ползвайте „git commit -a“." + +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "" + +#: archive.c:11 +msgid "git archive --list" +msgstr "" + +#: archive.c:12 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +msgstr "" + +#: archive.c:13 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "" + +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "пътят „%s“ не съвпада с никой файл" + +#: archive.c:327 +msgid "fmt" +msgstr "" + +#: archive.c:327 +msgid "archive format" +msgstr "" + +#: archive.c:328 builtin/log.c:1193 +msgid "prefix" +msgstr "" + +#: archive.c:329 +msgid "prepend prefix to each pathname in the archive" +msgstr "" + +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 +#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 +#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 +msgid "file" +msgstr "файл" + +#: archive.c:331 builtin/archive.c:89 +msgid "write the archive to this file" +msgstr "" + +#: archive.c:333 +msgid "read .gitattributes in working directory" +msgstr "" + +#: archive.c:334 +msgid "report archived files on stderr" +msgstr "" + +#: archive.c:335 +msgid "store only" +msgstr "" + +#: archive.c:336 +msgid "compress faster" +msgstr "" + +#: archive.c:344 +msgid "compress better" +msgstr "" + +#: archive.c:347 +msgid "list supported archive formats" +msgstr "" + +#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84 +msgid "repo" +msgstr "" + +#: archive.c:350 builtin/archive.c:91 +msgid "retrieve the archive from remote repository <repo>" +msgstr "" + +#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487 +msgid "command" +msgstr "" + +#: archive.c:352 builtin/archive.c:93 +msgid "path to the remote git-upload-archive command" +msgstr "" + +#: attr.c:259 +msgid "" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" + +#: branch.c:60 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "" + +#: branch.c:82 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgstr "" + +#: branch.c:83 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s." +msgstr "" + +#: branch.c:87 +#, c-format +msgid "Branch %s set up to track local branch %s by rebasing." +msgstr "" + +#: branch.c:88 +#, c-format +msgid "Branch %s set up to track local branch %s." +msgstr "" + +#: branch.c:92 +#, c-format +msgid "Branch %s set up to track remote ref %s by rebasing." +msgstr "" + +#: branch.c:93 +#, c-format +msgid "Branch %s set up to track remote ref %s." +msgstr "" + +#: branch.c:97 +#, c-format +msgid "Branch %s set up to track local ref %s by rebasing." +msgstr "" + +#: branch.c:98 +#, c-format +msgid "Branch %s set up to track local ref %s." +msgstr "" + +#: branch.c:118 +#, c-format +msgid "Tracking not set up: name too long: %s" +msgstr "" + +#: branch.c:137 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "" + +#: branch.c:182 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "" + +#: branch.c:187 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "" + +#: branch.c:195 +msgid "Cannot force update the current branch." +msgstr "" + +#: branch.c:215 +#, c-format +msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "" + +#: branch.c:217 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "" + +#: branch.c:219 +msgid "" +"\n" +"If you are planning on basing your work on an upstream\n" +"branch that already exists at the remote, you may need to\n" +"run \"git fetch\" to retrieve it.\n" +"\n" +"If you are planning to push out a new local branch that\n" +"will track its remote counterpart, you may want to use\n" +"\"git push -u\" to set the upstream config as you push." +msgstr "" + +#: branch.c:264 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "" + +#: branch.c:284 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "" + +#: branch.c:289 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "" + +#: branch.c:295 +msgid "Failed to lock ref for update" +msgstr "" + +#: branch.c:313 +msgid "Failed to write ref" +msgstr "" + +#: bundle.c:37 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "" + +#: bundle.c:64 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "" + +#: bundle.c:90 builtin/commit.c:706 +#, c-format +msgid "could not open '%s'" +msgstr "" + +#: bundle.c:141 +msgid "Repository lacks these prerequisite commits:" +msgstr "" + +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 +#: builtin/shortlog.c:158 +msgid "revision walk setup failed" +msgstr "" + +#: bundle.c:187 +#, c-format +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %d refs:" +msgstr[0] "" +msgstr[1] "" + +#: bundle.c:194 +msgid "The bundle records a complete history." +msgstr "" + +#: bundle.c:196 +#, c-format +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %d refs:" +msgstr[0] "" +msgstr[1] "" + +#: bundle.c:296 +msgid "rev-list died" +msgstr "" + +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +#: bundle.c:337 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "" + +#: bundle.c:382 +msgid "Refusing to create empty bundle." +msgstr "" + +#: bundle.c:398 +msgid "Could not spawn pack-objects" +msgstr "" + +#: bundle.c:416 +msgid "pack-objects died" +msgstr "" + +#: bundle.c:419 +#, c-format +msgid "cannot create '%s'" +msgstr "" + +#: bundle.c:441 +msgid "index-pack died" +msgstr "" + +#: commit.c:53 +#, c-format +msgid "could not parse %s" +msgstr "" + +#: commit.c:55 +#, c-format +msgid "%s %s is not a commit!" +msgstr "" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "" + +#: connected.c:70 +msgid "Could not run 'git rev-list'" +msgstr "" + +#: connected.c:90 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "" + +#: connected.c:98 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "" + +#: date.c:95 +msgid "in the future" +msgstr "" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "" +msgstr[1] "" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "" +msgstr[1] "" + +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "" + +#: diff.c:113 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr "" + +#: diff.c:118 +#, c-format +msgid " Unknown dirstat parameter '%s'\n" +msgstr "" + +#: diff.c:213 +#, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "" + +#: diff.c:263 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" + +#: diff.c:3509 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: diff.c:3523 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "" + +#: gpg-interface.c:59 gpg-interface.c:131 +msgid "could not run gpg." +msgstr "" + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "" + +#: gpg-interface.c:115 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "" + +#: gpg-interface.c:118 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "" + +#: grep.c:1695 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: grep.c:1712 +#, c-format +msgid "'%s': %s" +msgstr "" + +#: grep.c:1723 +#, c-format +msgid "'%s': short read %s" +msgstr "" + +#: help.c:210 +#, c-format +msgid "available git commands in '%s'" +msgstr "налични команди на git от „%s“" + +#: help.c:217 +msgid "git commands available from elsewhere on your $PATH" +msgstr "команди на git от други директории от пътя „$PATH“" + +#: help.c:233 +msgid "The most commonly used git commands are:" +msgstr "Най-често употребяваните команди на git са:" + +#: help.c:290 +#, c-format +msgid "" +"'%s' appears to be a git command, but we were not\n" +"able to execute it. Maybe git-%s is broken?" +msgstr "" +"Изглежда, че „%s“ е команда на git, но тя не може да\n" +"бъде изпълнена. Вероятно пакетът „git-%s“ е повреден." + +#: help.c:347 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Странно, изглежда, че на системата ви няма нито една команда на git." + +#: help.c:369 +#, c-format +msgid "" +"WARNING: You called a Git command named '%s', which does not exist.\n" +"Continuing under the assumption that you meant '%s'" +msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава " +"не\n" +"съществува. Изпълнението автоматично продължава, като се счита, че имате " +"предвид „%s“" + +#: help.c:374 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "след %0.1f секунди…" + +#: help.c:381 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: „%s“ не е команда на git. Вижте изхода от „git --help“." + +#: help.c:385 help.c:444 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"Команда с подобно име е:" +msgstr[1] "" +"\n" +"Команди с подобно име са:" + +#: help.c:440 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s — %s" + +#: merge.c:56 +msgid "failed to read the cache" +msgstr "" + +#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 +#: builtin/clone.c:661 +msgid "unable to write new index file" +msgstr "" + +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "" + +#: merge-recursive.c:269 +msgid "error building trees" +msgstr "" + +#: merge-recursive.c:673 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "" + +#: merge-recursive.c:684 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "" + +#. something else exists +#. .. but not some other error (who really cares what?) +#: merge-recursive.c:698 merge-recursive.c:719 +msgid ": perhaps a D/F conflict?" +msgstr "" + +#: merge-recursive.c:709 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "" + +#: merge-recursive.c:749 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "" + +#: merge-recursive.c:751 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "" + +#: merge-recursive.c:774 builtin/clone.c:317 +#, c-format +msgid "failed to open '%s'" +msgstr "" + +#: merge-recursive.c:782 +#, c-format +msgid "failed to symlink '%s'" +msgstr "" + +#: merge-recursive.c:785 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "" + +#: merge-recursive.c:923 +msgid "Failed to execute internal merge" +msgstr "" + +#: merge-recursive.c:927 +#, c-format +msgid "Unable to add %s to database" +msgstr "" + +#: merge-recursive.c:943 +msgid "unsupported object type in the tree" +msgstr "" + +#: merge-recursive.c:1022 merge-recursive.c:1036 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" + +#: merge-recursive.c:1028 merge-recursive.c:1041 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" + +#: merge-recursive.c:1082 +msgid "rename" +msgstr "" + +#: merge-recursive.c:1082 wt-status.c:283 +msgid "renamed" +msgstr "" + +#: merge-recursive.c:1138 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "" + +#: merge-recursive.c:1160 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" + +#: merge-recursive.c:1165 +msgid " (left unresolved)" +msgstr "" + +#: merge-recursive.c:1219 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "" + +#: merge-recursive.c:1249 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "" + +#: merge-recursive.c:1448 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "" + +#: merge-recursive.c:1458 +#, c-format +msgid "Adding merged %s" +msgstr "" + +#: merge-recursive.c:1463 merge-recursive.c:1661 +#, c-format +msgid "Adding as %s instead" +msgstr "" + +#: merge-recursive.c:1514 +#, c-format +msgid "cannot read object %s" +msgstr "" + +#: merge-recursive.c:1517 +#, c-format +msgid "object %s is not a blob" +msgstr "" + +#: merge-recursive.c:1565 +msgid "modify" +msgstr "" + +#: merge-recursive.c:1565 wt-status.c:281 +msgid "modified" +msgstr "" + +#: merge-recursive.c:1575 +msgid "content" +msgstr "" + +#: merge-recursive.c:1582 +msgid "add/add" +msgstr "" + +#: merge-recursive.c:1616 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "" + +#: merge-recursive.c:1630 +#, c-format +msgid "Auto-merging %s" +msgstr "" + +#: merge-recursive.c:1634 git-submodule.sh:1148 +msgid "submodule" +msgstr "" + +#: merge-recursive.c:1635 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "" + +#: merge-recursive.c:1725 +#, c-format +msgid "Removing %s" +msgstr "" + +#: merge-recursive.c:1750 +msgid "file/directory" +msgstr "" + +#: merge-recursive.c:1756 +msgid "directory/file" +msgstr "" + +#: merge-recursive.c:1761 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "" + +#: merge-recursive.c:1771 +#, c-format +msgid "Adding %s" +msgstr "" + +#: merge-recursive.c:1788 +msgid "Fatal merge failure, shouldn't happen." +msgstr "" + +#: merge-recursive.c:1807 +msgid "Already up-to-date!" +msgstr "" + +#: merge-recursive.c:1816 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "" + +#: merge-recursive.c:1846 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "" + +#: merge-recursive.c:1891 +msgid "Merging:" +msgstr "" + +#: merge-recursive.c:1904 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "" +msgstr[1] "" + +#: merge-recursive.c:1941 +msgid "merge returned no commit" +msgstr "" + +#: merge-recursive.c:1998 +#, c-format +msgid "Could not parse object '%s'" +msgstr "" + +#: merge-recursive.c:2010 builtin/merge.c:665 +msgid "Unable to write index." +msgstr "" + +#: notes-utils.c:40 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: notes-utils.c:81 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: notes-utils.c:91 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: notes-utils.c:118 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: object.c:202 +#, c-format +msgid "unable to parse object: %s" +msgstr "" + +#: parse-options.c:537 +msgid "..." +msgstr "…" + +#: parse-options.c:555 +#, c-format +msgid "usage: %s" +msgstr "употреба: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:559 +#, c-format +msgid " or: %s" +msgstr " или: %s" + +#: parse-options.c:562 +#, c-format +msgid " %s" +msgstr " %s" + +#: parse-options.c:596 +msgid "-NUM" +msgstr "-ЧИСЛО" + +#: pathspec.c:133 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "" + +#: pathspec.c:143 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "" + +#: pathspec.c:177 +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "" + +#: pathspec.c:183 +#, c-format +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "" + +#: pathspec.c:187 +#, c-format +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "" + +#: pathspec.c:205 +#, c-format +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "" + +#: pathspec.c:230 +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "" + +#: pathspec.c:241 +#, c-format +msgid "%s: '%s' is outside repository" +msgstr "" + +#: pathspec.c:291 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "" + +#. +#. * We may want to substitute "this command" with a command +#. * name. E.g. when add--interactive dies when running +#. * "checkout -p" +#. +#: pathspec.c:353 +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "" + +#: pathspec.c:433 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "" + +#: pathspec.c:442 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" + +#: remote.c:753 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“" + +#: remote.c:757 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "„%s“ обикновено следи „%s“, а не „%s“" + +#: remote.c:761 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "„%s“ следи както „%s“, така и „%s“" + +#. +#. * This last possibility doesn't occur because +#. * FETCH_HEAD_IGNORE entries always appear at +#. * the end of the list. +#. +#: remote.c:769 +msgid "Internal error" +msgstr "Вътрешна грешка" + +#: remote.c:1871 +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" + +#: remote.c:1875 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr " (за да коригирате това използвайте „git branch --unset-upstream“)\n" + +#: remote.c:1878 +#, c-format +msgid "Your branch is up-to-date with '%s'.\n" +msgstr "Клонът е актуализиран както „%s“.\n" + +#: remote.c:1882 +#, c-format +msgid "Your branch is ahead of '%s' by %d commit.\n" +msgid_plural "Your branch is ahead of '%s' by %d commits.\n" +msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n" +msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n" + +#: remote.c:1888 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (публикувайте локалните си промени чрез „git push“)\n" + +#: remote.c:1891 +#, c-format +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "" +"Клонът ви е с %2$d подаване след „%1$s“ и може да бъде тривиално слят.\n" +msgstr[1] "" +"Клонът ви е с %2$d подавания след „%1$s“ и може да бъде тривиално слят.\n" + +#: remote.c:1899 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " (обновете локалния си клон чрез „git pull“)\n" + +#: remote.c:1902 +#, c-format +msgid "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" +msgid_plural "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commits each, respectively.\n" +msgstr[0] "" +"Текущият клон се е отделил от „%s“,\n" +"двата имат съответно по %d и %d несъвпадащи подавания.\n" +msgstr[1] "" +"Текущият клон се е отделил от „%s“,\n" +"двата имат съответно по %d и %d несъвпадащи подавания.\n" + +#: remote.c:1912 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" + +#: run-command.c:80 +msgid "open /dev/null failed" +msgstr "неуспешно отваряне на „/dev/null“" + +#: run-command.c:82 +#, c-format +msgid "dup2(%d,%d) failed" +msgstr "неуспешно изпълнение на dup2(%d,%d)" + +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 +#: builtin/merge.c:1006 builtin/merge.c:1016 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "" + +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 +#: builtin/merge.c:1008 builtin/merge.c:1021 +#, c-format +msgid "Could not write to '%s'" +msgstr "" + +#: sequencer.c:229 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" + +#: sequencer.c:232 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'\n" +"and commit the result with 'git commit'" +msgstr "" + +#: sequencer.c:245 sequencer.c:870 sequencer.c:953 +#, c-format +msgid "Could not write to %s" +msgstr "" + +#: sequencer.c:248 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: sequencer.c:263 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "" + +#: sequencer.c:265 +msgid "Your local changes would be overwritten by revert." +msgstr "" + +#: sequencer.c:268 +msgid "Commit your changes or stash them to proceed." +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:325 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "" + +#: sequencer.c:356 +msgid "Could not resolve HEAD commit\n" +msgstr "" + +#: sequencer.c:378 +msgid "Unable to update cache tree\n" +msgstr "" + +#: sequencer.c:423 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "" + +#: sequencer.c:428 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "" + +#: sequencer.c:494 +msgid "Your index file is unmerged." +msgstr "" + +#: sequencer.c:513 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: sequencer.c:521 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: sequencer.c:525 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "" + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:538 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: sequencer.c:542 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "" + +#: sequencer.c:628 +#, c-format +msgid "could not revert %s... %s" +msgstr "" + +#: sequencer.c:629 +#, c-format +msgid "could not apply %s... %s" +msgstr "" + +#: sequencer.c:665 +msgid "empty commit set passed" +msgstr "" + +#: sequencer.c:673 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: sequencer.c:678 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "" + +#: sequencer.c:736 +#, c-format +msgid "Cannot %s during a %s" +msgstr "" + +#: sequencer.c:758 +#, c-format +msgid "Could not parse line %d." +msgstr "" + +#: sequencer.c:763 +msgid "No commits parsed." +msgstr "" + +#: sequencer.c:776 +#, c-format +msgid "Could not open %s" +msgstr "" + +#: sequencer.c:780 +#, c-format +msgid "Could not read %s." +msgstr "" + +#: sequencer.c:787 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "" + +#: sequencer.c:815 +#, c-format +msgid "Invalid key: %s" +msgstr "" + +#: sequencer.c:818 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "" + +#: sequencer.c:830 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "" + +#: sequencer.c:851 +msgid "a cherry-pick or revert is already in progress" +msgstr "" + +#: sequencer.c:852 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "" + +#: sequencer.c:856 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "" + +#: sequencer.c:872 sequencer.c:957 +#, c-format +msgid "Error wrapping up %s." +msgstr "" + +#: sequencer.c:891 sequencer.c:1025 +msgid "no cherry-pick or revert in progress" +msgstr "" + +#: sequencer.c:893 +msgid "cannot resolve HEAD" +msgstr "" + +#: sequencer.c:895 +msgid "cannot abort from a branch yet to be born" +msgstr "" + +#: sequencer.c:917 builtin/apply.c:4061 +#, c-format +msgid "cannot open %s: %s" +msgstr "" + +#: sequencer.c:920 +#, c-format +msgid "cannot read %s: %s" +msgstr "" + +#: sequencer.c:921 +msgid "unexpected end of file" +msgstr "" + +#: sequencer.c:927 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "" + +#: sequencer.c:950 +#, c-format +msgid "Could not format %s." +msgstr "" + +#: sequencer.c:1093 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "" + +#: sequencer.c:1096 +#, c-format +msgid "%s: bad revision" +msgstr "" + +#: sequencer.c:1130 +msgid "Can't revert as initial commit" +msgstr "" + +#: sequencer.c:1131 +msgid "Can't cherry-pick into empty head" +msgstr "" + +#: sha1_name.c:439 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" + +#: sha1_name.c:1109 +msgid "HEAD does not point to a branch" +msgstr "" + +#: sha1_name.c:1112 +#, c-format +msgid "No such branch: '%s'" +msgstr "" + +#: sha1_name.c:1114 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "" + +#: sha1_name.c:1118 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "" + +#: submodule.c:64 submodule.c:98 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +msgstr "" + +#: submodule.c:68 submodule.c:102 +#, c-format +msgid "Could not find section in .gitmodules where path=%s" +msgstr "" + +#. Maybe the user already did that, don't error out here +#: submodule.c:76 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "" + +#. Maybe the user already did that, don't error out here +#: submodule.c:109 +#, c-format +msgid "Could not remove .gitmodules entry for %s" +msgstr "" + +#: submodule.c:127 +msgid "could not find .gitmodules in index" +msgstr "" + +#: submodule.c:133 +msgid "reading updated .gitmodules failed" +msgstr "" + +#: submodule.c:135 +msgid "unable to stat updated .gitmodules" +msgstr "" + +#: submodule.c:139 +msgid "unable to remove .gitmodules from index" +msgstr "" + +#: submodule.c:141 +msgid "adding updated .gitmodules failed" +msgstr "" + +#: submodule.c:143 +msgid "staging updated .gitmodules failed" +msgstr "" + +#: submodule.c:1144 builtin/init-db.c:363 +#, c-format +msgid "Could not create git link %s" +msgstr "" + +#: submodule.c:1155 +#, c-format +msgid "Could not set core.worktree in %s" +msgstr "" + +#: urlmatch.c:120 +msgid "invalid URL scheme name or missing '://' suffix" +msgstr "" + +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#, c-format +msgid "invalid %XX escape sequence" +msgstr "" + +#: urlmatch.c:172 +msgid "missing host and scheme is not 'file:'" +msgstr "" + +#: urlmatch.c:189 +msgid "a 'file:' URL may not have a port number" +msgstr "" + +#: urlmatch.c:199 +msgid "invalid characters in host name" +msgstr "" + +#: urlmatch.c:244 urlmatch.c:255 +msgid "invalid port number" +msgstr "" + +#: urlmatch.c:322 +msgid "invalid '..' path segment" +msgstr "" + +#: wrapper.c:422 +#, c-format +msgid "unable to access '%s': %s" +msgstr "" + +#: wrapper.c:443 +#, c-format +msgid "unable to access '%s'" +msgstr "" + +#: wrapper.c:454 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "" + +#: wrapper.c:455 +msgid "no such user" +msgstr "" + +#: wt-status.c:150 +msgid "Unmerged paths:" +msgstr "" + +#: wt-status.c:177 wt-status.c:204 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:179 wt-status.c:206 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:183 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr "" + +#: wt-status.c:185 wt-status.c:189 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr "" + +#: wt-status.c:187 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr "" + +#: wt-status.c:198 +msgid "Changes to be committed:" +msgstr "" + +#: wt-status.c:216 +msgid "Changes not staged for commit:" +msgstr "" + +#: wt-status.c:220 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:222 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:223 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" + +#: wt-status.c:225 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" + +#: wt-status.c:237 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr "" + +#: wt-status.c:254 +msgid "bug" +msgstr "" + +#: wt-status.c:259 +msgid "both deleted:" +msgstr "" + +#: wt-status.c:260 +msgid "added by us:" +msgstr "" + +#: wt-status.c:261 +msgid "deleted by them:" +msgstr "" + +#: wt-status.c:262 +msgid "added by them:" +msgstr "" + +#: wt-status.c:263 +msgid "deleted by us:" +msgstr "" + +#: wt-status.c:264 +msgid "both added:" +msgstr "" + +#: wt-status.c:265 +msgid "both modified:" +msgstr "" + +#: wt-status.c:275 +msgid "new file" +msgstr "" + +#: wt-status.c:277 +msgid "copied" +msgstr "" + +#: wt-status.c:279 +msgid "deleted" +msgstr "" + +#: wt-status.c:285 +msgid "typechange" +msgstr "" + +#: wt-status.c:287 +msgid "unknown" +msgstr "" + +#: wt-status.c:289 +msgid "unmerged" +msgstr "" + +#: wt-status.c:336 +msgid "new commits, " +msgstr "" + +#: wt-status.c:338 +msgid "modified content, " +msgstr "" + +#: wt-status.c:340 +msgid "untracked content, " +msgstr "" + +#: wt-status.c:357 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "" + +#: wt-status.c:732 +msgid "Submodules changed but not updated:" +msgstr "" + +#: wt-status.c:734 +msgid "Submodule changes to be committed:" +msgstr "" + +#: wt-status.c:836 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" + +#: wt-status.c:899 +msgid "You have unmerged paths." +msgstr "" + +#: wt-status.c:902 +msgid " (fix conflicts and run \"git commit\")" +msgstr "" + +#: wt-status.c:905 +msgid "All conflicts fixed but you are still merging." +msgstr "" + +#: wt-status.c:908 +msgid " (use \"git commit\" to conclude merge)" +msgstr "" + +#: wt-status.c:918 +msgid "You are in the middle of an am session." +msgstr "" + +#: wt-status.c:921 +msgid "The current patch is empty." +msgstr "" + +#: wt-status.c:925 +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr "" + +#: wt-status.c:927 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:929 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr "" + +#: wt-status.c:989 wt-status.c:1006 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:994 wt-status.c:1011 +msgid "You are currently rebasing." +msgstr "" + +#: wt-status.c:997 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr "" + +#: wt-status.c:999 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:1001 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr "" + +#: wt-status.c:1014 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr "" + +#: wt-status.c:1018 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:1023 +msgid "You are currently splitting a commit during a rebase." +msgstr "" + +#: wt-status.c:1026 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr "" + +#: wt-status.c:1030 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:1035 +msgid "You are currently editing a commit during a rebase." +msgstr "" + +#: wt-status.c:1038 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr "" + +#: wt-status.c:1040 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr "" + +#: wt-status.c:1050 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "" + +#: wt-status.c:1055 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr "" + +#: wt-status.c:1058 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr "" + +#: wt-status.c:1060 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr "" + +#: wt-status.c:1069 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "" + +#: wt-status.c:1074 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr "" + +#: wt-status.c:1077 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr "" + +#: wt-status.c:1079 +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr "" + +#: wt-status.c:1090 +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "" + +#: wt-status.c:1094 +msgid "You are currently bisecting." +msgstr "" + +#: wt-status.c:1097 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr "" + +#: wt-status.c:1272 +msgid "On branch " +msgstr "" + +#: wt-status.c:1279 +msgid "rebase in progress; onto " +msgstr "" + +#: wt-status.c:1286 +msgid "HEAD detached at " +msgstr "" + +#: wt-status.c:1288 +msgid "HEAD detached from " +msgstr "" + +#: wt-status.c:1291 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:1308 +msgid "Initial commit" +msgstr "" + +#: wt-status.c:1322 +msgid "Untracked files" +msgstr "" + +#: wt-status.c:1324 +msgid "Ignored files" +msgstr "" + +#: wt-status.c:1328 +#, c-format +msgid "" +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +"may speed it up, but you have to be careful not to forget to add\n" +"new files yourself (see 'git help status')." +msgstr "" + +#: wt-status.c:1334 +#, c-format +msgid "Untracked files not listed%s" +msgstr "" + +#: wt-status.c:1336 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:1342 +msgid "No changes" +msgstr "" + +#: wt-status.c:1347 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "" + +#: wt-status.c:1350 +#, c-format +msgid "no changes added to commit\n" +msgstr "" + +#: wt-status.c:1353 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" + +#: wt-status.c:1356 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "" + +#: wt-status.c:1359 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "" + +#: wt-status.c:1362 wt-status.c:1367 +#, c-format +msgid "nothing to commit\n" +msgstr "" + +#: wt-status.c:1365 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "" + +#: wt-status.c:1369 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "" + +#: wt-status.c:1478 +msgid "HEAD (no branch)" +msgstr "" + +#: wt-status.c:1484 +msgid "Initial commit on " +msgstr "" + +#: wt-status.c:1514 +msgid "gone" +msgstr "" + +#: wt-status.c:1516 +msgid "behind " +msgstr "" + +#: wt-status.c:1519 wt-status.c:1522 +msgid "ahead " +msgstr "" + +#: wt-status.c:1524 +msgid ", behind " +msgstr "" + +#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "" + +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, the behavior can be changed +#. * to tree-wide, keeping the warning for a while, and +#. * eventually we can drop the warning. +#. +#: builtin/add.c:58 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory.\n" +msgstr "" + +#: builtin/add.c:100 +#, c-format +msgid "" +"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" +"whose behaviour will change in Git 2.0 with respect to paths you removed.\n" +"Paths like '%s' that are\n" +"removed from your working tree are ignored with this version of Git.\n" +"\n" +"* 'git add --ignore-removal <pathspec>', which is the current default,\n" +" ignores paths you removed from your working tree.\n" +"\n" +"* 'git add --all <pathspec>' will let you also record the removals.\n" +"\n" +"Run 'git status' to check the paths you removed from your working tree.\n" +msgstr "" + +#: builtin/add.c:144 +#, c-format +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:149 builtin/commit.c:260 +msgid "updating files failed" +msgstr "" + +#: builtin/add.c:163 +#, c-format +msgid "remove '%s'\n" +msgstr "" + +#: builtin/add.c:237 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:299 +msgid "Could not read the index" +msgstr "" + +#: builtin/add.c:310 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "" + +#: builtin/add.c:314 +msgid "Could not write patch" +msgstr "" + +#: builtin/add.c:319 +#, c-format +msgid "Could not stat '%s'" +msgstr "" + +#: builtin/add.c:321 +msgid "Empty patch. Aborted." +msgstr "" + +#: builtin/add.c:327 +#, c-format +msgid "Could not apply '%s'" +msgstr "" + +#: builtin/add.c:337 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 +#: builtin/rm.c:269 +msgid "dry run" +msgstr "пробно изпълнeние" + +#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 +#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 +msgid "be verbose" +msgstr "повече подробности" + +#: builtin/add.c:357 +msgid "interactive picking" +msgstr "" + +#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272 +msgid "select hunks interactively" +msgstr "" + +#: builtin/add.c:359 +msgid "edit current diff and apply" +msgstr "" + +#: builtin/add.c:360 +msgid "allow adding otherwise ignored files" +msgstr "" + +#: builtin/add.c:361 +msgid "update tracked files" +msgstr "" + +#: builtin/add.c:362 +msgid "record only the fact that the path will be added later" +msgstr "" + +#: builtin/add.c:363 +msgid "add changes from all tracked and untracked files" +msgstr "" + +#. takes no arguments +#: builtin/add.c:366 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "" + +#: builtin/add.c:368 +msgid "don't add, only refresh the index" +msgstr "" + +#: builtin/add.c:369 +msgid "just skip files which cannot be added because of errors" +msgstr "" + +#: builtin/add.c:370 +msgid "check if - even missing - files are ignored in dry run" +msgstr "" + +#: builtin/add.c:392 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "" + +#: builtin/add.c:393 +msgid "no files added" +msgstr "" + +#: builtin/add.c:399 +msgid "adding files failed" +msgstr "" + +#: builtin/add.c:438 +msgid "-A and -u are mutually incompatible" +msgstr "" + +#: builtin/add.c:456 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "" + +#: builtin/add.c:486 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:487 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "" + +#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 +msgid "index file corrupt" +msgstr "файлът с индекса е повреден" + +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 +msgid "Unable to write new index file" +msgstr "Новият файл с индекса не може да бъде записан" + +#: builtin/apply.c:57 +msgid "git apply [options] [<patch>...]" +msgstr "" + +#: builtin/apply.c:110 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "" + +#: builtin/apply.c:125 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "" + +#: builtin/apply.c:823 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "" + +#: builtin/apply.c:832 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "" + +#: builtin/apply.c:913 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "" + +#: builtin/apply.c:945 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" + +#: builtin/apply.c:950 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "" + +#: builtin/apply.c:957 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "" + +#: builtin/apply.c:1422 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "" + +#: builtin/apply.c:1479 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "" + +#: builtin/apply.c:1496 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:1656 +msgid "new file depends on old contents" +msgstr "" + +#: builtin/apply.c:1658 +msgid "deleted file still has contents" +msgstr "" + +#: builtin/apply.c:1684 +#, c-format +msgid "corrupt patch at line %d" +msgstr "" + +#: builtin/apply.c:1720 +#, c-format +msgid "new file %s depends on old contents" +msgstr "" + +#: builtin/apply.c:1722 +#, c-format +msgid "deleted file %s still has contents" +msgstr "" + +#: builtin/apply.c:1725 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "" + +#: builtin/apply.c:1871 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1900 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "" + +#: builtin/apply.c:1986 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "" + +#: builtin/apply.c:2076 +#, c-format +msgid "unable to read symlink %s" +msgstr "" + +#: builtin/apply.c:2080 +#, c-format +msgid "unable to open or read %s" +msgstr "" + +#: builtin/apply.c:2688 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "" + +#: builtin/apply.c:2806 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:2818 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "" + +#: builtin/apply.c:2824 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" + +#: builtin/apply.c:2843 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "" + +#: builtin/apply.c:2946 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "" + +#: builtin/apply.c:2952 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" + +#: builtin/apply.c:2973 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "" + +#: builtin/apply.c:3095 +#, c-format +msgid "cannot checkout %s" +msgstr "" + +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#, c-format +msgid "read of %s failed" +msgstr "" + +#: builtin/apply.c:3174 builtin/apply.c:3396 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "" + +#: builtin/apply.c:3255 builtin/apply.c:3410 +#, c-format +msgid "%s: does not exist in index" +msgstr "" + +#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#, c-format +msgid "%s: %s" +msgstr "" + +#: builtin/apply.c:3264 builtin/apply.c:3418 +#, c-format +msgid "%s: does not match index" +msgstr "" + +#: builtin/apply.c:3366 +msgid "removal patch leaves file contents" +msgstr "" + +#: builtin/apply.c:3435 +#, c-format +msgid "%s: wrong type" +msgstr "" + +#: builtin/apply.c:3437 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "" + +#: builtin/apply.c:3538 +#, c-format +msgid "%s: already exists in index" +msgstr "" + +#: builtin/apply.c:3541 +#, c-format +msgid "%s: already exists in working directory" +msgstr "" + +#: builtin/apply.c:3561 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "" + +#: builtin/apply.c:3566 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "" + +#: builtin/apply.c:3574 +#, c-format +msgid "%s: patch does not apply" +msgstr "" + +#: builtin/apply.c:3587 +#, c-format +msgid "Checking patch %s..." +msgstr "" + +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: builtin/apply.c:3823 +#, c-format +msgid "unable to remove %s from index" +msgstr "" + +#: builtin/apply.c:3851 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "" + +#: builtin/apply.c:3855 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "" + +#: builtin/apply.c:3860 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" + +#: builtin/apply.c:3863 builtin/apply.c:3971 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "" + +#: builtin/apply.c:3896 +#, c-format +msgid "closing file '%s'" +msgstr "" + +#: builtin/apply.c:3945 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "" + +#: builtin/apply.c:4032 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "" + +#: builtin/apply.c:4040 +msgid "internal error" +msgstr "" + +#. Say this even without --verbose +#: builtin/apply.c:4043 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:4053 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "" + +#: builtin/apply.c:4074 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "" + +#: builtin/apply.c:4077 +#, c-format +msgid "Rejected hunk #%d." +msgstr "" + +#: builtin/apply.c:4227 +msgid "unrecognized input" +msgstr "" + +#: builtin/apply.c:4238 +msgid "unable to read index file" +msgstr "" + +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 +#: builtin/fetch.c:78 +msgid "path" +msgstr "" + +#: builtin/apply.c:4358 +msgid "don't apply changes matching the given path" +msgstr "" + +#: builtin/apply.c:4361 +msgid "apply changes matching the given path" +msgstr "" + +#: builtin/apply.c:4363 +msgid "num" +msgstr "" + +#: builtin/apply.c:4364 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "" + +#: builtin/apply.c:4367 +msgid "ignore additions made by the patch" +msgstr "" + +#: builtin/apply.c:4369 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "" + +#: builtin/apply.c:4373 +msgid "show number of added and deleted lines in decimal notation" +msgstr "" + +#: builtin/apply.c:4375 +msgid "instead of applying the patch, output a summary for the input" +msgstr "" + +#: builtin/apply.c:4377 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "" + +#: builtin/apply.c:4379 +msgid "make sure the patch is applicable to the current index" +msgstr "" + +#: builtin/apply.c:4381 +msgid "apply a patch without touching the working tree" +msgstr "" + +#: builtin/apply.c:4383 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "" + +#: builtin/apply.c:4385 +msgid "attempt three-way merge if a patch does not apply" +msgstr "" + +#: builtin/apply.c:4387 +msgid "build a temporary index based on embedded index information" +msgstr "" + +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452 +msgid "paths are separated with NUL character" +msgstr "" + +#: builtin/apply.c:4392 +#, fuzzy +msgid "ensure at least <n> lines of context match" +msgstr "<брой>" + +#: builtin/apply.c:4393 +msgid "action" +msgstr "" + +#: builtin/apply.c:4394 +msgid "detect new or modified lines that have whitespace errors" +msgstr "" + +#: builtin/apply.c:4397 builtin/apply.c:4400 +msgid "ignore changes in whitespace when finding context" +msgstr "" + +#: builtin/apply.c:4403 +msgid "apply the patch in reverse" +msgstr "" + +#: builtin/apply.c:4405 +msgid "don't expect at least one line of context" +msgstr "" + +#: builtin/apply.c:4407 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "" + +#: builtin/apply.c:4409 +msgid "allow overlapping hunks" +msgstr "" + +#: builtin/apply.c:4412 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" + +#: builtin/apply.c:4415 +msgid "do not trust the line counts in the hunk headers" +msgstr "" + +#: builtin/apply.c:4417 +msgid "root" +msgstr "" + +#: builtin/apply.c:4418 +msgid "prepend <root> to all filenames" +msgstr "" + +#: builtin/apply.c:4440 +msgid "--3way outside a repository" +msgstr "" + +#: builtin/apply.c:4448 +msgid "--index outside a repository" +msgstr "" + +#: builtin/apply.c:4451 +msgid "--cached outside a repository" +msgstr "" + +#: builtin/apply.c:4467 +#, c-format +msgid "can't open patch '%s'" +msgstr "" + +#: builtin/apply.c:4481 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:4487 builtin/apply.c:4497 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "" +msgstr[1] "" + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "" + +#: builtin/archive.c:61 +#, c-format +msgid "git archive: NACK %s" +msgstr "" + +#: builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "" + +#: builtin/archive.c:64 +msgid "git archive: protocol error" +msgstr "" + +#: builtin/archive.c:68 +msgid "git archive: expected a flush" +msgstr "" + +#: 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:27 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "" + +#: builtin/blame.c:32 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "" + +#: builtin/blame.c:2249 +msgid "Show blame entries as we find them, incrementally" +msgstr "" + +# FIXME +#: builtin/blame.c:2250 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "" + +#: builtin/blame.c:2251 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "" + +#: builtin/blame.c:2252 +msgid "Show work cost statistics" +msgstr "" + +#: builtin/blame.c:2253 +msgid "Show output score for blame entries" +msgstr "" + +#: builtin/blame.c:2254 +msgid "Show original filename (Default: auto)" +msgstr "" + +#: builtin/blame.c:2255 +msgid "Show original linenumber (Default: off)" +msgstr "" + +#: builtin/blame.c:2256 +msgid "Show in a format designed for machine consumption" +msgstr "" + +#: builtin/blame.c:2257 +msgid "Show porcelain format with per-line commit information" +msgstr "" + +#: builtin/blame.c:2258 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "" + +#: builtin/blame.c:2259 +msgid "Show raw timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2260 +msgid "Show long commit SHA1 (Default: off)" +msgstr "" + +#: builtin/blame.c:2261 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2262 +msgid "Show author email instead of name (Default: off)" +msgstr "" + +#: builtin/blame.c:2263 +msgid "Ignore whitespace differences" +msgstr "" + +#: builtin/blame.c:2264 +msgid "Spend extra cycles to find better match" +msgstr "" + +#: builtin/blame.c:2265 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "" + +#: builtin/blame.c:2266 +msgid "Use <file>'s contents as the final image" +msgstr "" + +#: builtin/blame.c:2267 builtin/blame.c:2268 +msgid "score" +msgstr "" + +#: builtin/blame.c:2267 +msgid "Find line copies within and across files" +msgstr "" + +#: builtin/blame.c:2268 +msgid "Find line movements within and across files" +msgstr "" + +#: builtin/blame.c:2269 +msgid "n,m" +msgstr "" + +#: builtin/blame.c:2269 +msgid "Process only line range n,m, counting from 1" +msgstr "" + +#: builtin/branch.c:24 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "" + +#: builtin/branch.c:25 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgstr "" + +#: builtin/branch.c:26 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "" + +#: builtin/branch.c:27 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "" + +#: builtin/branch.c:150 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" + +#: builtin/branch.c:154 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" + +#: builtin/branch.c:168 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:172 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" + +#: builtin/branch.c:185 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:213 +msgid "cannot use -a with -d" +msgstr "" + +#: builtin/branch.c:219 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:227 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:240 +#, c-format +msgid "remote branch '%s' not found." +msgstr "" + +#: builtin/branch.c:241 +#, c-format +msgid "branch '%s' not found." +msgstr "" + +#: builtin/branch.c:255 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "" + +#: builtin/branch.c:256 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "" + +#: builtin/branch.c:263 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:264 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:366 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "" + +#: builtin/branch.c:454 +#, c-format +msgid "[%s: gone]" +msgstr "" + +#: builtin/branch.c:459 +#, c-format +msgid "[%s]" +msgstr "" + +#: builtin/branch.c:464 +#, c-format +msgid "[%s: behind %d]" +msgstr "" + +#: builtin/branch.c:466 +#, c-format +msgid "[behind %d]" +msgstr "" + +#: builtin/branch.c:470 +#, c-format +msgid "[%s: ahead %d]" +msgstr "" + +#: builtin/branch.c:472 +#, c-format +msgid "[ahead %d]" +msgstr "" + +#: builtin/branch.c:475 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "" + +#: builtin/branch.c:478 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "" + +#: builtin/branch.c:502 +msgid " **** invalid ref ****" +msgstr "" + +#: builtin/branch.c:594 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "" + +#: builtin/branch.c:597 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "" + +#: builtin/branch.c:600 +#, c-format +msgid "(detached from %s)" +msgstr "" + +#: builtin/branch.c:603 +msgid "(no branch)" +msgstr "" + +#: builtin/branch.c:649 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "" + +#: builtin/branch.c:681 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:694 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:704 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "" + +#: builtin/branch.c:719 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:723 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:727 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +#: builtin/branch.c:734 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:749 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: builtin/branch.c:773 +#, c-format +msgid "could not write branch description template: %s" +msgstr "" + +#: builtin/branch.c:803 +msgid "Generic options" +msgstr "" + +#: builtin/branch.c:805 +msgid "show hash and subject, give twice for upstream branch" +msgstr "" + +#: builtin/branch.c:806 +msgid "suppress informational messages" +msgstr "" + +#: builtin/branch.c:807 +msgid "set up tracking mode (see git-pull(1))" +msgstr "" + +#: builtin/branch.c:809 +msgid "change upstream info" +msgstr "" + +#: builtin/branch.c:813 +msgid "use colored output" +msgstr "" + +#: builtin/branch.c:814 +msgid "act on remote-tracking branches" +msgstr "" + +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 +msgid "commit" +msgstr "" + +#: builtin/branch.c:818 builtin/branch.c:824 +msgid "print only branches that contain the commit" +msgstr "" + +#: builtin/branch.c:830 +msgid "Specific git-branch actions:" +msgstr "" + +#: builtin/branch.c:831 +msgid "list both remote-tracking and local branches" +msgstr "" + +#: builtin/branch.c:833 +msgid "delete fully merged branch" +msgstr "" + +#: builtin/branch.c:834 +msgid "delete branch (even if not merged)" +msgstr "" + +#: builtin/branch.c:835 +msgid "move/rename a branch and its reflog" +msgstr "" + +#: builtin/branch.c:836 +msgid "move/rename a branch, even if target exists" +msgstr "" + +#: builtin/branch.c:837 +msgid "list branch names" +msgstr "" + +#: builtin/branch.c:838 +msgid "create the branch's reflog" +msgstr "" + +#: builtin/branch.c:840 +msgid "edit the description for the branch" +msgstr "" + +#: builtin/branch.c:841 +msgid "force creation (when already exists)" +msgstr "" + +#: builtin/branch.c:844 +msgid "print only not merged branches" +msgstr "" + +#: builtin/branch.c:850 +msgid "print only merged branches" +msgstr "" + +#: builtin/branch.c:854 +msgid "list branches in columns" +msgstr "" + +#: builtin/branch.c:867 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:872 builtin/clone.c:635 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:896 +msgid "--column and --verbose are incompatible" +msgstr "" + +#: builtin/branch.c:902 builtin/branch.c:941 +msgid "branch name required" +msgstr "" + +#: builtin/branch.c:917 +msgid "Cannot give description to detached HEAD" +msgstr "" + +#: builtin/branch.c:922 +msgid "cannot edit description of more than one branch" +msgstr "" + +#: builtin/branch.c:929 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "" + +#: builtin/branch.c:932 +#, c-format +msgid "No branch named '%s'." +msgstr "" + +#: builtin/branch.c:947 +msgid "too many branches for a rename operation" +msgstr "" + +#: builtin/branch.c:952 +msgid "too many branches to set new upstream" +msgstr "" + +#: builtin/branch.c:956 +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" + +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 +#, c-format +msgid "no such branch '%s'" +msgstr "" + +#: builtin/branch.c:963 +#, c-format +msgid "branch '%s' does not exist" +msgstr "" + +#: builtin/branch.c:975 +msgid "too many branches to unset upstream" +msgstr "" + +#: builtin/branch.c:979 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "" + +#: builtin/branch.c:985 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "" + +#: builtin/branch.c:999 +msgid "it does not make sense to create 'HEAD' manually" +msgstr "" + +#: builtin/branch.c:1005 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" + +#: builtin/branch.c:1008 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" + +#: builtin/branch.c:1025 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" + +#: builtin/branch.c:1026 +#, c-format +msgid " git branch -d %s\n" +msgstr "" + +#: builtin/branch.c:1027 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr "" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "" + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "" + +#: builtin/cat-file.c:328 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +msgstr "" + +#: builtin/cat-file.c:329 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "" + +#: builtin/cat-file.c:366 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "" + +#: builtin/cat-file.c:367 +msgid "show object type" +msgstr "" + +#: builtin/cat-file.c:368 +msgid "show object size" +msgstr "" + +#: builtin/cat-file.c:370 +msgid "exit with zero when there's no error" +msgstr "" + +#: builtin/cat-file.c:371 +msgid "pretty-print object's content" +msgstr "" + +#: builtin/cat-file.c:373 +msgid "for blob objects, run textconv on object's content" +msgstr "" + +#: builtin/cat-file.c:375 +msgid "show info and content of objects fed from the standard input" +msgstr "" + +#: builtin/cat-file.c:378 +msgid "show info about objects fed from the standard input" +msgstr "" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "" + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "" + +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "" + +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +msgid "terminate input and output records by a NUL character" +msgstr "" + +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 +msgid "suppress progress reporting" +msgstr "без показване на напредъка" + +#: builtin/check-ignore.c:26 +msgid "show non-matching input paths" +msgstr "" + +#: builtin/check-ignore.c:28 +msgid "ignore index when checking" +msgstr "" + +#: builtin/check-ignore.c:154 +msgid "cannot specify pathnames with --stdin" +msgstr "" + +#: builtin/check-ignore.c:157 +msgid "-z only makes sense with --stdin" +msgstr "" + +#: builtin/check-ignore.c:159 +msgid "no path specified" +msgstr "" + +#: builtin/check-ignore.c:163 +msgid "--quiet is only valid with a single pathname" +msgstr "" + +#: builtin/check-ignore.c:165 +msgid "cannot have both --quiet and --verbose" +msgstr "" + +#: builtin/check-ignore.c:168 +msgid "--non-matching is only valid with --verbose" +msgstr "" + +#: builtin/check-mailmap.c:8 +msgid "git check-mailmap [options] <contact>..." +msgstr "" + +#: builtin/check-mailmap.c:13 +msgid "also read contacts from stdin" +msgstr "" + +#: builtin/check-mailmap.c:24 +#, c-format +msgid "unable to parse contact: %s" +msgstr "" + +#: builtin/check-mailmap.c:47 +msgid "no contacts specified" +msgstr "" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr "" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "" + +#: builtin/checkout.c:114 builtin/checkout.c:147 +#, c-format +msgid "path '%s' does not have our version" +msgstr "" + +#: builtin/checkout.c:116 builtin/checkout.c:149 +#, c-format +msgid "path '%s' does not have their version" +msgstr "" + +#: builtin/checkout.c:132 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "" + +#: builtin/checkout.c:176 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "" + +#: builtin/checkout.c:193 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:210 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238 +#: builtin/checkout.c:241 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "" + +#: builtin/checkout.c:244 builtin/checkout.c:247 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "" + +#: builtin/checkout.c:250 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "" + +#: builtin/checkout.c:261 builtin/checkout.c:451 +msgid "corrupt index file" +msgstr "" + +#: builtin/checkout.c:322 builtin/checkout.c:329 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:473 +msgid "you need to resolve your current index first" +msgstr "" + +#: builtin/checkout.c:594 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "" + +#: builtin/checkout.c:632 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:639 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:642 +#, c-format +msgid "Already on '%s'\n" +msgstr "" + +#: builtin/checkout.c:646 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:648 builtin/checkout.c:1033 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:650 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:706 +#, c-format +msgid " ... and %d more.\n" +msgstr "" + +#. The singular version +#: builtin/checkout.c:712 +#, 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" +"\n" +"%s\n" +msgstr[0] "" +msgstr[1] "" + +#: builtin/checkout.c:730 +#, 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" +msgstr "" + +#: builtin/checkout.c:760 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:764 +msgid "Previous HEAD position was" +msgstr "" + +#: builtin/checkout.c:791 builtin/checkout.c:1028 +msgid "You are on a branch yet to be born" +msgstr "" + +#: builtin/checkout.c:935 +#, c-format +msgid "only one reference expected, %d given." +msgstr "" + +#: builtin/checkout.c:974 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:1003 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:1042 +msgid "paths cannot be used with switching branches" +msgstr "" + +#: builtin/checkout.c:1045 builtin/checkout.c:1049 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "" + +#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061 +#: builtin/checkout.c:1064 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "" + +#: builtin/checkout.c:1069 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "" + +#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 +#: builtin/remote.c:159 builtin/remote.c:161 +msgid "branch" +msgstr "клон" + +#: builtin/checkout.c:1092 +msgid "create and checkout a new branch" +msgstr "" + +#: builtin/checkout.c:1094 +msgid "create/reset and checkout a branch" +msgstr "" + +#: builtin/checkout.c:1095 +msgid "create reflog for new branch" +msgstr "" + +#: builtin/checkout.c:1096 +msgid "detach the HEAD at named commit" +msgstr "" + +#: builtin/checkout.c:1097 +msgid "set upstream info for new branch" +msgstr "" + +#: builtin/checkout.c:1099 +msgid "new branch" +msgstr "" + +#: builtin/checkout.c:1099 +msgid "new unparented branch" +msgstr "" + +#: builtin/checkout.c:1100 +msgid "checkout our version for unmerged files" +msgstr "" + +#: builtin/checkout.c:1102 +msgid "checkout their version for unmerged files" +msgstr "" + +#: builtin/checkout.c:1104 +msgid "force checkout (throw away local modifications)" +msgstr "" + +#: builtin/checkout.c:1105 +msgid "perform a 3-way merge with the new branch" +msgstr "" + +#: builtin/checkout.c:1106 builtin/merge.c:225 +msgid "update ignored files (default)" +msgstr "" + +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 +msgid "style" +msgstr "стил" + +#: builtin/checkout.c:1108 +msgid "conflict style (merge or diff3)" +msgstr "" + +#: builtin/checkout.c:1111 +msgid "do not limit pathspecs to sparse entries only" +msgstr "" + +#: builtin/checkout.c:1113 +msgid "second guess 'git checkout no-such-branch'" +msgstr "" + +#: builtin/checkout.c:1136 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:1153 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:1160 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:1197 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:1204 +#, c-format +msgid "" +"Cannot update paths and switch to branch '%s' at the same time.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" + +#: builtin/checkout.c:1209 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "" + +#: builtin/checkout.c:1213 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/clean.c:26 +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" + +#: builtin/clean.c:30 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:31 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:32 +#, c-format +msgid "Skipping repository %s\n" +msgstr "" + +#: builtin/clean.c:33 +#, c-format +msgid "Would skip repository %s\n" +msgstr "" + +#: builtin/clean.c:34 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: builtin/clean.c:294 +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing" +msgstr "" + +#: builtin/clean.c:298 +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting" +msgstr "" + +#: builtin/clean.c:516 +#, c-format +msgid "Huh (%s)?" +msgstr "" + +#: builtin/clean.c:659 +#, c-format +msgid "Input ignore patterns>> " +msgstr "" + +#: builtin/clean.c:696 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "" + +#: builtin/clean.c:717 +msgid "Select items to delete" +msgstr "" + +#: builtin/clean.c:757 +#, c-format +msgid "remove %s? " +msgstr "" + +#: builtin/clean.c:782 +msgid "Bye." +msgstr "" + +#: builtin/clean.c:790 +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "" + +#: builtin/clean.c:817 +msgid "*** Commands ***" +msgstr "" + +#: builtin/clean.c:818 +msgid "What now" +msgstr "" + +#: builtin/clean.c:826 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/clean.c:843 +msgid "No more files to clean, exiting." +msgstr "" + +#: builtin/clean.c:874 +msgid "do not print names of files removed" +msgstr "" + +#: builtin/clean.c:876 +msgid "force" +msgstr "" + +#: builtin/clean.c:877 +msgid "interactive cleaning" +msgstr "" + +#: builtin/clean.c:879 +msgid "remove whole directories" +msgstr "" + +#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 +msgid "pattern" +msgstr "" + +#: builtin/clean.c:881 +msgid "add <pattern> to ignore rules" +msgstr "" + +#: builtin/clean.c:882 +msgid "remove ignored files, too" +msgstr "" + +#: builtin/clean.c:884 +msgid "remove only ignored files" +msgstr "" + +#: builtin/clean.c:902 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:906 +msgid "" +"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:909 +msgid "" +"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"refusing to clean" +msgstr "" + +#: builtin/clone.c:36 +msgid "git clone [options] [--] <repo> [<dir>]" +msgstr "" + +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 +#: builtin/push.c:521 +msgid "force progress reporting" +msgstr "" + +#: builtin/clone.c:66 +msgid "don't create a checkout" +msgstr "" + +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" +msgstr "" + +#: builtin/clone.c:71 +msgid "create a mirror repository (implies bare)" +msgstr "" + +#: builtin/clone.c:73 +msgid "to clone from a local repository" +msgstr "" + +#: builtin/clone.c:75 +msgid "don't use local hardlinks, always copy" +msgstr "" + +#: builtin/clone.c:77 +msgid "setup as shared repository" +msgstr "" + +#: builtin/clone.c:79 builtin/clone.c:81 +msgid "initialize submodules in the clone" +msgstr "" + +#: builtin/clone.c:82 builtin/init-db.c:485 +msgid "template-directory" +msgstr "" + +#: builtin/clone.c:83 builtin/init-db.c:486 +msgid "directory from which templates will be used" +msgstr "" + +#: builtin/clone.c:85 +msgid "reference repository" +msgstr "" + +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "" + +#: builtin/clone.c:87 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "" + +#: builtin/clone.c:89 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "" + +#: builtin/clone.c:91 +msgid "path to git-upload-pack on the remote" +msgstr "" + +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 +msgid "depth" +msgstr "" + +#: builtin/clone.c:93 +msgid "create a shallow clone of that depth" +msgstr "" + +#: builtin/clone.c:95 +msgid "clone only one branch, HEAD or --branch" +msgstr "" + +#: builtin/clone.c:96 builtin/init-db.c:494 +msgid "gitdir" +msgstr "" + +#: builtin/clone.c:97 builtin/init-db.c:495 +msgid "separate git dir from working tree" +msgstr "" + +#: builtin/clone.c:98 +msgid "key=value" +msgstr "" + +#: builtin/clone.c:99 +msgid "set config inside the new repository" +msgstr "" + +#: builtin/clone.c:252 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "" + +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "" + +#: builtin/clone.c:259 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "" + +#: builtin/clone.c:321 +#, c-format +msgid "failed to create directory '%s'" +msgstr "" + +#: builtin/clone.c:323 builtin/diff.c:83 +#, c-format +msgid "failed to stat '%s'" +msgstr "" + +#: builtin/clone.c:325 +#, c-format +msgid "%s exists and is not a directory" +msgstr "" + +#: builtin/clone.c:339 +#, c-format +msgid "failed to stat %s\n" +msgstr "" + +#: builtin/clone.c:361 +#, c-format +msgid "failed to create link '%s'" +msgstr "" + +#: builtin/clone.c:365 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "" + +#: builtin/clone.c:388 builtin/clone.c:565 +#, c-format +msgid "done.\n" +msgstr "" + +#: builtin/clone.c:401 +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry the checkout with 'git checkout -f HEAD'\n" +msgstr "" + +#: builtin/clone.c:480 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "" + +#: builtin/clone.c:560 +#, c-format +msgid "Checking connectivity... " +msgstr "" + +#: builtin/clone.c:563 +msgid "remote did not send all necessary objects" +msgstr "" + +#: builtin/clone.c:626 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" + +#: builtin/clone.c:657 +msgid "unable to checkout working tree" +msgstr "" + +#: builtin/clone.c:765 +msgid "Too many arguments." +msgstr "" + +#: builtin/clone.c:769 +msgid "You must specify a repository to clone." +msgstr "" + +#: builtin/clone.c:780 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "" + +#: builtin/clone.c:783 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "" + +#: builtin/clone.c:796 +#, c-format +msgid "repository '%s' does not exist" +msgstr "" + +#: builtin/clone.c:802 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:805 +msgid "source repository is shallow, ignoring --local" +msgstr "" + +#: builtin/clone.c:810 +msgid "--local is ignored" +msgstr "" + +#: builtin/clone.c:814 builtin/fetch.c:1119 +#, c-format +msgid "depth %s is not a positive number" +msgstr "" + +#: builtin/clone.c:824 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:834 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:847 builtin/clone.c:859 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:850 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "" + +#: builtin/clone.c:869 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "" + +#: builtin/clone.c:871 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "" + +#: builtin/clone.c:906 +#, c-format +msgid "Don't know how to clone %s" +msgstr "" + +#: builtin/clone.c:957 builtin/clone.c:965 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "" + +#: builtin/clone.c:968 +msgid "You appear to have cloned an empty repository." +msgstr "" + +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "" + +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "" + +#: builtin/commit.c:36 +msgid "git commit [options] [--] <pathspec>..." +msgstr "" + +#: builtin/commit.c:41 +msgid "git status [options] [--] <pathspec>..." +msgstr "" + +#: builtin/commit.c:46 +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/commit.c:58 +msgid "" +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" + +#: builtin/commit.c:63 +msgid "" +"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" +msgstr "" + +#: builtin/commit.c:70 +msgid "Otherwise, please use 'git reset'\n" +msgstr "" + +#: builtin/commit.c:73 +msgid "" +"If you wish to skip this commit, use:\n" +"\n" +" git reset\n" +"\n" +"Then \"git cherry-pick --continue\" will resume cherry-picking\n" +"the remaining commits.\n" +msgstr "" + +#: builtin/commit.c:287 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:329 +msgid "unable to create temporary index" +msgstr "" + +#: builtin/commit.c:335 +msgid "interactive add failed" +msgstr "" + +#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439 +msgid "unable to write new_index file" +msgstr "" + +#: builtin/commit.c:420 +msgid "cannot do a partial commit during a merge." +msgstr "" + +#: builtin/commit.c:422 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "" + +#: builtin/commit.c:432 +msgid "cannot read the index" +msgstr "" + +#: builtin/commit.c:452 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:543 builtin/commit.c:549 +#, c-format +msgid "invalid commit: %s" +msgstr "" + +#: builtin/commit.c:571 +msgid "malformed --author parameter" +msgstr "" + +#: builtin/commit.c:591 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:642 builtin/shortlog.c:273 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +#: builtin/commit.c:644 +msgid "could not read log from standard input" +msgstr "" + +#: builtin/commit.c:648 +#, c-format +msgid "could not read log file '%s'" +msgstr "" + +#: builtin/commit.c:654 +msgid "commit has empty message" +msgstr "" + +#: builtin/commit.c:670 +msgid "could not read MERGE_MSG" +msgstr "" + +#: builtin/commit.c:674 +msgid "could not read SQUASH_MSG" +msgstr "" + +#: builtin/commit.c:678 +#, c-format +msgid "could not read '%s'" +msgstr "" + +#: builtin/commit.c:749 +msgid "could not write commit template" +msgstr "" + +# FIXME +#: builtin/commit.c:760 +#, 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" +msgstr "" + +# FIXME +#: builtin/commit.c:765 +#, 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" +msgstr "" + +#: builtin/commit.c:777 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:782 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:795 +#, c-format +msgid "%sAuthor: %s" +msgstr "" + +#: builtin/commit.c:802 +#, c-format +msgid "%sCommitter: %s" +msgstr "" + +#: builtin/commit.c:822 +msgid "Cannot read index" +msgstr "" + +#: builtin/commit.c:865 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:880 builtin/tag.c:359 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#: builtin/commit.c:982 +#, c-format +msgid "No existing author found with '%s'" +msgstr "" + +#: builtin/commit.c:997 builtin/commit.c:1237 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:1034 +msgid "--long and -z are incompatible" +msgstr "" + +#: builtin/commit.c:1064 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" + +#: builtin/commit.c:1075 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:1078 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "" + +#: builtin/commit.c:1080 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "" + +#: builtin/commit.c:1083 +msgid "Options --squash and --fixup cannot be used together" +msgstr "" + +#: builtin/commit.c:1093 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "" + +#: builtin/commit.c:1095 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "" + +#: builtin/commit.c:1103 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#: builtin/commit.c:1120 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" + +#: builtin/commit.c:1122 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:1124 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:1126 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:1136 builtin/tag.c:572 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:1141 +msgid "Paths with -a does not make sense." +msgstr "" + +#: builtin/commit.c:1251 builtin/commit.c:1482 +msgid "show status concisely" +msgstr "" + +#: builtin/commit.c:1253 builtin/commit.c:1484 +msgid "show branch information" +msgstr "" + +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 +msgid "machine-readable output" +msgstr "" + +#: builtin/commit.c:1258 builtin/commit.c:1488 +msgid "show status in long format (default)" +msgstr "" + +#: builtin/commit.c:1261 builtin/commit.c:1491 +msgid "terminate entries with NUL" +msgstr "" + +#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674 +#: builtin/fast-export.c:677 builtin/tag.c:459 +msgid "mode" +msgstr "" + +#: builtin/commit.c:1264 builtin/commit.c:1494 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "" + +#: builtin/commit.c:1267 +msgid "show ignored files" +msgstr "" + +#: builtin/commit.c:1268 parse-options.h:156 +msgid "when" +msgstr "кога" + +#: builtin/commit.c:1269 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" + +#: builtin/commit.c:1271 +msgid "list untracked files in columns" +msgstr "" + +#: builtin/commit.c:1340 +msgid "couldn't look up newly created commit" +msgstr "" + +#: builtin/commit.c:1342 +msgid "could not parse newly created commit" +msgstr "" + +#: builtin/commit.c:1383 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1385 +msgid " (root-commit)" +msgstr "" + +#: builtin/commit.c:1452 +msgid "suppress summary after successful commit" +msgstr "" + +#: builtin/commit.c:1453 +msgid "show diff in commit message template" +msgstr "" + +#: builtin/commit.c:1455 +msgid "Commit message options" +msgstr "" + +#: builtin/commit.c:1456 builtin/tag.c:457 +msgid "read message from file" +msgstr "" + +#: builtin/commit.c:1457 +msgid "author" +msgstr "" + +#: builtin/commit.c:1457 +msgid "override author for commit" +msgstr "" + +#: builtin/commit.c:1458 builtin/gc.c:261 +msgid "date" +msgstr "дата" + +#: builtin/commit.c:1458 +msgid "override date for commit" +msgstr "" + +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 +#: builtin/notes.c:562 builtin/tag.c:455 +msgid "message" +msgstr "" + +#: builtin/commit.c:1459 +msgid "commit message" +msgstr "" + +#: builtin/commit.c:1460 +msgid "reuse and edit message from specified commit" +msgstr "" + +#: builtin/commit.c:1461 +msgid "reuse message from specified commit" +msgstr "" + +#: builtin/commit.c:1462 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" + +#: builtin/commit.c:1463 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" + +#: builtin/commit.c:1464 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "" + +#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86 +msgid "add Signed-off-by:" +msgstr "" + +#: builtin/commit.c:1466 +msgid "use specified template file" +msgstr "" + +#: builtin/commit.c:1467 +msgid "force edit of commit" +msgstr "" + +#: builtin/commit.c:1468 +msgid "default" +msgstr "" + +#: builtin/commit.c:1468 builtin/tag.c:460 +msgid "how to strip spaces and #comments from message" +msgstr "" + +#: builtin/commit.c:1469 +msgid "include status in commit message template" +msgstr "" + +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 +msgid "key id" +msgstr "" + +#: builtin/commit.c:1471 builtin/merge.c:224 +msgid "GPG sign commit" +msgstr "" + +#. end commit message options +#: builtin/commit.c:1474 +msgid "Commit contents options" +msgstr "" + +#: builtin/commit.c:1475 +msgid "commit all changed files" +msgstr "" + +#: builtin/commit.c:1476 +msgid "add specified files to index for commit" +msgstr "" + +#: builtin/commit.c:1477 +msgid "interactively add files" +msgstr "" + +#: builtin/commit.c:1478 +msgid "interactively add changes" +msgstr "" + +#: builtin/commit.c:1479 +msgid "commit only specified files" +msgstr "" + +#: builtin/commit.c:1480 +msgid "bypass pre-commit hook" +msgstr "" + +#: builtin/commit.c:1481 +msgid "show what would be committed" +msgstr "" + +#: builtin/commit.c:1492 +msgid "amend previous commit" +msgstr "" + +#: builtin/commit.c:1493 +msgid "bypass post-rewrite hook" +msgstr "" + +#: builtin/commit.c:1498 +msgid "ok to record an empty change" +msgstr "" + +#: builtin/commit.c:1500 +msgid "ok to record a change with an empty message" +msgstr "" + +#: builtin/commit.c:1529 +msgid "could not parse HEAD commit" +msgstr "" + +#: builtin/commit.c:1567 builtin/merge.c:518 +#, c-format +msgid "could not open '%s' for reading" +msgstr "" + +#: builtin/commit.c:1574 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1581 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1600 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1611 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "" + +#: builtin/commit.c:1616 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 +msgid "failed to write commit object" +msgstr "" + +#: builtin/commit.c:1652 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1656 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1667 +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." +msgstr "" + +#: builtin/config.c:8 +msgid "git config [options]" +msgstr "" + +#: builtin/config.c:54 +msgid "Config file location" +msgstr "" + +#: builtin/config.c:55 +msgid "use global config file" +msgstr "" + +#: builtin/config.c:56 +msgid "use system config file" +msgstr "" + +#: builtin/config.c:57 +msgid "use repository config file" +msgstr "" + +#: builtin/config.c:58 +msgid "use given config file" +msgstr "" + +#: builtin/config.c:59 +msgid "blob-id" +msgstr "" + +#: builtin/config.c:59 +msgid "read config from given blob object" +msgstr "" + +#: builtin/config.c:60 +msgid "Action" +msgstr "" + +#: builtin/config.c:61 +msgid "get value: name [value-regex]" +msgstr "" + +#: builtin/config.c:62 +msgid "get all values: key [value-regex]" +msgstr "" + +#: builtin/config.c:63 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "" + +#: builtin/config.c:64 +msgid "get value specific for the URL: section[.var] URL" +msgstr "" + +#: builtin/config.c:65 +msgid "replace all matching variables: name value [value_regex]" +msgstr "" + +#: builtin/config.c:66 +msgid "add a new variable: name value" +msgstr "" + +#: builtin/config.c:67 +msgid "remove a variable: name [value-regex]" +msgstr "" + +#: builtin/config.c:68 +msgid "remove all matches: name [value-regex]" +msgstr "" + +#: builtin/config.c:69 +msgid "rename section: old-name new-name" +msgstr "" + +#: builtin/config.c:70 +msgid "remove a section: name" +msgstr "" + +#: builtin/config.c:71 +msgid "list all" +msgstr "" + +#: builtin/config.c:72 +msgid "open an editor" +msgstr "" + +#: builtin/config.c:73 builtin/config.c:74 +msgid "slot" +msgstr "" + +#: builtin/config.c:73 +msgid "find the color configured: [default]" +msgstr "" + +#: builtin/config.c:74 +msgid "find the color setting: [stdout-is-tty]" +msgstr "" + +#: builtin/config.c:75 +msgid "Type" +msgstr "" + +#: builtin/config.c:76 +msgid "value is \"true\" or \"false\"" +msgstr "" + +#: builtin/config.c:77 +msgid "value is decimal number" +msgstr "" + +#: builtin/config.c:78 +msgid "value is --bool or --int" +msgstr "" + +#: builtin/config.c:79 +msgid "value is a path (file or directory name)" +msgstr "" + +#: builtin/config.c:80 +msgid "Other" +msgstr "" + +#: builtin/config.c:81 +msgid "terminate values with NUL byte" +msgstr "" + +#: builtin/config.c:82 +msgid "respect include directives on lookup" +msgstr "" + +#: builtin/count-objects.c:82 +msgid "git count-objects [-v] [-H | --human-readable]" +msgstr "" + +#: builtin/count-objects.c:97 +msgid "print sizes in human readable format" +msgstr "" + +#: builtin/describe.c:16 +msgid "git describe [options] <commit-ish>*" +msgstr "" + +#: builtin/describe.c:17 +msgid "git describe [options] --dirty" +msgstr "" + +#: builtin/describe.c:237 +#, c-format +msgid "annotated tag %s not available" +msgstr "" + +#: builtin/describe.c:241 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "" + +#: builtin/describe.c:243 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "" + +#: builtin/describe.c:270 +#, c-format +msgid "Not a valid object name %s" +msgstr "" + +#: builtin/describe.c:273 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "" + +#: builtin/describe.c:290 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "" + +#: builtin/describe.c:292 +#, c-format +msgid "searching to describe %s\n" +msgstr "" + +#: builtin/describe.c:332 +#, c-format +msgid "finished search at %s\n" +msgstr "" + +#: builtin/describe.c:359 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" + +#: builtin/describe.c:363 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" + +#: builtin/describe.c:384 +#, c-format +msgid "traversed %lu commits\n" +msgstr "" + +#: builtin/describe.c:387 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" + +#: builtin/describe.c:409 +msgid "find the tag that comes after the commit" +msgstr "" + +#: builtin/describe.c:410 +msgid "debug search strategy on stderr" +msgstr "" + +#: builtin/describe.c:411 +msgid "use any ref" +msgstr "" + +#: builtin/describe.c:412 +msgid "use any tag, even unannotated" +msgstr "" + +#: builtin/describe.c:413 +msgid "always use long format" +msgstr "" + +#: builtin/describe.c:414 +msgid "only follow first parent" +msgstr "" + +#: builtin/describe.c:417 +msgid "only output exact matches" +msgstr "" + +#: builtin/describe.c:419 +#, fuzzy +msgid "consider <n> most recent tags (default: 10)" +msgstr "<брой>" + +#: builtin/describe.c:421 +msgid "only consider tags matching <pattern>" +msgstr "" + +#: builtin/describe.c:423 builtin/name-rev.c:321 +msgid "show abbreviated commit object as fallback" +msgstr "" + +#: builtin/describe.c:424 +msgid "mark" +msgstr "" + +#: builtin/describe.c:425 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "" + +#: builtin/describe.c:443 +msgid "--long is incompatible with --abbrev=0" +msgstr "" + +#: builtin/describe.c:469 +msgid "No names found, cannot describe anything." +msgstr "" + +#: builtin/describe.c:489 +msgid "--dirty is incompatible with commit-ishes" +msgstr "" + +#: builtin/diff.c:85 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "" + +#: builtin/diff.c:236 +#, c-format +msgid "invalid option: %s" +msgstr "" + +#: builtin/diff.c:357 +msgid "Not a git repository" +msgstr "" + +#: builtin/diff.c:400 +#, c-format +msgid "invalid object '%s' given." +msgstr "" + +#: builtin/diff.c:409 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#: builtin/diff.c:416 +#, c-format +msgid "unhandled object '%s' given." +msgstr "" + +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "" + +#: builtin/fast-export.c:673 +#, fuzzy +msgid "show progress after <n> objects" +msgstr "<брой>" + +#: builtin/fast-export.c:675 +msgid "select handling of signed tags" +msgstr "" + +#: builtin/fast-export.c:678 +msgid "select handling of tags that tag filtered objects" +msgstr "" + +#: builtin/fast-export.c:681 +msgid "Dump marks to this file" +msgstr "" + +#: builtin/fast-export.c:683 +msgid "Import marks from this file" +msgstr "" + +#: builtin/fast-export.c:685 +msgid "Fake a tagger when tags lack one" +msgstr "" + +#: builtin/fast-export.c:687 +msgid "Output full tree for each commit" +msgstr "" + +#: builtin/fast-export.c:689 +msgid "Use the done feature to terminate the stream" +msgstr "" + +#: builtin/fast-export.c:690 +msgid "Skip output of blob data" +msgstr "" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "" + +#: builtin/fetch.c:75 +msgid "fetch from all remotes" +msgstr "" + +#: builtin/fetch.c:77 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "" + +#: builtin/fetch.c:79 +msgid "path to upload pack on remote end" +msgstr "" + +#: builtin/fetch.c:80 +msgid "force overwrite of local branch" +msgstr "" + +#: builtin/fetch.c:82 +msgid "fetch from multiple remotes" +msgstr "" + +#: builtin/fetch.c:84 +msgid "fetch all tags and associated objects" +msgstr "" + +#: builtin/fetch.c:86 +msgid "do not fetch all tags (--no-tags)" +msgstr "" + +#: builtin/fetch.c:88 +msgid "prune remote-tracking branches no longer on remote" +msgstr "" + +#: builtin/fetch.c:89 +msgid "on-demand" +msgstr "" + +#: builtin/fetch.c:90 +msgid "control recursive fetching of submodules" +msgstr "" + +#: builtin/fetch.c:94 +msgid "keep downloaded pack" +msgstr "" + +#: builtin/fetch.c:96 +msgid "allow updating of HEAD ref" +msgstr "" + +#: builtin/fetch.c:99 +msgid "deepen history of shallow clone" +msgstr "" + +#: builtin/fetch.c:101 +msgid "convert to a complete repository" +msgstr "" + +#: builtin/fetch.c:103 builtin/log.c:1197 +msgid "dir" +msgstr "" + +#: builtin/fetch.c:104 +msgid "prepend this to submodule path output" +msgstr "" + +#: builtin/fetch.c:107 +msgid "default mode for recursion" +msgstr "" + +#: builtin/fetch.c:109 +msgid "accept refs that update .git/shallow" +msgstr "" + +#: builtin/fetch.c:347 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:411 +#, c-format +msgid "object %s not found" +msgstr "" + +#: builtin/fetch.c:416 +msgid "[up to date]" +msgstr "" + +#: builtin/fetch.c:430 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:431 builtin/fetch.c:517 +msgid "[rejected]" +msgstr "" + +#: builtin/fetch.c:442 +msgid "[tag update]" +msgstr "" + +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 +msgid " (unable to update local ref)" +msgstr "" + +#: builtin/fetch.c:462 +msgid "[new tag]" +msgstr "" + +#: builtin/fetch.c:465 +msgid "[new branch]" +msgstr "" + +#: builtin/fetch.c:468 +msgid "[new ref]" +msgstr "" + +#: builtin/fetch.c:513 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:513 +msgid "forced update" +msgstr "" + +#: builtin/fetch.c:519 +msgid "(non-fast-forward)" +msgstr "" + +#: builtin/fetch.c:552 builtin/fetch.c:785 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "" + +#: builtin/fetch.c:561 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "" + +#: builtin/fetch.c:579 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "" + +#: builtin/fetch.c:667 builtin/fetch.c:750 +#, c-format +msgid "From %.*s\n" +msgstr "" + +#: builtin/fetch.c:678 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" + +#: builtin/fetch.c:730 +#, c-format +msgid " (%s will become dangling)" +msgstr "" + +#: builtin/fetch.c:731 +#, c-format +msgid " (%s has become dangling)" +msgstr "" + +#: builtin/fetch.c:755 +msgid "[deleted]" +msgstr "" + +#: builtin/fetch.c:756 builtin/remote.c:1050 +msgid "(none)" +msgstr "(нищо)" + +#: builtin/fetch.c:775 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:794 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:797 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:853 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:1015 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:1017 builtin/remote.c:90 +#, c-format +msgid "Could not fetch %s" +msgstr "„%s“ не може да се достави" + +#: builtin/fetch.c:1036 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" + +#: builtin/fetch.c:1059 +msgid "You need to specify a tag name." +msgstr "" + +#: builtin/fetch.c:1107 +msgid "--depth and --unshallow cannot be used together" +msgstr "" + +#: builtin/fetch.c:1109 +msgid "--unshallow on a complete repository does not make sense" +msgstr "" + +#: builtin/fetch.c:1132 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:1134 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:1145 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:1153 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/fmt-merge-msg.c:13 +#, fuzzy +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "<брой>" + +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 +#: builtin/merge.c:196 builtin/show-branch.c:654 builtin/show-ref.c:178 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:242 +msgid "n" +msgstr "брой" + +#: builtin/fmt-merge-msg.c:664 +#, fuzzy +msgid "populate log with at most <n> entries from shortlog" +msgstr "<брой>" + +#: builtin/fmt-merge-msg.c:667 +msgid "alias for --log (deprecated)" +msgstr "" + +#: builtin/fmt-merge-msg.c:670 +msgid "text" +msgstr "" + +#: builtin/fmt-merge-msg.c:671 +msgid "use <text> as start of message" +msgstr "" + +#: builtin/fmt-merge-msg.c:672 +msgid "file to read from" +msgstr "" + +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "" + +#: builtin/for-each-ref.c:1078 +msgid "quote placeholders suitably for shells" +msgstr "" + +#: builtin/for-each-ref.c:1080 +msgid "quote placeholders suitably for perl" +msgstr "" + +#: builtin/for-each-ref.c:1082 +msgid "quote placeholders suitably for python" +msgstr "" + +#: builtin/for-each-ref.c:1084 +msgid "quote placeholders suitably for tcl" +msgstr "" + +#: builtin/for-each-ref.c:1087 +#, fuzzy +msgid "show only <n> matched refs" +msgstr "<брой>" + +#: builtin/for-each-ref.c:1088 builtin/replace.c:177 +msgid "format" +msgstr "" + +#: builtin/for-each-ref.c:1088 +msgid "format to use for the output" +msgstr "" + +#: builtin/for-each-ref.c:1089 +msgid "key" +msgstr "" + +#: builtin/for-each-ref.c:1090 +msgid "field name to sort on" +msgstr "" + +#: builtin/fsck.c:607 +msgid "git fsck [options] [<object>...]" +msgstr "git fsck [ОПЦИИ] [<ОБЕКТ>…]" + +#: builtin/fsck.c:613 +msgid "show unreachable objects" +msgstr "показване на недостижимите обекти" + +#: builtin/fsck.c:614 +msgid "show dangling objects" +msgstr "показване на обектите извън клоните" + +#: builtin/fsck.c:615 +msgid "report tags" +msgstr "показване на етикетите" + +#: builtin/fsck.c:616 +msgid "report root nodes" +msgstr "показване на кореновите възли" + +#: builtin/fsck.c:617 +msgid "make index objects head nodes" +msgstr "задаване на обекти от индекса да са коренови" + +#: builtin/fsck.c:618 +#, fuzzy +msgid "make reflogs head nodes (default)" +msgstr "проследяване на указателите от журнала като глави (стандартно)" + +#: builtin/fsck.c:619 +#, fuzzy +msgid "also consider packs and alternate objects" +msgstr "допълнително да се проверяват пакетите и алтернативните обекти" + +#: builtin/fsck.c:620 +msgid "enable more strict checking" +msgstr "по-строги проверки" + +#: builtin/fsck.c:622 +msgid "write dangling objects in .git/lost-found" +msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“" + +#: builtin/fsck.c:623 builtin/prune.c:144 +msgid "show progress" +msgstr "показване на напредъка" + +#: builtin/gc.c:24 +msgid "git gc [options]" +msgstr "git gc [ОПЦИИ]" + +#: builtin/gc.c:80 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Неправилна стойност за „%s“: „%s“" + +#: builtin/gc.c:107 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "прекалено дълга директория с обекти „%.*s“" + +#: builtin/gc.c:262 +msgid "prune unreferenced objects" +msgstr "окастряне на обектите, към които нищо не сочи" + +#: builtin/gc.c:264 +msgid "be more thorough (increased runtime)" +msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)" + +#: builtin/gc.c:265 +msgid "enable auto-gc mode" +msgstr "включване на автоматичното събиране на боклука (auto-gc)" + +#: builtin/gc.c:266 +msgid "force running gc even if there may be another gc running" +msgstr "" +"изрично стартиране на събирането на боклука, дори и ако вече работи друго " +"събиране" + +#: builtin/gc.c:306 +#, 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 "" +"Автоматично пакетиране на хранилището за най-добра производителност. Можете " +"и\n" +"ръчно да стартирате „git gc“. За подробности погледнете помощта: „git help " +"gc“.\n" + +#. be quiet on --auto +#: builtin/gc.c:316 +#, c-format +msgid "" +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" +msgstr "" +"събирането на боклука вече е стартирано на машината „%s“ с идентификатор на\n" +"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n" +"опцията „--force“)" + +#: builtin/gc.c:341 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Има прекалено много недостижими, непакетирани обекти. Използвайте „git " +"prune“, за да\n" +"ги окастрите." + +#: builtin/grep.c:23 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "" + +#: builtin/grep.c:218 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "" + +#: builtin/grep.c:365 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:443 builtin/grep.c:478 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:493 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:551 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:568 +#, c-format +msgid "cannot open '%s'" +msgstr "" + +#: builtin/grep.c:642 +msgid "search in index instead of in the work tree" +msgstr "" + +#: builtin/grep.c:644 +msgid "find in contents not managed by git" +msgstr "" + +#: builtin/grep.c:646 +msgid "search in both tracked and untracked files" +msgstr "" + +#: builtin/grep.c:648 +msgid "search also in ignored files" +msgstr "" + +#: builtin/grep.c:651 +msgid "show non-matching lines" +msgstr "" + +#: builtin/grep.c:653 +msgid "case insensitive matching" +msgstr "" + +#: builtin/grep.c:655 +msgid "match patterns only at word boundaries" +msgstr "" + +#: builtin/grep.c:657 +msgid "process binary files as text" +msgstr "" + +#: builtin/grep.c:659 +msgid "don't match patterns in binary files" +msgstr "" + +#: builtin/grep.c:662 +msgid "process binary files with textconv filters" +msgstr "" + +#: builtin/grep.c:664 +msgid "descend at most <depth> levels" +msgstr "" + +#: builtin/grep.c:668 +msgid "use extended POSIX regular expressions" +msgstr "" + +#: builtin/grep.c:671 +msgid "use basic POSIX regular expressions (default)" +msgstr "" + +#: builtin/grep.c:674 +msgid "interpret patterns as fixed strings" +msgstr "" + +#: builtin/grep.c:677 +msgid "use Perl-compatible regular expressions" +msgstr "" + +#: builtin/grep.c:680 +msgid "show line numbers" +msgstr "" + +#: builtin/grep.c:681 +msgid "don't show filenames" +msgstr "" + +#: builtin/grep.c:682 +msgid "show filenames" +msgstr "" + +#: builtin/grep.c:684 +msgid "show filenames relative to top directory" +msgstr "" + +#: builtin/grep.c:686 +msgid "show only filenames instead of matching lines" +msgstr "" + +#: builtin/grep.c:688 +msgid "synonym for --files-with-matches" +msgstr "" + +#: builtin/grep.c:691 +msgid "show only the names of files without match" +msgstr "" + +#: builtin/grep.c:693 +msgid "print NUL after filenames" +msgstr "" + +#: builtin/grep.c:695 +msgid "show the number of matches instead of matching lines" +msgstr "" + +#: builtin/grep.c:696 +msgid "highlight matches" +msgstr "" + +#: builtin/grep.c:698 +msgid "print empty line between matches from different files" +msgstr "" + +#: builtin/grep.c:700 +msgid "show filename only once above matches from same file" +msgstr "" + +#: builtin/grep.c:703 +#, fuzzy +msgid "show <n> context lines before and after matches" +msgstr "<брой>" + +#: builtin/grep.c:706 +#, fuzzy +msgid "show <n> context lines before matches" +msgstr "<брой>" + +#: builtin/grep.c:708 +#, fuzzy +msgid "show <n> context lines after matches" +msgstr "<брой>" + +#: builtin/grep.c:709 +msgid "shortcut for -C NUM" +msgstr "" + +#: builtin/grep.c:712 +msgid "show a line with the function name before matches" +msgstr "" + +#: builtin/grep.c:714 +msgid "show the surrounding function" +msgstr "" + +#: builtin/grep.c:717 +msgid "read patterns from file" +msgstr "" + +#: builtin/grep.c:719 +msgid "match <pattern>" +msgstr "" + +#: builtin/grep.c:721 +msgid "combine patterns specified with -e" +msgstr "" + +#: builtin/grep.c:733 +msgid "indicate hit with exit status without output" +msgstr "" + +#: builtin/grep.c:735 +msgid "show only matches from files that match all patterns" +msgstr "" + +#: builtin/grep.c:737 +msgid "show parse tree for grep expression" +msgstr "" + +#: builtin/grep.c:741 +msgid "pager" +msgstr "" + +#: builtin/grep.c:741 +msgid "show matching files in the pager" +msgstr "" + +#: builtin/grep.c:744 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "" + +#: builtin/grep.c:745 builtin/show-ref.c:187 +msgid "show usage" +msgstr "" + +#: builtin/grep.c:812 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:870 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:893 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:898 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "" + +#: builtin/grep.c:901 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "" + +#: builtin/grep.c:909 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." +msgstr "" + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < <list-of-paths>" +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:41 +msgid "print all available commands" +msgstr "показване на всички налични команди" + +#: builtin/help.c:42 +msgid "print list of useful guides" +msgstr "показване на списък с пътеводители" + +#: builtin/help.c:43 +msgid "show man page" +msgstr "показване на страница от ръководството" + +#: builtin/help.c:44 +msgid "show manual in web browser" +msgstr "показване на страница от ръководството в уеб браузър" + +#: builtin/help.c:46 +msgid "show info page" +msgstr "показване на информационна страница" + +#: builtin/help.c:52 +msgid "git help [--all] [--guides] [--man|--web|--info] [command]" +msgstr "git help [--all] [--guides] [--man|--web|--info] [КОМАНДА]" + +#: builtin/help.c:64 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "непознат формат на помощта „%s“" + +#: builtin/help.c:92 +msgid "Failed to start emacsclient." +msgstr "Неуспешно стартиране на „emacsclient“." + +#: builtin/help.c:105 +msgid "Failed to parse emacsclient version." +msgstr "Версията на „emacsclient“ не може да се анализира." + +#: builtin/help.c:113 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)." + +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "неуспешно изпълнение на „%s“: %s" + +#: builtin/help.c:216 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" +"„%s“: път към неподдържана програма за разглеждане на\n" +" ръководството. Вместо нея пробвайте „man.<tool>.cmd“." + +#: builtin/help.c:228 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" +"„%s“: команда за поддържана програма за разглеждане на\n" +" ръководството. Вместо нея пробвайте „man.<tool>.path“." + +#: builtin/help.c:353 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "„%s“: непозната програма за преглед на ръководството." + +#: builtin/help.c:370 +msgid "no man viewer handled the request" +msgstr "никоя програма за ръководство не успя да обработи заявката" + +#: builtin/help.c:378 +msgid "no info viewer handled the request" +msgstr "никоя програма за информационни страници не успя да обработи заявката" + +#: builtin/help.c:424 +msgid "Defining attributes per path" +msgstr "Указване на атрибути към път" + +#: builtin/help.c:425 +msgid "A Git glossary" +msgstr "Речник с термините на Git" + +#: builtin/help.c:426 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани" + +#: builtin/help.c:427 +msgid "Defining submodule properties" +msgstr "Дефиниране на свойствата на подмодулите" + +#: builtin/help.c:428 +msgid "Specifying revisions and ranges for Git" +msgstr "Указване на версии и интервали в Git" + +#: builtin/help.c:429 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" +msgstr "Въвеждащ урок за Git (версии поне 1.5.1)" + +#: builtin/help.c:430 +msgid "An overview of recommended workflows with Git" +msgstr "Общ преглед на препоръчваните начини за работа с Git" + +#: builtin/help.c:442 +msgid "The common Git guides are:\n" +msgstr "Популярните пътеводители в Git са:\n" + +#: builtin/help.c:463 builtin/help.c:480 +#, c-format +msgid "usage: %s%s" +msgstr "употреба: %s%s" + +#: builtin/help.c:496 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "„git %s“ е синоним на „%s“" + +#: builtin/index-pack.c:184 +#, c-format +msgid "object type mismatch at %s" +msgstr "" + +#: builtin/index-pack.c:204 +msgid "object of unexpected type" +msgstr "" + +#: builtin/index-pack.c:244 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:254 +msgid "early EOF" +msgstr "" + +#: builtin/index-pack.c:255 +msgid "read error on input" +msgstr "" + +#: builtin/index-pack.c:267 +msgid "used more bytes than were available" +msgstr "" + +#: builtin/index-pack.c:274 +msgid "pack too large for current definition of off_t" +msgstr "" + +#: builtin/index-pack.c:290 +#, c-format +msgid "unable to create '%s'" +msgstr "" + +#: builtin/index-pack.c:295 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "" + +#: builtin/index-pack.c:309 +msgid "pack signature mismatch" +msgstr "" + +#: builtin/index-pack.c:311 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "" + +#: builtin/index-pack.c:329 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "" + +#: builtin/index-pack.c:451 +#, c-format +msgid "inflate returned %d" +msgstr "" + +#: builtin/index-pack.c:500 +msgid "offset value overflow for delta base object" +msgstr "" + +#: builtin/index-pack.c:508 +msgid "delta base offset is out of bound" +msgstr "" + +#: builtin/index-pack.c:516 +#, c-format +msgid "unknown object type %d" +msgstr "" + +#: builtin/index-pack.c:547 +msgid "cannot pread pack file" +msgstr "" + +#: builtin/index-pack.c:549 +#, c-format +msgid "premature end of pack file, %lu byte missing" +msgid_plural "premature end of pack file, %lu bytes missing" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:575 +msgid "serious inflate inconsistency" +msgstr "" + +#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 +#: builtin/index-pack.c:729 builtin/index-pack.c:738 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "" + +#: builtin/index-pack.c:669 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:263 +#, c-format +msgid "unable to read %s" +msgstr "" + +#: builtin/index-pack.c:735 +#, c-format +msgid "cannot read existing object %s" +msgstr "" + +#: builtin/index-pack.c:749 +#, c-format +msgid "invalid blob object %s" +msgstr "" + +#: builtin/index-pack.c:763 +#, c-format +msgid "invalid %s" +msgstr "" + +#: builtin/index-pack.c:766 +msgid "Error in object" +msgstr "" + +#: builtin/index-pack.c:768 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "" + +#: builtin/index-pack.c:839 builtin/index-pack.c:869 +msgid "failed to apply delta" +msgstr "" + +#: builtin/index-pack.c:1010 +msgid "Receiving objects" +msgstr "" + +#: builtin/index-pack.c:1010 +msgid "Indexing objects" +msgstr "" + +#: builtin/index-pack.c:1036 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "" + +#: builtin/index-pack.c:1041 +msgid "cannot fstat packfile" +msgstr "" + +#: builtin/index-pack.c:1044 +msgid "pack has junk at the end" +msgstr "" + +#: builtin/index-pack.c:1055 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "" + +#: builtin/index-pack.c:1078 +msgid "Resolving deltas" +msgstr "" + +#: builtin/index-pack.c:1088 +#, c-format +msgid "unable to create thread: %s" +msgstr "" + +#: builtin/index-pack.c:1130 +msgid "confusion beyond insanity" +msgstr "" + +#: builtin/index-pack.c:1138 +#, c-format +msgid "completed with %d local objects" +msgstr "" + +#: builtin/index-pack.c:1148 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "" + +#: builtin/index-pack.c:1152 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1177 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "" + +#: builtin/index-pack.c:1256 +#, c-format +msgid "local object %s is corrupt" +msgstr "" + +#: builtin/index-pack.c:1280 +msgid "error while closing pack file" +msgstr "" + +#: builtin/index-pack.c:1293 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "" + +#: builtin/index-pack.c:1301 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "" + +#: builtin/index-pack.c:1314 +msgid "cannot store pack file" +msgstr "" + +#: builtin/index-pack.c:1325 +msgid "cannot store index file" +msgstr "" + +#: builtin/index-pack.c:1358 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "" + +#: builtin/index-pack.c:1364 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "" + +#: builtin/index-pack.c:1368 builtin/index-pack.c:1546 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "" + +#: builtin/index-pack.c:1426 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "" + +#: builtin/index-pack.c:1428 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "" + +#: builtin/index-pack.c:1475 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1482 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1510 +msgid "Cannot come back to cwd" +msgstr "" + +#: builtin/index-pack.c:1558 builtin/index-pack.c:1561 +#: builtin/index-pack.c:1573 builtin/index-pack.c:1577 +#, c-format +msgid "bad %s" +msgstr "" + +#: builtin/index-pack.c:1591 +msgid "--fix-thin cannot be used without --stdin" +msgstr "" + +#: builtin/index-pack.c:1595 builtin/index-pack.c:1605 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "" + +#: builtin/index-pack.c:1614 +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 "" + +#. +#. * 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=<template-directory>] [--" +"shared[=<permissions>]] [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:79 builtin/repack.c:155 +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=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +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:41 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" +msgstr "" + +#: builtin/log.c:42 +msgid " or: git show [options] <object>..." +msgstr "" + +#: builtin/log.c:125 +msgid "suppress diff output" +msgstr "" + +#: builtin/log.c:126 +msgid "show source" +msgstr "" + +#: builtin/log.c:127 +msgid "Use mail map file" +msgstr "" + +#: builtin/log.c:128 +msgid "decorate options" +msgstr "" + +#: builtin/log.c:231 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:473 builtin/log.c:565 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:589 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:689 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:771 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:787 +#, c-format +msgid "Cannot open patch file %s" +msgstr "" + +#: builtin/log.c:801 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:809 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:911 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:987 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:1015 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "" + +#: builtin/log.c:1060 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1175 +msgid "use [PATCH n/m] even with a single patch" +msgstr "" + +#: builtin/log.c:1178 +msgid "use [PATCH] even with multiple patches" +msgstr "" + +#: builtin/log.c:1182 +msgid "print patches to standard out" +msgstr "" + +#: builtin/log.c:1184 +msgid "generate a cover letter" +msgstr "" + +#: builtin/log.c:1186 +msgid "use simple number sequence for output file names" +msgstr "" + +#: builtin/log.c:1187 +msgid "sfx" +msgstr "" + +#: builtin/log.c:1188 +msgid "use <sfx> instead of '.patch'" +msgstr "" + +#: builtin/log.c:1190 +#, fuzzy +msgid "start numbering patches at <n> instead of 1" +msgstr "<брой>" + +#: builtin/log.c:1192 +msgid "mark the series as Nth re-roll" +msgstr "" + +#: builtin/log.c:1194 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "" + +#: builtin/log.c:1197 +msgid "store resulting files in <dir>" +msgstr "" + +#: builtin/log.c:1200 +msgid "don't strip/add [PATCH]" +msgstr "" + +#: builtin/log.c:1203 +msgid "don't output binary diffs" +msgstr "" + +#: builtin/log.c:1205 +msgid "don't include a patch matching a commit upstream" +msgstr "" + +#: builtin/log.c:1207 +msgid "show patch format instead of default (patch + stat)" +msgstr "" + +#: builtin/log.c:1209 +msgid "Messaging" +msgstr "" + +#: builtin/log.c:1210 +msgid "header" +msgstr "" + +#: builtin/log.c:1211 +msgid "add email header" +msgstr "" + +#: builtin/log.c:1212 builtin/log.c:1214 +msgid "email" +msgstr "" + +#: builtin/log.c:1212 +msgid "add To: header" +msgstr "" + +#: builtin/log.c:1214 +msgid "add Cc: header" +msgstr "" + +#: builtin/log.c:1216 +msgid "ident" +msgstr "" + +#: builtin/log.c:1217 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "" + +#: builtin/log.c:1219 +msgid "message-id" +msgstr "" + +#: builtin/log.c:1220 +msgid "make first mail a reply to <message-id>" +msgstr "" + +#: builtin/log.c:1221 builtin/log.c:1224 +msgid "boundary" +msgstr "" + +#: builtin/log.c:1222 +msgid "attach the patch" +msgstr "" + +#: builtin/log.c:1225 +msgid "inline the patch" +msgstr "" + +#: builtin/log.c:1229 +msgid "enable message threading, styles: shallow, deep" +msgstr "" + +#: builtin/log.c:1231 +msgid "signature" +msgstr "" + +#: builtin/log.c:1232 +msgid "add a signature" +msgstr "" + +#: builtin/log.c:1233 +msgid "don't print the patch filenames" +msgstr "" + +#: builtin/log.c:1307 +#, c-format +msgid "invalid ident line: %s" +msgstr "" + +#: builtin/log.c:1322 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1324 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1332 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1334 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1336 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1359 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1361 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1509 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1558 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "" + +#: builtin/log.c:1613 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" + +#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/ls-files.c:398 +msgid "git ls-files [options] [<file>...]" +msgstr "" + +#: builtin/ls-files.c:455 +msgid "identify the file status with tags" +msgstr "" + +#: builtin/ls-files.c:457 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "" + +#: builtin/ls-files.c:459 +msgid "show cached files in the output (default)" +msgstr "" + +#: builtin/ls-files.c:461 +msgid "show deleted files in the output" +msgstr "" + +#: builtin/ls-files.c:463 +msgid "show modified files in the output" +msgstr "" + +#: builtin/ls-files.c:465 +msgid "show other files in the output" +msgstr "" + +#: builtin/ls-files.c:467 +msgid "show ignored files in the output" +msgstr "" + +#: builtin/ls-files.c:470 +msgid "show staged contents' object name in the output" +msgstr "" + +#: builtin/ls-files.c:472 +msgid "show files on the filesystem that need to be removed" +msgstr "" + +#: builtin/ls-files.c:474 +msgid "show 'other' directories' name only" +msgstr "" + +#: builtin/ls-files.c:477 +msgid "don't show empty directories" +msgstr "" + +#: builtin/ls-files.c:480 +msgid "show unmerged files in the output" +msgstr "" + +#: builtin/ls-files.c:482 +msgid "show resolve-undo information" +msgstr "" + +#: builtin/ls-files.c:484 +msgid "skip files matching pattern" +msgstr "" + +#: builtin/ls-files.c:487 +msgid "exclude patterns are read from <file>" +msgstr "" + +#: builtin/ls-files.c:490 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "" + +#: builtin/ls-files.c:492 +msgid "add the standard git exclusions" +msgstr "" + +#: builtin/ls-files.c:495 +msgid "make the output relative to the project top directory" +msgstr "" + +#: builtin/ls-files.c:498 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "" + +#: builtin/ls-files.c:499 +msgid "tree-ish" +msgstr "" + +#: builtin/ls-files.c:500 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "" + +#: builtin/ls-files.c:502 +msgid "show debugging data" +msgstr "" + +#: builtin/ls-tree.c:28 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "" + +#: builtin/ls-tree.c:126 +msgid "only show trees" +msgstr "" + +#: builtin/ls-tree.c:128 +msgid "recurse into subtrees" +msgstr "" + +#: builtin/ls-tree.c:130 +msgid "show trees when recursing" +msgstr "" + +#: builtin/ls-tree.c:133 +msgid "terminate entries with NUL byte" +msgstr "" + +#: builtin/ls-tree.c:134 +msgid "include object size" +msgstr "" + +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +msgid "list only filenames" +msgstr "" + +#: builtin/ls-tree.c:141 +msgid "use full path names" +msgstr "" + +#: builtin/ls-tree.c:143 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "" + +#: builtin/merge.c:43 +msgid "git merge [options] [<commit>...]" +msgstr "" + +#: builtin/merge.c:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "" + +#: builtin/merge.c:98 +msgid "switch `m' requires a value" +msgstr "" + +#: builtin/merge.c:135 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:136 +#, c-format +msgid "Available strategies are:" +msgstr "" + +#: builtin/merge.c:141 +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +#: builtin/merge.c:191 +msgid "do not show a diffstat at the end of the merge" +msgstr "" + +#: builtin/merge.c:194 +msgid "show a diffstat at the end of the merge" +msgstr "" + +#: builtin/merge.c:195 +msgid "(synonym to --stat)" +msgstr "" + +#: builtin/merge.c:197 +#, fuzzy +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "<брой>" + +#: builtin/merge.c:200 +msgid "create a single commit instead of doing a merge" +msgstr "" + +#: builtin/merge.c:202 +msgid "perform a commit if the merge succeeds (default)" +msgstr "" + +#: builtin/merge.c:204 +msgid "edit message before committing" +msgstr "" + +#: builtin/merge.c:205 +msgid "allow fast-forward (default)" +msgstr "" + +#: builtin/merge.c:207 +msgid "abort if fast-forward is not possible" +msgstr "" + +#: builtin/merge.c:211 +msgid "Verify that the named commit has a valid GPG signature" +msgstr "" + +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 +msgid "strategy" +msgstr "" + +#: builtin/merge.c:213 +msgid "merge strategy to use" +msgstr "" + +#: builtin/merge.c:214 +msgid "option=value" +msgstr "" + +#: builtin/merge.c:215 +msgid "option for selected merge strategy" +msgstr "" + +#: builtin/merge.c:217 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "" + +#: builtin/merge.c:221 +msgid "abort the current in-progress merge" +msgstr "" + +#: builtin/merge.c:250 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:255 +msgid "stash failed" +msgstr "" + +#: builtin/merge.c:260 +#, c-format +msgid "not a valid object: %s" +msgstr "" + +#: builtin/merge.c:279 builtin/merge.c:296 +msgid "read-tree failed" +msgstr "" + +#: builtin/merge.c:326 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:339 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:371 +msgid "Writing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:373 +msgid "Finishing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:396 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:446 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:558 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:650 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:678 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:692 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:706 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:795 +#, c-format +msgid "Could not read from '%s'" +msgstr "" + +#: builtin/merge.c:804 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" + +#: builtin/merge.c:810 +#, c-format +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 '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" + +#: builtin/merge.c:834 +msgid "Empty commit message." +msgstr "" + +#: builtin/merge.c:846 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:911 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:927 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:968 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:970 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:972 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:977 +#, c-format +msgid "No remote-tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1133 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1149 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:1152 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1156 +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:1159 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1168 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:1177 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" + +#: builtin/merge.c:1209 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1212 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1214 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1219 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1270 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" + +#: builtin/merge.c:1273 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" + +#. 'N' +#: builtin/merge.c:1276 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "" + +#: builtin/merge.c:1279 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "" + +#: builtin/merge.c:1363 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1402 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1409 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1441 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1464 builtin/merge.c:1543 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1468 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1534 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1536 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1545 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1557 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" + +#: builtin/merge-base.c:29 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "" + +#: builtin/merge-base.c:30 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "" + +#: builtin/merge-base.c:31 +msgid "git merge-base --independent <commit>..." +msgstr "" + +#: builtin/merge-base.c:32 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "" + +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "" + +#: builtin/merge-base.c:214 +msgid "output all common ancestors" +msgstr "" + +#: builtin/merge-base.c:216 +msgid "find ancestors for a single n-way merge" +msgstr "" + +#: builtin/merge-base.c:218 +msgid "list revs not reachable from others" +msgstr "" + +#: builtin/merge-base.c:220 +msgid "is the first one ancestor of the other?" +msgstr "" + +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +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:15 +msgid "git mv [options] <source>... <destination>" +msgstr "" + +#: builtin/mv.c:71 +msgid "force move/rename even if target exists" +msgstr "" + +#: builtin/mv.c:72 +msgid "skip move/rename errors" +msgstr "" + +#: builtin/mv.c:122 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "" + +#: builtin/mv.c:126 +msgid "bad source" +msgstr "" + +#: builtin/mv.c:129 +msgid "can not move directory into itself" +msgstr "" + +#: builtin/mv.c:132 +msgid "cannot move directory over file" +msgstr "" + +#: builtin/mv.c:138 +#, c-format +msgid "Huh? Directory %s is in index and no submodule?" +msgstr "" + +#: builtin/mv.c:140 builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"За да продължите или вкарайте промените по файла „.gitmodules“ в индекса, " +"или\n" +"ги скътайте" + +#: builtin/mv.c:156 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "" + +#: builtin/mv.c:168 +msgid "source directory is empty" +msgstr "" + +#: builtin/mv.c:200 +msgid "not under version control" +msgstr "" + +#: builtin/mv.c:202 +msgid "destination exists" +msgstr "" + +#: builtin/mv.c:210 +#, c-format +msgid "overwriting '%s'" +msgstr "" + +#: builtin/mv.c:213 +msgid "Cannot overwrite" +msgstr "" + +#: builtin/mv.c:216 +msgid "multiple sources for the same target" +msgstr "" + +#: builtin/mv.c:218 +msgid "destination directory does not exist" +msgstr "" + +#: builtin/mv.c:233 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "" + +#: builtin/mv.c:243 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "" + +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 +#, c-format +msgid "renaming '%s' failed" +msgstr "неуспешно преименуване на „%s“" + +#: builtin/name-rev.c:258 +msgid "git name-rev [options] <commit>..." +msgstr "" + +#: builtin/name-rev.c:259 +msgid "git name-rev [options] --all" +msgstr "" + +#: builtin/name-rev.c:260 +msgid "git name-rev [options] --stdin" +msgstr "" + +# FIXME +#: builtin/name-rev.c:312 +msgid "print only names (no SHA-1)" +msgstr "" + +#: builtin/name-rev.c:313 +msgid "only use tags to name the commits" +msgstr "" + +#: builtin/name-rev.c:315 +msgid "only use refs matching <pattern>" +msgstr "" + +#: builtin/name-rev.c:317 +msgid "list all commits reachable from all refs" +msgstr "" + +#: builtin/name-rev.c:318 +msgid "read from stdin" +msgstr "" + +#: builtin/name-rev.c:319 +msgid "allow to print `undefined` names (default)" +msgstr "" + +#: builtin/name-rev.c:325 +msgid "dereference tags in the input (internal use)" +msgstr "" + +#: builtin/notes.c:24 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "" + +#: builtin/notes.c:25 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "" + +#: builtin/notes.c:29 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "" + +#: builtin/notes.c:30 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "" + +#: builtin/notes.c:31 +msgid "git notes merge --commit [-v | -q]" +msgstr "" + +#: builtin/notes.c:32 +msgid "git notes merge --abort [-v | -q]" +msgstr "" + +#: builtin/notes.c:33 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "" + +#: builtin/notes.c:34 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "" + +#: builtin/notes.c:40 +msgid "git notes [list [<object>]]" +msgstr "" + +#: builtin/notes.c:45 +msgid "git notes add [<options>] [<object>]" +msgstr "" + +#: builtin/notes.c:50 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "" + +#: builtin/notes.c:51 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "" + +#: builtin/notes.c:56 +msgid "git notes append [<options>] [<object>]" +msgstr "" + +#: builtin/notes.c:61 +msgid "git notes edit [<object>]" +msgstr "" + +#: builtin/notes.c:66 +msgid "git notes show [<object>]" +msgstr "" + +#: builtin/notes.c:71 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "" + +#: builtin/notes.c:72 +msgid "git notes merge --commit [<options>]" +msgstr "" + +#: builtin/notes.c:73 +msgid "git notes merge --abort [<options>]" +msgstr "" + +#: builtin/notes.c:78 +msgid "git notes remove [<object>]" +msgstr "" + +#: builtin/notes.c:83 +msgid "git notes prune [<options>]" +msgstr "" + +#: builtin/notes.c:88 +msgid "git notes get-ref" +msgstr "" + +#: builtin/notes.c:137 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:141 +msgid "could not read 'show' output" +msgstr "" + +#: builtin/notes.c:149 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:167 builtin/tag.c:341 +#, c-format +msgid "could not create file '%s'" +msgstr "" + +#: builtin/notes.c:186 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:207 builtin/notes.c:844 +#, c-format +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:212 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:214 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:248 builtin/tag.c:537 +#, c-format +msgid "cannot read '%s'" +msgstr "" + +#: builtin/notes.c:250 builtin/tag.c:540 +#, c-format +msgid "could not open or read '%s'" +msgstr "" + +#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 +#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 +#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 +#: builtin/notes.c:839 builtin/tag.c:553 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:272 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:312 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:327 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "" + +#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 +#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 +#: builtin/notes.c:904 +msgid "too many parameters" +msgstr "" + +#: builtin/notes.c:384 builtin/notes.c:643 +#, c-format +msgid "No note found for object %s." +msgstr "" + +#: builtin/notes.c:406 builtin/notes.c:563 +msgid "note contents as a string" +msgstr "" + +#: builtin/notes.c:409 builtin/notes.c:566 +msgid "note contents in a file" +msgstr "" + +#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 +#: builtin/notes.c:571 builtin/tag.c:474 +msgid "object" +msgstr "" + +#: builtin/notes.c:412 builtin/notes.c:569 +msgid "reuse and edit specified note object" +msgstr "" + +#: builtin/notes.c:415 builtin/notes.c:572 +msgid "reuse specified note object" +msgstr "" + +#: builtin/notes.c:417 builtin/notes.c:485 +msgid "replace existing notes" +msgstr "" + +#: builtin/notes.c:451 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:456 builtin/notes.c:533 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:486 +msgid "read objects from stdin" +msgstr "" + +#: builtin/notes.c:488 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "" + +#: builtin/notes.c:506 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:527 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:539 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:588 +#, c-format +msgid "" +"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" +"Please use 'git notes add -f -m/-F/-c/-C' instead.\n" +msgstr "" + +#: builtin/notes.c:735 +msgid "General options" +msgstr "" + +#: builtin/notes.c:737 +msgid "Merge options" +msgstr "" + +#: builtin/notes.c:739 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" + +#: builtin/notes.c:741 +msgid "Committing unmerged notes" +msgstr "" + +#: builtin/notes.c:743 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" + +#: builtin/notes.c:745 +msgid "Aborting notes merge resolution" +msgstr "" + +#: builtin/notes.c:747 +msgid "abort notes merge" +msgstr "" + +#: builtin/notes.c:842 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:854 +msgid "attempt to remove non-existent note is not an error" +msgstr "" + +#: builtin/notes.c:857 +msgid "read object names from the standard input" +msgstr "" + +#: builtin/notes.c:938 +msgid "notes_ref" +msgstr "" + +#: builtin/notes.c:939 +msgid "use notes from <notes_ref>" +msgstr "" + +#: builtin/notes.c:974 builtin/remote.c:1593 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Непозната подкоманда: %s" + +#: 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:184 builtin/pack-objects.c:187 +#, c-format +msgid "deflate error (%d)" +msgstr "" + +#: builtin/pack-objects.c:2396 +#, c-format +msgid "unsupported index version %s" +msgstr "" + +#: builtin/pack-objects.c:2400 +#, c-format +msgid "bad index version '%s'" +msgstr "" + +#: builtin/pack-objects.c:2423 +#, c-format +msgid "option %s does not accept negative form" +msgstr "" + +#: builtin/pack-objects.c:2427 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "" + +#: builtin/pack-objects.c:2446 +msgid "do not show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2448 +msgid "show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2450 +msgid "show progress meter during object writing phase" +msgstr "" + +#: builtin/pack-objects.c:2453 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +#: builtin/pack-objects.c:2454 +msgid "version[,offset]" +msgstr "" + +#: builtin/pack-objects.c:2455 +msgid "write the pack index file in the specified idx format version" +msgstr "" + +#: builtin/pack-objects.c:2458 +msgid "maximum size of each output pack file" +msgstr "" + +#: builtin/pack-objects.c:2460 +msgid "ignore borrowed objects from alternate object store" +msgstr "" + +#: builtin/pack-objects.c:2462 +msgid "ignore packed objects" +msgstr "" + +#: builtin/pack-objects.c:2464 +msgid "limit pack window by objects" +msgstr "" + +#: builtin/pack-objects.c:2466 +msgid "limit pack window by memory in addition to object limit" +msgstr "" + +#: builtin/pack-objects.c:2468 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "" + +#: builtin/pack-objects.c:2470 +msgid "reuse existing deltas" +msgstr "" + +#: builtin/pack-objects.c:2472 +msgid "reuse existing objects" +msgstr "" + +#: builtin/pack-objects.c:2474 +msgid "use OFS_DELTA objects" +msgstr "" + +#: builtin/pack-objects.c:2476 +msgid "use threads when searching for best delta matches" +msgstr "" + +#: builtin/pack-objects.c:2478 +msgid "do not create an empty pack output" +msgstr "" + +#: builtin/pack-objects.c:2480 +msgid "read revision arguments from standard input" +msgstr "" + +#: builtin/pack-objects.c:2482 +msgid "limit the objects to those that are not yet packed" +msgstr "" + +#: builtin/pack-objects.c:2485 +msgid "include objects reachable from any reference" +msgstr "" + +#: builtin/pack-objects.c:2488 +msgid "include objects referred by reflog entries" +msgstr "" + +#: builtin/pack-objects.c:2491 +msgid "output pack to stdout" +msgstr "" + +#: builtin/pack-objects.c:2493 +msgid "include tag objects that refer to objects to be packed" +msgstr "" + +#: builtin/pack-objects.c:2495 +msgid "keep unreachable objects" +msgstr "" + +#: builtin/pack-objects.c:2496 parse-options.h:143 +msgid "time" +msgstr "време" + +#: builtin/pack-objects.c:2497 +msgid "unpack unreachable objects newer than <time>" +msgstr "" + +#: builtin/pack-objects.c:2500 +msgid "create thin packs" +msgstr "" + +#: builtin/pack-objects.c:2502 +msgid "ignore packs that have companion .keep file" +msgstr "" + +#: builtin/pack-objects.c:2504 +msgid "pack compression level" +msgstr "" + +#: builtin/pack-objects.c:2506 +msgid "do not hide commits by grafts" +msgstr "" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "" + +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgstr "" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "" + +#: builtin/prune.c:142 +msgid "do not remove, show only" +msgstr "" + +#: builtin/prune.c:143 +msgid "report pruned objects" +msgstr "" + +#: builtin/prune.c:146 +msgid "expire objects older than <time>" +msgstr "" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "" + +#: builtin/push.c:86 +msgid "tag shorthand without <tag>" +msgstr "" + +#: builtin/push.c:96 +msgid "--delete only accepts plain target ref names" +msgstr "" + +#: builtin/push.c:141 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" + +#: builtin/push.c:144 +#, c-format +msgid "" +"The upstream branch of your current branch does not match\n" +"the name of your current branch. To push to the upstream branch\n" +"on the remote, use\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"To push to the branch of the same name on the remote, use\n" +"\n" +" git push %s %s\n" +"%s" +msgstr "" + +#: builtin/push.c:159 +#, c-format +msgid "" +"You are not currently on a branch.\n" +"To push the history leading to the current (detached HEAD)\n" +"state now, use\n" +"\n" +" git push %s HEAD:<name-of-remote-branch>\n" +msgstr "" + +#: builtin/push.c:173 +#, c-format +msgid "" +"The current branch %s has no upstream branch.\n" +"To push the current branch and set the remote as upstream, use\n" +"\n" +" git push --set-upstream %s %s\n" +msgstr "" + +#: builtin/push.c:181 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "" + +#: builtin/push.c:184 +#, c-format +msgid "" +"You are pushing to remote '%s', which is not the upstream of\n" +"your current branch '%s', without telling me what to push\n" +"to update which remote branch." +msgstr "" + +#: builtin/push.c:207 +msgid "" +"push.default is unset; its implicit value is changing in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the current behavior after the default changes, use:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"To squelch this message and adopt the new behavior now, use:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"In Git 2.0, Git will default to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" +"See 'git help config' and search for 'push.default' for further " +"information.\n" +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +"'current' instead of 'simple' if you sometimes use older versions of Git)" +msgstr "" + +#: builtin/push.c:274 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" + +#: builtin/push.c:281 +msgid "" +"Updates were rejected because the tip of your current branch is behind\n" +"its remote counterpart. Integrate the remote changes (e.g.\n" +"'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:287 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. If you did not intend to push that branch, you may want to\n" +"specify branches to push or set the 'push.default' configuration variable\n" +"to 'simple', 'current' or 'upstream' to push only the current branch." +msgstr "" + +#: builtin/push.c:293 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. Check out this branch and integrate the remote changes\n" +"(e.g. 'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:299 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first integrate the remote changes\n" +"(e.g., 'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:306 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "" + +#: builtin/push.c:309 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" + +#: builtin/push.c:375 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:379 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:412 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:413 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" + +#: builtin/push.c:428 +msgid "--all and --tags are incompatible" +msgstr "" + +#: builtin/push.c:429 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:434 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:435 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:440 +msgid "--all and --mirror are incompatible" +msgstr "" + +#: builtin/push.c:500 +msgid "repository" +msgstr "" + +#: builtin/push.c:501 +msgid "push all refs" +msgstr "" + +#: builtin/push.c:502 +msgid "mirror all refs" +msgstr "" + +#: builtin/push.c:504 +msgid "delete refs" +msgstr "" + +#: builtin/push.c:505 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "" + +#: builtin/push.c:508 +msgid "force updates" +msgstr "" + +#: builtin/push.c:510 +msgid "refname>:<expect" +msgstr "" + +#: builtin/push.c:511 +msgid "require old value of ref to be at this value" +msgstr "" + +#: builtin/push.c:513 +msgid "check" +msgstr "" + +#: builtin/push.c:514 +msgid "control recursive pushing of submodules" +msgstr "" + +#: builtin/push.c:516 +msgid "use thin pack" +msgstr "" + +#: builtin/push.c:517 builtin/push.c:518 +msgid "receive pack program" +msgstr "" + +#: builtin/push.c:519 +msgid "set upstream for git pull/status" +msgstr "" + +#: builtin/push.c:522 +msgid "prune locally removed refs" +msgstr "" + +#: builtin/push.c:524 +msgid "bypass pre-push hook" +msgstr "" + +#: builtin/push.c:525 +msgid "push missing but relevant tags" +msgstr "" + +#: builtin/push.c:535 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:537 +msgid "--delete doesn't make sense without any refs" +msgstr "" + +#: builtin/read-tree.c:36 +msgid "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "" + +#: builtin/read-tree.c:109 +msgid "write resulting index to <file>" +msgstr "" + +#: builtin/read-tree.c:112 +msgid "only empty the index" +msgstr "" + +#: builtin/read-tree.c:114 +msgid "Merging" +msgstr "" + +#: builtin/read-tree.c:116 +msgid "perform a merge in addition to a read" +msgstr "" + +#: builtin/read-tree.c:118 +msgid "3-way merge if no file level merging required" +msgstr "" + +#: builtin/read-tree.c:120 +msgid "3-way merge in presence of adds and removes" +msgstr "" + +#: builtin/read-tree.c:122 +msgid "same as -m, but discard unmerged entries" +msgstr "" + +#: builtin/read-tree.c:123 +msgid "<subdirectory>/" +msgstr "" + +#: builtin/read-tree.c:124 +msgid "read the tree into the index under <subdirectory>/" +msgstr "" + +#: builtin/read-tree.c:127 +msgid "update working tree with merge result" +msgstr "" + +#: builtin/read-tree.c:129 +msgid "gitignore" +msgstr "" + +#: builtin/read-tree.c:130 +msgid "allow explicitly ignored files to be overwritten" +msgstr "" + +#: builtin/read-tree.c:133 +msgid "don't check the working tree after merging" +msgstr "" + +#: builtin/read-tree.c:134 +msgid "don't update the index or the work tree" +msgstr "" + +#: builtin/read-tree.c:136 +msgid "skip applying sparse checkout filter" +msgstr "" + +#: builtin/read-tree.c:138 +msgid "debug unpack-trees" +msgstr "" + +# FIXME +#: builtin/reflog.c:499 +#, c-format +msgid "%s' for '%s' is not a valid timestamp" +msgstr "„%s“ не е правилна стойност за време за „%s“" + +#: builtin/reflog.c:615 builtin/reflog.c:620 +#, c-format +msgid "'%s' is not a valid timestamp" +msgstr "„%s“ не е правилна стойност за време" + +#: builtin/remote.c:12 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:13 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" +"git remote add [-t <КЛОН>] [-m <ОСНОВЕН_КЛОН>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <ИМЕ> <АДРЕС>" + +#: builtin/remote.c:14 builtin/remote.c:33 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <СТАРО_ИМЕ> <НОВО_ИМЕ>" + +#: builtin/remote.c:15 builtin/remote.c:38 +msgid "git remote remove <name>" +msgstr "git remote remove <ИМЕ>" + +#: builtin/remote.c:16 +msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +msgstr "git remote set-head <ИМЕ> (-a | --auto | -d | --delete |<КЛОН>)" + +#: builtin/remote.c:17 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <ИМЕ>" + +#: builtin/remote.c:18 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <ИМЕ>" + +#: builtin/remote.c:19 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<ГРУПА> | " +"<ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ>)…]" + +#: builtin/remote.c:20 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <ИМЕ> <КЛОН>…" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <ИМЕ> <НОВ_АДРЕС> [<СТАР_АДРЕС>]" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <ИМЕ> <НОВ_АДРЕС>" + +#: builtin/remote.c:23 builtin/remote.c:71 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <ИМЕ> <АДРЕС>" + +#: builtin/remote.c:28 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<ОПЦИИ>] <ИМЕ> <АДРЕС>" + +#: builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "git remote set-head <ИМЕ> (-a | --auto | -d | --delete | <КЛОН>)" + +#: builtin/remote.c:48 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <ИМЕ> <КЛОН>…" + +#: builtin/remote.c:49 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <ИМЕ> <КЛОН>…" + +#: builtin/remote.c:54 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<ОПЦИИ>] <ИМЕ>" + +#: builtin/remote.c:59 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<ОПЦИИ>] <ИМЕ>" + +#: builtin/remote.c:64 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<ОПЦИИ>] [<ГРУПА> | <ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ>]…" + +#: builtin/remote.c:88 +#, c-format +msgid "Updating %s" +msgstr "Обновяване на „%s“" + +#: builtin/remote.c:120 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "" +"Използването само на „--mirror“ е опасно. Вместо това\n" +"\tползвайте „--mirror=fetch“ или „--mirror=push“" + +#: builtin/remote.c:137 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "неправилна стойност за „--mirror“: %s" + +#: builtin/remote.c:153 +msgid "fetch the remote branches" +msgstr "отдалечените клони не могат да бъдат доставени" + +#: builtin/remote.c:155 +msgid "import all tags and associated objects when fetching" +msgstr "внасяне на всички етикети и принадлежащите им обекти при доставяне" + +#: builtin/remote.c:158 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "може и да не се доставят никакви етикети (чрез опцията „--no-tags“)" + +#: builtin/remote.c:160 +msgid "branch(es) to track" +msgstr "клон/и за следене" + +#: builtin/remote.c:161 +msgid "master branch" +msgstr "основен клон" + +#: builtin/remote.c:162 +msgid "push|fetch" +msgstr "издърпване|доставяне" + +#: builtin/remote.c:163 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "" +"настройване на отдалечено хранилище, от което да се издърпва или доставя" + +#: builtin/remote.c:175 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "" +"няма смисъл да се указва основен клон при използване на опцията „--mirror“" + +#: builtin/remote.c:177 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "" +"указването на следени клони е смислено само за отдалечени хранилища, от " +"които се доставя" + +#: builtin/remote.c:185 builtin/remote.c:641 +#, c-format +msgid "remote %s already exists." +msgstr "вече съществува отдалечено хранилище с име „%s“." + +#: builtin/remote.c:189 builtin/remote.c:645 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "„%s“ е неправилно име за отдалечено хранилище" + +#: builtin/remote.c:233 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Основният клон „%s“ не може да бъде настроен" + +#: builtin/remote.c:289 +#, c-format +msgid "more than one %s" +msgstr "повече от едно отдалечено хранилище на име „%s“" + +#: builtin/remote.c:334 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "Обектите за доставяне за указателя „%s“ не могат да бъдат получени" + +#: builtin/remote.c:435 builtin/remote.c:443 +msgid "(matching)" +msgstr "(съвпадащи)" + +#: builtin/remote.c:447 +msgid "(delete)" +msgstr "(за изтриване)" + +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "„%s“ не може да се добави към „%s“" + +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 +#, c-format +msgid "No such remote: %s" +msgstr "Такова отдалечено хранилище няма: %s" + +#: builtin/remote.c:651 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Секцията в настройките „%s“ не може да бъде преименувана на „%s“" + +#: builtin/remote.c:657 builtin/remote.c:794 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Секцията в настройките „%s“ не може да бъде изтрита" + +# FIXME +#: builtin/remote.c:672 +#, c-format +msgid "" +"Not updating non-default fetch refspec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "" +"Нестандартните указатели за доставяне няма да бъдат обновени\n" +" %s\n" +" Променете настройките ръчно, ако е необходимо." + +#: builtin/remote.c:678 +#, c-format +msgid "Could not append '%s'" +msgstr "Секцията „%s“ не може да бъде добавена в настройките" + +#: builtin/remote.c:689 +#, c-format +msgid "Could not set '%s'" +msgstr "Секцията „%s“ не може да бъде зададена в настройките" + +#: builtin/remote.c:711 +#, c-format +msgid "deleting '%s' failed" +msgstr "неуспешно изтриване на „%s“" + +#: builtin/remote.c:745 +#, c-format +msgid "creating '%s' failed" +msgstr "неуспешно създаване на „%s“" + +#: builtin/remote.c:759 +#, c-format +msgid "Could not remove branch %s" +msgstr "Клонът „%s“ не може да бъде изтрит" + +#: builtin/remote.c:829 +msgid "" +"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" +"to delete it, use:" +msgid_plural "" +"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" +"to delete them, use:" +msgstr[0] "" +"Бележка: Клон извън йерархията „refs/remotes/“ не бе изтрит.\n" +"Изтрийте го чрез командата:" +msgstr[1] "" +"Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n" +"Изтрийте ги чрез командата:" + +#: builtin/remote.c:938 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)" + +#: builtin/remote.c:941 +msgid " tracked" +msgstr " следен" + +#: builtin/remote.c:943 +msgid " stale (use 'git remote prune' to remove)" +msgstr " стар (изтрийте чрез „git remote prune“)" + +#: builtin/remote.c:945 +msgid " ???" +msgstr " неясно" + +# CHECK +#: builtin/remote.c:986 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "" +"неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече от " +"1 клон" + +#: builtin/remote.c:993 +#, c-format +msgid "rebases onto remote %s" +msgstr "пребазиране върху отдалечения клон „%s“" + +#: builtin/remote.c:996 +#, c-format +msgid " merges with remote %s" +msgstr " сливане с отдалечения клон „%s“" + +#: builtin/remote.c:997 +msgid " and with remote" +msgstr " и с отдалечения клон" + +#: builtin/remote.c:999 +#, c-format +msgid "merges with remote %s" +msgstr "сливане с отдалечения клон „%s“" + +#: builtin/remote.c:1000 +msgid " and with remote" +msgstr " и с отдалечения клон" + +#: builtin/remote.c:1046 +msgid "create" +msgstr "създаден" + +#: builtin/remote.c:1049 +msgid "delete" +msgstr "изтрит" + +#: builtin/remote.c:1053 +msgid "up to date" +msgstr "актуален" + +#: builtin/remote.c:1056 +msgid "fast-forwardable" +msgstr "може да се слее тривиално" + +#: builtin/remote.c:1059 +msgid "local out of date" +msgstr "локалният е остарял" + +#: builtin/remote.c:1066 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s принудително изтласква към %-*s (%s)" + +#: builtin/remote.c:1069 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s изтласква към %-*s (%s)" + +#: builtin/remote.c:1073 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s принудително изтласква към %s" + +#: builtin/remote.c:1076 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s изтласква към %s" + +#: builtin/remote.c:1144 +msgid "do not query remotes" +msgstr "без заявки към отдалечените хранилища" + +#: builtin/remote.c:1171 +#, c-format +msgid "* remote %s" +msgstr "* отдалечено хранилище „%s“" + +#: builtin/remote.c:1172 +#, c-format +msgid " Fetch URL: %s" +msgstr " Адрес за доставяне: %s" + +#: builtin/remote.c:1173 builtin/remote.c:1318 +msgid "(no URL)" +msgstr "(без адрес)" + +#: builtin/remote.c:1182 builtin/remote.c:1184 +#, c-format +msgid " Push URL: %s" +msgstr " Адрес за изтласкване: %s" + +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 +#, c-format +msgid " HEAD branch: %s" +msgstr " клон в HEAD: %s" + +#: builtin/remote.c:1192 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" +" клон в HEAD (клонът указан във файла HEAD от отдалеченото хранилище е\n" +" нееднозначен и е някой от следните):\n" + +#: builtin/remote.c:1204 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Отдалечен клон: %s" +msgstr[1] " Отдалечени клони: %s" + +#: builtin/remote.c:1207 builtin/remote.c:1234 +msgid " (status not queried)" +msgstr " (състоянието не бе проверено)" + +#: builtin/remote.c:1216 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Локален клон настроен за издърпване чрез „git pull“:" +msgstr[1] " Локални клони настроени за издърпване чрез „git pull“:" + +#: builtin/remote.c:1224 +msgid " Local refs will be mirrored by 'git push'" +msgstr " Локалните указатели ще бъдат пренесени чрез „ push“" + +#: builtin/remote.c:1231 +#, c-format +msgid " Local ref configured for 'git push'%s:" +msgid_plural " Local refs configured for 'git push'%s:" +msgstr[0] " Локалният указател, настроен за „git push“%s:" +msgstr[1] " Локалните указатели, настроени за „git push“%s:" + +#: builtin/remote.c:1252 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "задаване на refs/remotes/<ИМЕ>/HEAD според отдалеченото хранилище" + +#: builtin/remote.c:1254 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "изтриване на refs/remotes/<ИМЕ>/HEAD" + +#: builtin/remote.c:1269 +msgid "Cannot determine remote HEAD" +msgstr "Не може да се установи отдалеченият връх" + +#: builtin/remote.c:1271 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "" +"Множество клони с върхове. Изберете изрично някой от тях чрез командата:" + +#: builtin/remote.c:1281 +#, c-format +msgid "Could not delete %s" +msgstr "„%s“ не може да бъде изтрит" + +#: builtin/remote.c:1289 +#, c-format +msgid "Not a valid ref: %s" +msgstr "Неправилен указател: %s" + +#: builtin/remote.c:1291 +#, c-format +msgid "Could not setup %s" +msgstr "„%s“ не може да се настрои" + +#: builtin/remote.c:1307 +#, c-format +msgid " %s will become dangling!" +msgstr "„%s“ ще се превърне в обект извън клоните!" + +#: builtin/remote.c:1308 +#, c-format +msgid " %s has become dangling!" +msgstr "„%s“ се превърна в обект извън клоните!" + +#: builtin/remote.c:1314 +#, c-format +msgid "Pruning %s" +msgstr "Окастряне на „%s“" + +#: builtin/remote.c:1315 +#, c-format +msgid "URL: %s" +msgstr "адрес: %s" + +#: builtin/remote.c:1328 +#, c-format +msgid " * [would prune] %s" +msgstr " * [ще бъде окастрено] %s" + +#: builtin/remote.c:1331 +#, c-format +msgid " * [pruned] %s" +msgstr " * [окастрено] %s" + +#: builtin/remote.c:1374 +msgid "prune remotes after fetching" +msgstr "окастряне на огледалата на отдалечените хранилища след доставяне" + +#: builtin/remote.c:1440 builtin/remote.c:1514 +#, c-format +msgid "No such remote '%s'" +msgstr "Няма отдалечено хранилище на име „%s“" + +#: builtin/remote.c:1460 +msgid "add branch" +msgstr "добавяне на клон" + +#: builtin/remote.c:1467 +msgid "no remote specified" +msgstr "не е указано отдалечено хранилище" + +#: builtin/remote.c:1489 +msgid "manipulate push URLs" +msgstr "промяна на адресите за изтласкване" + +#: builtin/remote.c:1491 +msgid "add URL" +msgstr "добавяне на адреси" + +#: builtin/remote.c:1493 +msgid "delete URLs" +msgstr "изтриване на адреси" + +#: builtin/remote.c:1500 +msgid "--add --delete doesn't make sense" +msgstr "опциите „--add“ и „--delete“ не могат да се използват заедно" + +#: builtin/remote.c:1540 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "Неправилен (стар) формат за адрес: %s" + +#: builtin/remote.c:1548 +#, c-format +msgid "No such URL found: %s" +msgstr "Такъв адрес не е открит: %s" + +# MEANING +#: builtin/remote.c:1550 +msgid "Will not delete all non-push URLs" +msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие" + +#: builtin/remote.c:1564 +msgid "be verbose; must be placed before a subcommand" +msgstr "повече подробности. Поставя се пред подкоманда" + +#: builtin/repack.c:15 +msgid "git repack [options]" +msgstr "" + +#: builtin/repack.c:143 +msgid "pack everything in a single pack" +msgstr "" + +#: builtin/repack.c:145 +msgid "same as -a, and turn unreachable objects loose" +msgstr "" + +#: builtin/repack.c:148 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "" + +#: builtin/repack.c:150 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "" + +#: builtin/repack.c:152 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "" + +#: builtin/repack.c:154 +msgid "do not run git-update-server-info" +msgstr "" + +#: builtin/repack.c:157 +msgid "pass --local to git-pack-objects" +msgstr "" + +#: builtin/repack.c:158 +msgid "approxidate" +msgstr "" + +#: builtin/repack.c:159 +msgid "with -A, do not loosen objects older than this" +msgstr "" + +#: builtin/repack.c:161 +msgid "size of the window used for delta compression" +msgstr "" + +#: builtin/repack.c:163 +msgid "same as the above, but limit memory size instead of entries count" +msgstr "" + +#: builtin/repack.c:165 +msgid "limits the maximum delta depth" +msgstr "" + +#: builtin/repack.c:167 +msgid "maximum size of each packfile" +msgstr "" + +#: builtin/repack.c:343 +#, c-format +msgid "removing '%s' failed" +msgstr "" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "" + +#: builtin/replace.c:19 +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "" + +#: builtin/replace.c:174 +msgid "list replace refs" +msgstr "" + +#: builtin/replace.c:175 +msgid "delete replace refs" +msgstr "" + +#: builtin/replace.c:176 +msgid "replace the ref if it exists" +msgstr "" + +#: builtin/replace.c:177 +msgid "use this format" +msgstr "" + +#: builtin/rerere.c:12 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "" + +#: builtin/rerere.c:57 +msgid "register clean resolutions in index" +msgstr "" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" + +#: builtin/reset.c:26 +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "" + +#: builtin/reset.c:27 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "" + +#: builtin/reset.c:73 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:75 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:81 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:99 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:172 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "" + +#: builtin/reset.c:262 +msgid "be quiet, only report errors" +msgstr "" + +#: builtin/reset.c:264 +msgid "reset HEAD and index" +msgstr "" + +#: builtin/reset.c:265 +msgid "reset only HEAD" +msgstr "" + +#: builtin/reset.c:267 builtin/reset.c:269 +msgid "reset HEAD, index and working tree" +msgstr "" + +#: builtin/reset.c:271 +msgid "reset HEAD but keep local changes" +msgstr "" + +#: builtin/reset.c:289 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "" + +#: builtin/reset.c:292 builtin/reset.c:300 +#, c-format +msgid "Could not parse object '%s'." +msgstr "" + +#: builtin/reset.c:297 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "" + +#: builtin/reset.c:306 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "" + +#: builtin/reset.c:315 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" + +#: builtin/reset.c:317 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:327 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "" + +#: builtin/reset.c:344 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:350 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" + +#: builtin/reset.c:355 +msgid "Could not write new index file." +msgstr "" + +#: builtin/rev-parse.c:359 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "" + +#: builtin/rev-parse.c:364 +msgid "keep the `--` passed as an arg" +msgstr "" + +#: builtin/rev-parse.c:366 +msgid "stop parsing after the first non-option argument" +msgstr "" + +#: builtin/rev-parse.c:369 +msgid "output in stuck long form" +msgstr "" + +#: builtin/rev-parse.c:486 +msgid "" +"git rev-parse --parseopt [options] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [options] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "" + +#: builtin/revert.c:22 +msgid "git revert [options] <commit-ish>..." +msgstr "" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "" + +#: builtin/revert.c:28 +msgid "git cherry-pick [options] <commit-ish>..." +msgstr "" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "" + +#: builtin/revert.c:71 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "" + +#: builtin/revert.c:80 +msgid "end revert or cherry-pick sequence" +msgstr "" + +#: builtin/revert.c:81 +msgid "resume revert or cherry-pick sequence" +msgstr "" + +#: builtin/revert.c:82 +msgid "cancel revert or cherry-pick sequence" +msgstr "" + +#: builtin/revert.c:83 +msgid "don't automatically commit" +msgstr "" + +#: builtin/revert.c:84 +msgid "edit the commit message" +msgstr "" + +#: builtin/revert.c:87 +msgid "parent number" +msgstr "" + +#: builtin/revert.c:89 +msgid "merge strategy" +msgstr "" + +#: builtin/revert.c:90 +msgid "option" +msgstr "" + +#: builtin/revert.c:91 +msgid "option for merge strategy" +msgstr "" + +#: builtin/revert.c:102 +msgid "append commit name" +msgstr "" + +#: builtin/revert.c:103 +msgid "allow fast-forward" +msgstr "" + +#: builtin/revert.c:104 +msgid "preserve initially empty commits" +msgstr "" + +#: builtin/revert.c:105 +msgid "allow commits with empty messages" +msgstr "" + +#: builtin/revert.c:106 +msgid "keep redundant, empty commits" +msgstr "" + +#: builtin/revert.c:110 +msgid "program error" +msgstr "" + +#: builtin/revert.c:195 +msgid "revert failed" +msgstr "" + +#: builtin/revert.c:210 +msgid "cherry-pick failed" +msgstr "" + +#: builtin/rm.c:17 +msgid "git rm [options] [--] <file>..." +msgstr "git rm [ОПЦИИ] [--] <ФАЙЛ>…" + +#: builtin/rm.c:65 +msgid "" +"the following submodule (or one of its nested submodules)\n" +"uses a .git directory:" +msgid_plural "" +"the following submodules (or one of its nested submodules)\n" +"use a .git directory:" +msgstr[0] "" +"следният подмодул или някой от неговите подмодули\n" +"използват директория на име „.git“:" +msgstr[1] "" +"следните подмодули или някои от техните подмодули\n" +"използват директория на име „.git“:" + +#: builtin/rm.c:71 +msgid "" +"\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" +"\n" +"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)" + +#: builtin/rm.c:231 +msgid "" +"the following file has staged content different from both the\n" +"file and the HEAD:" +msgid_plural "" +"the following files have staged content different from both the\n" +"file and the HEAD:" +msgstr[0] "" +"следният файл е със съдържание в индекса различно от текущото му съдържание " +"и\n" +"различно от съответстващото на HEAD:" +msgstr[1] "" +"следните файлове са със съдържание в индекса различно от текущото им " +"съдържание и\n" +"различно от съответстващото на HEAD:" + +#: builtin/rm.c:236 +msgid "" +"\n" +"(use -f to force removal)" +msgstr "" +"\n" +"(за принудително изтриване използвайте опцията „-f“)" + +#: builtin/rm.c:240 +msgid "the following file has changes staged in the index:" +msgid_plural "the following files have changes staged in the index:" +msgstr[0] "следният файл е с променено съдържание в индекса:" +msgstr[1] "следните файлове са с променено съдържание в индекса:" + +#: builtin/rm.c:244 builtin/rm.c:255 +msgid "" +"\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"\n" +"(за запазване на файла използвайте опцията „--cached“, а за принудително\n" +"изтриване — „-f“)" + +#: builtin/rm.c:252 +msgid "the following file has local modifications:" +msgid_plural "the following files have local modifications:" +msgstr[0] "следният файл е с променено съдържание" +msgstr[1] "следните файлове са с променено съдържание" + +#: builtin/rm.c:270 +msgid "do not list removed files" +msgstr "да не се извеждат изтритите файлове" + +#: builtin/rm.c:271 +msgid "only remove from the index" +msgstr "изтриване само от индекса" + +#: builtin/rm.c:272 +msgid "override the up-to-date check" +msgstr "въпреки проверката за актуалността на съдържанието" + +#: builtin/rm.c:273 +msgid "allow recursive removal" +msgstr "рекурсивно изтриване" + +#: builtin/rm.c:275 +msgid "exit with a zero status even if nothing matched" +msgstr "" +"изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за " +"изтриване" + +#: builtin/rm.c:336 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно" + +#: builtin/rm.c:375 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: „%s“ не може да се изтрие" + +#: builtin/shortlog.c:13 +msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgstr "" + +#: builtin/shortlog.c:131 +#, c-format +msgid "Missing author: %s" +msgstr "" + +#: builtin/shortlog.c:230 +msgid "sort output according to the number of commits per author" +msgstr "" + +#: builtin/shortlog.c:232 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "" + +#: builtin/shortlog.c:234 +msgid "Show the email address of each author" +msgstr "" + +#: builtin/shortlog.c:235 +msgid "w[,i1[,i2]]" +msgstr "" + +#: builtin/shortlog.c:236 +msgid "Linewrap output" +msgstr "" + +#: builtin/show-branch.c:9 +#, fuzzy +msgid "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" +msgstr "<брой>" + +#: builtin/show-branch.c:10 +#, fuzzy +msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "<брой>" + +#: builtin/show-branch.c:649 +msgid "show remote-tracking and local branches" +msgstr "" + +#: builtin/show-branch.c:651 +msgid "show remote-tracking branches" +msgstr "" + +#: builtin/show-branch.c:653 +msgid "color '*!+-' corresponding to the branch" +msgstr "" + +#: builtin/show-branch.c:655 +#, fuzzy +msgid "show <n> more commits after the common ancestor" +msgstr "<брой>" + +#: builtin/show-branch.c:657 +msgid "synonym to more=-1" +msgstr "" + +#: builtin/show-branch.c:658 +msgid "suppress naming strings" +msgstr "" + +#: builtin/show-branch.c:660 +msgid "include the current branch" +msgstr "" + +#: builtin/show-branch.c:662 +msgid "name commits with their object names" +msgstr "" + +#: builtin/show-branch.c:664 +msgid "show possible merge bases" +msgstr "" + +#: builtin/show-branch.c:666 +msgid "show refs unreachable from any other ref" +msgstr "" + +#: builtin/show-branch.c:668 +msgid "show commits in topological order" +msgstr "" + +#: builtin/show-branch.c:671 +msgid "show only commits not on the first branch" +msgstr "" + +#: builtin/show-branch.c:673 +msgid "show merges reachable from only one tip" +msgstr "" + +#: builtin/show-branch.c:675 +msgid "topologically sort, maintaining date order where possible" +msgstr "" + +#: builtin/show-branch.c:678 +#, fuzzy +msgid "<n>[,<base>]" +msgstr "<брой>" + +#: builtin/show-branch.c:679 +#, fuzzy +msgid "show <n> most recent ref-log entries starting at base" +msgstr "<брой>" + +#: builtin/show-ref.c:10 +#, fuzzy +msgid "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +msgstr "<брой>" + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "" + +#: builtin/show-ref.c:168 +msgid "only show tags (can be combined with heads)" +msgstr "" + +#: builtin/show-ref.c:169 +msgid "only show heads (can be combined with tags)" +msgstr "" + +#: builtin/show-ref.c:170 +msgid "stricter reference checking, requires exact ref path" +msgstr "" + +#: builtin/show-ref.c:173 builtin/show-ref.c:175 +msgid "show the HEAD reference, even if it would be filtered out" +msgstr "" + +#: builtin/show-ref.c:177 +msgid "dereference tags into object IDs" +msgstr "" + +#: builtin/show-ref.c:179 +#, fuzzy +msgid "only show SHA1 hash using <n> digits" +msgstr "<брой>" + +#: builtin/show-ref.c:183 +msgid "do not print results to stdout (useful with --verify)" +msgstr "" + +#: builtin/show-ref.c:185 +msgid "show refs from stdin that aren't in local repository" +msgstr "" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [options] name [ref]" +msgstr "" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 +msgid "reason" +msgstr "" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 +msgid "reason of the update" +msgstr "" + +#: builtin/tag.c:22 +msgid "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +msgstr "" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "" + +# FIXME +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" +msgstr "" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "" + +#: builtin/tag.c:60 +#, c-format +msgid "malformed object at '%s'" +msgstr "" + +#: builtin/tag.c:207 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "" + +#: builtin/tag.c:212 +#, c-format +msgid "tag '%s' not found." +msgstr "" + +#: builtin/tag.c:227 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "" + +#: builtin/tag.c:239 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "" + +#: builtin/tag.c:249 +#, c-format +msgid "" +"\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" +msgstr "" + +#: builtin/tag.c:253 +#, c-format +msgid "" +"\n" +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " +"want to.\n" +msgstr "" + +#: builtin/tag.c:292 +msgid "unable to sign the tag" +msgstr "" + +#: builtin/tag.c:294 +msgid "unable to write tag file" +msgstr "" + +#: builtin/tag.c:319 +msgid "bad object type." +msgstr "" + +#: builtin/tag.c:332 +msgid "tag header too big." +msgstr "" + +#: builtin/tag.c:368 +msgid "no tag message?" +msgstr "" + +#: builtin/tag.c:374 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +#: builtin/tag.c:423 +msgid "switch 'points-at' requires an object" +msgstr "" + +#: builtin/tag.c:425 +#, c-format +msgid "malformed object name '%s'" +msgstr "" + +#: builtin/tag.c:445 +msgid "list tag names" +msgstr "" + +#: builtin/tag.c:447 +#, fuzzy +msgid "print <n> lines of each tag message" +msgstr "<брой>" + +#: builtin/tag.c:449 +msgid "delete tags" +msgstr "" + +#: builtin/tag.c:450 +msgid "verify tags" +msgstr "" + +#: builtin/tag.c:452 +msgid "Tag creation options" +msgstr "" + +#: builtin/tag.c:454 +msgid "annotated tag, needs a message" +msgstr "" + +#: builtin/tag.c:456 +msgid "tag message" +msgstr "" + +#: builtin/tag.c:458 +msgid "annotated and GPG-signed tag" +msgstr "" + +#: builtin/tag.c:462 +msgid "use another key to sign the tag" +msgstr "" + +#: builtin/tag.c:463 +msgid "replace the tag if exists" +msgstr "" + +#: builtin/tag.c:464 +msgid "show tag list in columns" +msgstr "" + +#: builtin/tag.c:466 +msgid "Tag listing options" +msgstr "" + +#: builtin/tag.c:469 +msgid "print only tags that contain the commit" +msgstr "" + +#: builtin/tag.c:475 +msgid "print only tags of the object" +msgstr "" + +#: builtin/tag.c:501 +msgid "--column and -n are incompatible" +msgstr "" + +#: builtin/tag.c:518 +msgid "-n option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:520 +msgid "--contains option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:522 +msgid "--points-at option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:530 +msgid "only one -F or -m option is allowed." +msgstr "" + +#: builtin/tag.c:550 +msgid "too many params" +msgstr "" + +#: builtin/tag.c:556 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "" + +#: builtin/tag.c:561 +#, c-format +msgid "tag '%s' already exists" +msgstr "" + +#: builtin/tag.c:579 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "" + +#: builtin/tag.c:581 +#, c-format +msgid "%s: cannot update the ref" +msgstr "" + +#: builtin/tag.c:583 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "" + +#: builtin/update-index.c:402 +msgid "git update-index [options] [--] [<file>...]" +msgstr "" + +#: builtin/update-index.c:720 +msgid "continue refresh even when index needs update" +msgstr "" + +#: builtin/update-index.c:723 +msgid "refresh: ignore submodules" +msgstr "" + +#: builtin/update-index.c:726 +msgid "do not ignore new files" +msgstr "" + +#: builtin/update-index.c:728 +msgid "let files replace directories and vice-versa" +msgstr "" + +#: builtin/update-index.c:730 +msgid "notice files missing from worktree" +msgstr "" + +#: builtin/update-index.c:732 +msgid "refresh even if index contains unmerged entries" +msgstr "" + +#: builtin/update-index.c:735 +msgid "refresh stat information" +msgstr "" + +#: builtin/update-index.c:739 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "" + +#: builtin/update-index.c:743 +msgid "<mode> <object> <path>" +msgstr "" + +#: builtin/update-index.c:744 +msgid "add the specified entry to the index" +msgstr "" + +#: builtin/update-index.c:748 +msgid "(+/-)x" +msgstr "" + +#: builtin/update-index.c:749 +msgid "override the executable bit of the listed files" +msgstr "" + +#: builtin/update-index.c:753 +msgid "mark files as \"not changing\"" +msgstr "" + +#: builtin/update-index.c:756 +msgid "clear assumed-unchanged bit" +msgstr "" + +#: builtin/update-index.c:759 +msgid "mark files as \"index-only\"" +msgstr "" + +#: builtin/update-index.c:762 +msgid "clear skip-worktree bit" +msgstr "" + +#: builtin/update-index.c:765 +msgid "add to index only; do not add content to object database" +msgstr "" + +#: builtin/update-index.c:767 +msgid "remove named paths even if present in worktree" +msgstr "" + +#: builtin/update-index.c:769 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "" + +#: builtin/update-index.c:771 +msgid "read list of paths to be updated from standard input" +msgstr "" + +#: builtin/update-index.c:775 +msgid "add entries from standard input to the index" +msgstr "" + +#: builtin/update-index.c:779 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "" + +#: builtin/update-index.c:783 +msgid "only update entries that differ from HEAD" +msgstr "" + +#: builtin/update-index.c:787 +msgid "ignore files missing from worktree" +msgstr "" + +#: builtin/update-index.c:790 +msgid "report actions to standard output" +msgstr "" + +#: builtin/update-index.c:792 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "" + +#: builtin/update-index.c:796 +msgid "write index in this format" +msgstr "" + +#: builtin/update-ref.c:9 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "" + +#: builtin/update-ref.c:10 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "" + +#: builtin/update-ref.c:11 +msgid "git update-ref [options] --stdin [-z]" +msgstr "" + +#: builtin/update-ref.c:255 +msgid "delete the reference" +msgstr "" + +#: builtin/update-ref.c:257 +msgid "update <refname> not the one it points to" +msgstr "" + +#: builtin/update-ref.c:258 +msgid "stdin has NUL-terminated arguments" +msgstr "" + +#: builtin/update-ref.c:259 +msgid "read updates from stdin" +msgstr "" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "" + +#: builtin/verify-pack.c:56 +msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgstr "" + +#: builtin/verify-pack.c:66 +msgid "verbose" +msgstr "" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "" + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "" + +#: git.c:17 +msgid "" +"'git help -a' and 'git help -g' lists available subcommands and some\n" +"concept guides. See 'git help <command>' or 'git help <concept>'\n" +"to read about a specific subcommand or concept." +msgstr "" + +#: parse-options.h:146 +msgid "expiry date" +msgstr "период на валидност" + +#: parse-options.h:161 +msgid "no-op (backward compatibility)" +msgstr "нулева операция (за съвместимост с предишни версии)" + +#: parse-options.h:235 +msgid "be more verbose" +msgstr "повече подробности" + +#: parse-options.h:237 +msgid "be more quiet" +msgstr "по-малко подробности" + +# FIXME +#: parse-options.h:243 +msgid "use <n> digits to display SHA-1s" +msgstr "да се показват такъв <брой> цифри от сумите по SHA1" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "" + +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "" + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "" + +#: common-cmds.h:17 +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "" + +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "" + +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "" + +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "" + +#: common-cmds.h:21 +msgid "Fetch from and integrate with another repository or a local branch" +msgstr "" + +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "" + +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "" + +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "" + +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "" + +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "" + +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "" + +#: common-cmds.h:28 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "" + +#: git-am.sh:50 +msgid "You need to set your committer info first" +msgstr "" + +#: git-am.sh:95 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" + +#: git-am.sh:105 +#, sh-format +msgid "" +"When you have resolved this problem, run \"$cmdline --continue\".\n" +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" +"To restore the original branch and stop patching, run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "" + +#: git-am.sh:137 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" + +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "" + +#: git-am.sh:154 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" + +#: git-am.sh:163 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" + +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "" + +#: git-am.sh:274 +msgid "Only one StGIT patch series can be applied at once" +msgstr "" + +#: git-am.sh:361 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "" + +#: git-am.sh:363 +msgid "Patch format detection failed." +msgstr "" + +#: git-am.sh:389 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "" + +#: git-am.sh:479 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:484 +msgid "Please make up your mind. --skip or --abort?" +msgstr "" + +#: git-am.sh:520 +#, sh-format +msgid "" +"Stray $dotest directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" + +#: git-am.sh:528 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:594 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:698 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:725 +msgid "Patch does not have a valid e-mail address." +msgstr "" + +#: git-am.sh:772 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" + +#: git-am.sh:776 +msgid "Commit Body is:" +msgstr "" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:783 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "" + +#: git-am.sh:819 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:840 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" + +#: git-am.sh:848 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" + +#: git-am.sh:864 +msgid "No changes -- Patch already applied." +msgstr "" + +#: git-am.sh:874 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "" + +#: git-am.sh:877 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" + +#: git-am.sh:895 +msgid "applying to an empty history" +msgstr "" + +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:54 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "" + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "" + +#: git-bisect.sh:140 +msgid "won't bisect on cg-seek'ed tree" +msgstr "" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "" + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "" + +#: git-bisect.sh:250 +msgid "'git bisect bad' can take only one argument." +msgstr "" + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:273 +msgid "Warning: bisecting only with a bad commit." +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:279 +msgid "Are you sure [Y/n]? " +msgstr "" + +#: git-bisect.sh:289 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:292 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:363 git-bisect.sh:490 +msgid "We are not bisecting." +msgstr "" + +#: git-bisect.sh:370 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "" + +#: git-bisect.sh:379 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "" + +#: git-bisect.sh:406 +msgid "No logfile given" +msgstr "" + +#: git-bisect.sh:407 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "" + +#: git-bisect.sh:424 +msgid "?? what are you talking about?" +msgstr "" + +#: git-bisect.sh:436 +#, sh-format +msgid "running $command" +msgstr "" + +#: git-bisect.sh:443 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" + +#: git-bisect.sh:469 +msgid "bisect run cannot continue any more" +msgstr "" + +#: git-bisect.sh:475 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" + +#: git-bisect.sh:482 +msgid "bisect run success" +msgstr "" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution, or use 'git commit -a'." +msgstr "" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" + +#: git-pull.sh:223 +msgid "updating an unborn branch with changes added to the index" +msgstr "" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:247 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" + +#: git-pull.sh:272 +msgid "Cannot merge multiple branches into empty head" +msgstr "" + +#: git-pull.sh:276 +msgid "Cannot rebase onto multiple branches" +msgstr "" + +#: git-rebase.sh:55 +msgid "" +"When you have resolved this problem, run \"git rebase --continue\".\n" +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" +"To check out the original branch and stop rebasing, run \"git rebase --abort" +"\"." +msgstr "" + +#: git-rebase.sh:158 +msgid "Applied autostash." +msgstr "" + +#: git-rebase.sh:161 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "" + +#: git-rebase.sh:162 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" + +#: git-rebase.sh:201 +msgid "The pre-rebase hook refused to rebase." +msgstr "" + +#: git-rebase.sh:206 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "" + +#: git-rebase.sh:346 +msgid "The --exec option must be used with the --interactive option" +msgstr "" + +#: git-rebase.sh:351 +msgid "No rebase in progress?" +msgstr "" + +#: git-rebase.sh:362 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "" + +#: git-rebase.sh:369 +msgid "Cannot read HEAD" +msgstr "" + +#: git-rebase.sh:372 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" + +#: git-rebase.sh:390 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "" + +# FIXME +#: git-rebase.sh:409 +#, sh-format +msgid "" +"It seems that there is already a $state_dir_base directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t$cmd_live_rebase\n" +"If that is not the case, please\n" +"\t$cmd_clear_stale_rebase\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there." +msgstr "" + +#: git-rebase.sh:456 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "" + +#: git-rebase.sh:480 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "" + +#: git-rebase.sh:483 git-rebase.sh:487 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "" + +#: git-rebase.sh:492 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "" + +#: git-rebase.sh:515 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "" + +#: git-rebase.sh:548 +msgid "Cannot autostash" +msgstr "" + +#: git-rebase.sh:553 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "" + +#: git-rebase.sh:557 +msgid "Please commit or stash them." +msgstr "" + +#: git-rebase.sh:577 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "" + +#: git-rebase.sh:581 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "" + +#: git-rebase.sh:592 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:601 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "" + +#: git-rebase.sh:611 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "" + +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "" + +#: git-stash.sh:74 +msgid "You do not have the initial commit yet" +msgstr "" + +#: git-stash.sh:89 +msgid "Cannot save the current index state" +msgstr "" + +#: git-stash.sh:123 git-stash.sh:136 +msgid "Cannot save the current worktree state" +msgstr "" + +#: git-stash.sh:140 +msgid "No changes selected" +msgstr "" + +#: git-stash.sh:143 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" + +#: git-stash.sh:156 +msgid "Cannot record working tree state" +msgstr "" + +#: git-stash.sh:190 +#, sh-format +msgid "Cannot update $ref_stash with $w_commit" +msgstr "" + +#. TRANSLATORS: $option is an invalid option, like +#. `--blah-blah'. The 7 spaces at the beginning of the +#. second line correspond to "error: ". So you should line +#. up the second line with however many characters the +#. translation of "error: " takes in your language. E.g. in +#. English this is: +#. +#. $ git stash save --blah-blah 2>&1 | head -n 2 +#. error: unknown option for 'stash save': --blah-blah +#. To provide a message, use git stash save -- '--blah-blah' +#: git-stash.sh:237 +#, sh-format +msgid "" +"error: unknown option for 'stash save': $option\n" +" To provide a message, use git stash save -- '$option'" +msgstr "" + +#: git-stash.sh:258 +msgid "No local changes to save" +msgstr "" + +#: git-stash.sh:262 +msgid "Cannot initialize stash" +msgstr "" + +#: git-stash.sh:266 +msgid "Cannot save the current status" +msgstr "" + +#: git-stash.sh:284 +msgid "Cannot remove worktree changes" +msgstr "" + +#: git-stash.sh:383 +msgid "No stash found." +msgstr "" + +#: git-stash.sh:390 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "" + +#: git-stash.sh:396 +#, sh-format +msgid "$reference is not valid reference" +msgstr "" + +#: git-stash.sh:424 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "" + +#: git-stash.sh:435 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "" + +#: git-stash.sh:443 +msgid "unable to refresh index" +msgstr "" + +#: git-stash.sh:447 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "" + +#: git-stash.sh:455 +msgid "Conflicts in index. Try without --index." +msgstr "" + +#: git-stash.sh:457 +msgid "Could not save index tree" +msgstr "" + +#: git-stash.sh:491 +msgid "Cannot unstage modified files" +msgstr "" + +#: git-stash.sh:506 +msgid "Index was not unstashed." +msgstr "" + +#: git-stash.sh:523 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "" + +#: git-stash.sh:524 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:531 +msgid "No branch name specified" +msgstr "" + +#: git-stash.sh:603 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:95 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:237 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:281 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "" + +#: git-submodule.sh:293 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "" + +#: git-submodule.sh:403 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "" + +#: git-submodule.sh:413 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:430 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "" + +#: git-submodule.sh:434 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" + +#: git-submodule.sh:452 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "" + +#: git-submodule.sh:454 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "" + +#: git-submodule.sh:462 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "" + +#: git-submodule.sh:464 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "" + +#: git-submodule.sh:466 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "" + +#: git-submodule.sh:467 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" + +#: git-submodule.sh:469 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "" + +#: git-submodule.sh:481 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:486 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:495 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:539 +#, sh-format +msgid "Entering '$prefix$displaypath'" +msgstr "" + +#: git-submodule.sh:559 +#, sh-format +msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:605 +#, sh-format +msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgstr "" + +#: git-submodule.sh:614 +#, sh-format +msgid "Failed to register url for submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:616 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgstr "" + +#: git-submodule.sh:633 +#, sh-format +msgid "Failed to register update mode for submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:671 +#, sh-format +msgid "Use '.' if you really want to deinitialize all submodules" +msgstr "" + +#: git-submodule.sh:688 +#, sh-format +msgid "Submodule work tree '$displaypath' contains a .git directory" +msgstr "" + +#: git-submodule.sh:689 +#, sh-format +msgid "" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" + +#: git-submodule.sh:695 +#, sh-format +msgid "" +"Submodule work tree '$displaypath' contains local modifications; use '-f' to " +"discard them" +msgstr "" + +#: git-submodule.sh:698 +#, sh-format +msgid "Cleared directory '$displaypath'" +msgstr "" + +#: git-submodule.sh:699 +#, sh-format +msgid "Could not remove submodule work tree '$displaypath'" +msgstr "" + +#: git-submodule.sh:702 +#, sh-format +msgid "Could not create empty submodule directory '$displaypath'" +msgstr "" + +#: git-submodule.sh:711 +#, sh-format +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +msgstr "" + +#: git-submodule.sh:834 +#, sh-format +msgid "" +"Submodule path '$displaypath' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:847 +#, sh-format +msgid "Unable to find current revision in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:856 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:880 +#, sh-format +msgid "Unable to fetch in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:894 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:895 +#, sh-format +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:900 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:901 +#, sh-format +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:906 +#, sh-format +msgid "" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgstr "" + +#: git-submodule.sh:907 +#, sh-format +msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgstr "" + +#: git-submodule.sh:912 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:913 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:940 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:1048 +msgid "The --cached option cannot be used with the --files option" +msgstr "" + +#. unexpected type +#: git-submodule.sh:1096 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "" + +#: git-submodule.sh:1116 +#, sh-format +msgid " Warn: $display_name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:1119 +#, sh-format +msgid " Warn: $display_name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:1122 +#, sh-format +msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:1147 +msgid "blob" +msgstr "" + +#: git-submodule.sh:1261 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:1325 +#, sh-format +msgid "Synchronizing submodule url for '$displaypath'" +msgstr "" diff --git a/po/da.po b/po/da.po deleted file mode 100644 index 898b18d115..0000000000 --- a/po/da.po +++ /dev/null @@ -1,3503 +0,0 @@ -# Danish translations for Git. -# This file is distributed under the same license as the PACKAGE package. -# Byrial Jensen <byrial@vip.cybercity.dk>, 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: Git\n" -"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-03-16 20:18+0800\n" -"PO-Revision-Date: 2012-04-10 18:41+0200\n" -"Last-Translator: Byrial Jensen <byrial@vip.cybercity.dk>\n" -"Language-Team: Danish <dansk@dansk-gruppen.dk>\n" -"Language: da\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: advice.c:34 -#, c-format -msgid "hint: %.*s\n" -msgstr "" - -#. -#. * Message used both when 'git commit' fails and when -#. * other commands doing a merge do. -#. -#: advice.c:64 -msgid "" -"Fix them up in the work tree,\n" -"and then use 'git add/rm <file>' as\n" -"appropriate to mark resolution and make a commit,\n" -"or use 'git commit -a'." -msgstr "" - -#: commit.c:47 -#, c-format -msgid "could not parse %s" -msgstr "" - -#: commit.c:49 -#, c-format -msgid "%s %s is not a commit!" -msgstr "" - -#: compat/obstack.c:406 compat/obstack.c:408 -msgid "memory exhausted" -msgstr "" - -#: connected.c:39 -msgid "Could not run 'git rev-list'" -msgstr "" - -#: connected.c:48 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "" - -#: connected.c:56 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "" - -#: diff.c:105 -#, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr "" - -#: diff.c:110 -#, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr "" - -#: diff.c:210 -#, c-format -msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" -msgstr "" - -#: diff.c:1336 -msgid " 0 files changed\n" -msgstr "" - -#: diff.c:1340 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] "" -msgstr[1] "" - -#: diff.c:1357 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] "" -msgstr[1] "" - -#: diff.c:1368 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] "" -msgstr[1] "" - -#: diff.c:3424 -#, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" - -#: gpg-interface.c:59 -msgid "could not run gpg." -msgstr "" - -#: gpg-interface.c:71 -msgid "gpg did not accept the data" -msgstr "" - -#: gpg-interface.c:82 -msgid "gpg failed to sign the data" -msgstr "" - -#: grep.c:1280 -#, c-format -msgid "'%s': unable to read %s" -msgstr "" - -#: grep.c:1297 -#, c-format -msgid "'%s': %s" -msgstr "" - -#: grep.c:1308 -#, c-format -msgid "'%s': short read %s" -msgstr "" - -#: help.c:287 -#, c-format -msgid "" -"'%s' appears to be a git command, but we were not\n" -"able to execute it. Maybe git-%s is broken?" -msgstr "" - -#: remote.c:1607 -#, c-format -msgid "Your branch is ahead of '%s' by %d commit.\n" -msgid_plural "Your branch is ahead of '%s' by %d commits.\n" -msgstr[0] "" -msgstr[1] "" - -#: remote.c:1613 -#, c-format -msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "" -"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "" -msgstr[1] "" - -#: remote.c:1621 -#, c-format -msgid "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commit each, respectively.\n" -msgid_plural "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commits each, respectively.\n" -msgstr[0] "" -msgstr[1] "" - -#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985 -#: builtin/merge.c:1095 builtin/merge.c:1105 -#, c-format -msgid "Could not open '%s' for writing" -msgstr "" - -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867 -#: builtin/merge.c:1097 builtin/merge.c:1110 -#, c-format -msgid "Could not write to '%s'" -msgstr "" - -#: sequencer.c:143 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'" -msgstr "" - -#: sequencer.c:146 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'\n" -"and commit the result with 'git commit'" -msgstr "" - -#: sequencer.c:159 sequencer.c:685 sequencer.c:768 -#, c-format -msgid "Could not write to %s" -msgstr "" - -#: sequencer.c:162 -#, c-format -msgid "Error wrapping up %s" -msgstr "" - -#: sequencer.c:177 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "" - -#: sequencer.c:179 -msgid "Your local changes would be overwritten by revert." -msgstr "" - -#: sequencer.c:182 -msgid "Commit your changes or stash them to proceed." -msgstr "" - -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:232 -#, c-format -msgid "%s: Unable to write new index file" -msgstr "" - -#: sequencer.c:298 -msgid "Your index file is unmerged." -msgstr "" - -#: sequencer.c:301 -msgid "You do not have a valid HEAD" -msgstr "" - -#: sequencer.c:316 -#, c-format -msgid "Commit %s is a merge but no -m option was given." -msgstr "" - -#: sequencer.c:324 -#, c-format -msgid "Commit %s does not have parent %d" -msgstr "" - -#: sequencer.c:328 -#, 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:339 -#, c-format -msgid "%s: cannot parse parent commit %s" -msgstr "" - -#: sequencer.c:343 -#, c-format -msgid "Cannot get commit message for %s" -msgstr "" - -#: sequencer.c:427 -#, c-format -msgid "could not revert %s... %s" -msgstr "" - -#: sequencer.c:428 -#, c-format -msgid "could not apply %s... %s" -msgstr "" - -#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 -#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348 -#: builtin/shortlog.c:181 -msgid "revision walk setup failed" -msgstr "" - -#: sequencer.c:453 -msgid "empty commit set passed" -msgstr "" - -#: sequencer.c:461 -#, c-format -msgid "git %s: failed to read the index" -msgstr "" - -#: sequencer.c:466 -#, c-format -msgid "git %s: failed to refresh the index" -msgstr "" - -#: sequencer.c:551 -#, c-format -msgid "Cannot %s during a %s" -msgstr "" - -#: sequencer.c:573 -#, c-format -msgid "Could not parse line %d." -msgstr "" - -#: sequencer.c:578 -msgid "No commits parsed." -msgstr "" - -#: sequencer.c:591 -#, c-format -msgid "Could not open %s" -msgstr "" - -#: sequencer.c:595 -#, c-format -msgid "Could not read %s." -msgstr "" - -#: sequencer.c:602 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "" - -#: sequencer.c:630 -#, c-format -msgid "Invalid key: %s" -msgstr "" - -#: sequencer.c:633 -#, c-format -msgid "Invalid value for %s: %s" -msgstr "" - -#: sequencer.c:645 -#, c-format -msgid "Malformed options sheet: %s" -msgstr "" - -#: sequencer.c:666 -msgid "a cherry-pick or revert is already in progress" -msgstr "" - -#: sequencer.c:667 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "" - -#: sequencer.c:671 -#, c-format -msgid "Could not create sequencer directory %s" -msgstr "" - -#: sequencer.c:687 sequencer.c:772 -#, c-format -msgid "Error wrapping up %s." -msgstr "" - -#: sequencer.c:706 sequencer.c:840 -msgid "no cherry-pick or revert in progress" -msgstr "" - -#: sequencer.c:708 -msgid "cannot resolve HEAD" -msgstr "" - -#: sequencer.c:710 -msgid "cannot abort from a branch yet to be born" -msgstr "" - -#: sequencer.c:732 -#, c-format -msgid "cannot open %s: %s" -msgstr "" - -#: sequencer.c:735 -#, c-format -msgid "cannot read %s: %s" -msgstr "" - -#: sequencer.c:736 -msgid "unexpected end of file" -msgstr "" - -#: sequencer.c:742 -#, c-format -msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "" - -#: sequencer.c:765 -#, c-format -msgid "Could not format %s." -msgstr "" - -#: sequencer.c:927 -msgid "Can't revert as initial commit" -msgstr "" - -#: sequencer.c:928 -msgid "Can't cherry-pick into empty head" -msgstr "" - -#: wt-status.c:134 -msgid "Unmerged paths:" -msgstr "" - -#: wt-status.c:140 wt-status.c:157 -#, c-format -msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr "" - -#: wt-status.c:142 wt-status.c:159 -msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr "" - -#: wt-status.c:143 -msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" -msgstr "" - -#: wt-status.c:151 -msgid "Changes to be committed:" -msgstr "" - -#: wt-status.c:169 -msgid "Changes not staged for commit:" -msgstr "" - -#: wt-status.c:173 -msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr "" - -#: wt-status.c:175 -msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr "" - -#: wt-status.c:176 -msgid "" -" (use \"git checkout -- <file>...\" to discard changes in working directory)" -msgstr "" - -#: wt-status.c:178 -msgid " (commit or discard the untracked or modified content in submodules)" -msgstr "" - -#: wt-status.c:187 -#, c-format -msgid "%s files:" -msgstr "" - -#: wt-status.c:190 -#, c-format -msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr "" - -#: wt-status.c:207 -msgid "bug" -msgstr "" - -#: wt-status.c:212 -msgid "both deleted:" -msgstr "" - -#: wt-status.c:213 -msgid "added by us:" -msgstr "" - -#: wt-status.c:214 -msgid "deleted by them:" -msgstr "" - -#: wt-status.c:215 -msgid "added by them:" -msgstr "" - -#: wt-status.c:216 -msgid "deleted by us:" -msgstr "" - -#: wt-status.c:217 -msgid "both added:" -msgstr "" - -#: wt-status.c:218 -msgid "both modified:" -msgstr "" - -#: wt-status.c:248 -msgid "new commits, " -msgstr "" - -#: wt-status.c:250 -msgid "modified content, " -msgstr "" - -#: wt-status.c:252 -msgid "untracked content, " -msgstr "" - -#: wt-status.c:266 -#, c-format -msgid "new file: %s" -msgstr "" - -#: wt-status.c:269 -#, c-format -msgid "copied: %s -> %s" -msgstr "" - -#: wt-status.c:272 -#, c-format -msgid "deleted: %s" -msgstr "" - -#: wt-status.c:275 -#, c-format -msgid "modified: %s" -msgstr "" - -#: wt-status.c:278 -#, c-format -msgid "renamed: %s -> %s" -msgstr "" - -#: wt-status.c:281 -#, c-format -msgid "typechange: %s" -msgstr "" - -#: wt-status.c:284 -#, c-format -msgid "unknown: %s" -msgstr "" - -#: wt-status.c:287 -#, c-format -msgid "unmerged: %s" -msgstr "" - -#: wt-status.c:290 -#, c-format -msgid "bug: unhandled diff status %c" -msgstr "" - -#: wt-status.c:713 -msgid "On branch " -msgstr "" - -#: wt-status.c:720 -msgid "Not currently on any branch." -msgstr "" - -#: wt-status.c:731 -msgid "Initial commit" -msgstr "" - -#: wt-status.c:745 -msgid "Untracked" -msgstr "" - -#: wt-status.c:747 -msgid "Ignored" -msgstr "" - -#: wt-status.c:749 -#, c-format -msgid "Untracked files not listed%s" -msgstr "" - -#: wt-status.c:751 -msgid " (use -u option to show untracked files)" -msgstr "" - -#: wt-status.c:757 -msgid "No changes" -msgstr "" - -#: wt-status.c:761 -#, c-format -msgid "no changes added to commit%s\n" -msgstr "" - -#: wt-status.c:763 -msgid " (use \"git add\" and/or \"git commit -a\")" -msgstr "" - -#: wt-status.c:765 -#, c-format -msgid "nothing added to commit but untracked files present%s\n" -msgstr "" - -#: wt-status.c:767 -msgid " (use \"git add\" to track)" -msgstr "" - -#: wt-status.c:769 wt-status.c:772 wt-status.c:775 -#, c-format -msgid "nothing to commit%s\n" -msgstr "" - -#: wt-status.c:770 -msgid " (create/copy files and use \"git add\" to track)" -msgstr "" - -#: wt-status.c:773 -msgid " (use -u to show untracked files)" -msgstr "" - -#: wt-status.c:776 -msgid " (working directory clean)" -msgstr "" - -#: wt-status.c:884 -msgid "HEAD (no branch)" -msgstr "" - -#: wt-status.c:890 -msgid "Initial commit on " -msgstr "" - -#: wt-status.c:905 -msgid "behind " -msgstr "" - -#: wt-status.c:908 wt-status.c:911 -msgid "ahead " -msgstr "" - -#: wt-status.c:913 -msgid ", behind " -msgstr "" - -#: builtin/add.c:62 -#, c-format -msgid "unexpected diff status %c" -msgstr "" - -#: builtin/add.c:67 builtin/commit.c:298 -msgid "updating files failed" -msgstr "" - -#: builtin/add.c:77 -#, c-format -msgid "remove '%s'\n" -msgstr "" - -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "" - -#: builtin/add.c:192 -msgid "Unstaged changes after refreshing the index:" -msgstr "" - -#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 -#, c-format -msgid "pathspec '%s' did not match any files" -msgstr "" - -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "" - -#: builtin/add.c:276 -msgid "Could not read the index" -msgstr "" - -#: builtin/add.c:286 -#, c-format -msgid "Could not open '%s' for writing." -msgstr "" - -#: builtin/add.c:290 -msgid "Could not write patch" -msgstr "" - -#: builtin/add.c:295 -#, c-format -msgid "Could not stat '%s'" -msgstr "" - -#: builtin/add.c:297 -msgid "Empty patch. Aborted." -msgstr "" - -#: builtin/add.c:303 -#, c-format -msgid "Could not apply '%s'" -msgstr "" - -#: builtin/add.c:312 -msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "" - -#: builtin/add.c:352 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "" - -#: builtin/add.c:353 -msgid "no files added" -msgstr "" - -#: builtin/add.c:359 -msgid "adding files failed" -msgstr "" - -#: builtin/add.c:391 -msgid "-A and -u are mutually incompatible" -msgstr "" - -#: builtin/add.c:393 -msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "" - -#: builtin/add.c:413 -#, c-format -msgid "Nothing specified, nothing added.\n" -msgstr "" - -#: builtin/add.c:414 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "" - -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 -#: builtin/rm.c:162 -msgid "index file corrupt" -msgstr "" - -#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 -msgid "Unable to write new index file" -msgstr "" - -#: builtin/archive.c:17 -#, c-format -msgid "could not create archive file '%s'" -msgstr "" - -#: builtin/archive.c:20 -msgid "could not redirect output" -msgstr "" - -#: builtin/archive.c:37 -msgid "git archive: Remote with no URL" -msgstr "" - -#: builtin/archive.c:58 -msgid "git archive: expected ACK/NAK, got EOF" -msgstr "" - -#: builtin/archive.c:63 -#, c-format -msgid "git archive: NACK %s" -msgstr "" - -#: builtin/archive.c:65 -#, c-format -msgid "remote error: %s" -msgstr "" - -#: builtin/archive.c:66 -msgid "git archive: protocol error" -msgstr "" - -#: builtin/archive.c:71 -msgid "git archive: expected a flush" -msgstr "" - -#: builtin/branch.c:137 -#, c-format -msgid "" -"deleting branch '%s' that has been merged to\n" -" '%s', but not yet merged to HEAD." -msgstr "" - -#: builtin/branch.c:141 -#, c-format -msgid "" -"not deleting branch '%s' that is not yet merged to\n" -" '%s', even though it is merged to HEAD." -msgstr "" - -#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" -#: builtin/branch.c:163 -msgid "remote " -msgstr "" - -#: builtin/branch.c:171 -msgid "cannot use -a with -d" -msgstr "" - -#: builtin/branch.c:177 -msgid "Couldn't look up commit object for HEAD" -msgstr "" - -#: builtin/branch.c:182 -#, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "" - -#: builtin/branch.c:192 -#, c-format -msgid "%sbranch '%s' not found." -msgstr "" - -#: builtin/branch.c:200 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "" - -#: builtin/branch.c:206 -#, 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:214 -#, c-format -msgid "Error deleting %sbranch '%s'" -msgstr "" - -#: builtin/branch.c:219 -#, c-format -msgid "Deleted %sbranch %s (was %s).\n" -msgstr "" - -#: builtin/branch.c:224 -msgid "Update of config-file failed" -msgstr "" - -#: builtin/branch.c:322 -#, c-format -msgid "branch '%s' does not point at a commit" -msgstr "" - -#: builtin/branch.c:394 -#, c-format -msgid "behind %d] " -msgstr "" - -#: builtin/branch.c:396 -#, c-format -msgid "ahead %d] " -msgstr "" - -#: builtin/branch.c:398 -#, c-format -msgid "ahead %d, behind %d] " -msgstr "" - -#: builtin/branch.c:501 -msgid "(no branch)" -msgstr "" - -#: builtin/branch.c:566 -msgid "some refs could not be read" -msgstr "" - -#: builtin/branch.c:579 -msgid "cannot rename the current branch while not on any." -msgstr "" - -#: builtin/branch.c:589 -#, c-format -msgid "Invalid branch name: '%s'" -msgstr "" - -#: builtin/branch.c:604 -msgid "Branch rename failed" -msgstr "" - -#: builtin/branch.c:608 -#, c-format -msgid "Renamed a misnamed branch '%s' away" -msgstr "" - -#: builtin/branch.c:612 -#, c-format -msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "" - -#: builtin/branch.c:619 -msgid "Branch is renamed, but update of config-file failed" -msgstr "" - -#: builtin/branch.c:634 -#, c-format -msgid "malformed object name %s" -msgstr "" - -#: builtin/branch.c:658 -#, c-format -msgid "could not write branch description template: %s\n" -msgstr "" - -#: builtin/branch.c:746 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "" - -#: builtin/branch.c:751 builtin/clone.c:558 -msgid "HEAD not found below refs/heads!" -msgstr "" - -#: builtin/branch.c:809 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" -msgstr "" - -#: builtin/bundle.c:47 -#, c-format -msgid "%s is okay\n" -msgstr "" - -#: builtin/bundle.c:56 -msgid "Need a repository to create a bundle." -msgstr "" - -#: builtin/bundle.c:60 -msgid "Need a repository to unbundle." -msgstr "" - -#: builtin/checkout.c:113 builtin/checkout.c:146 -#, c-format -msgid "path '%s' does not have our version" -msgstr "" - -#: builtin/checkout.c:115 builtin/checkout.c:148 -#, c-format -msgid "path '%s' does not have their version" -msgstr "" - -#: builtin/checkout.c:131 -#, c-format -msgid "path '%s' does not have all necessary versions" -msgstr "" - -#: builtin/checkout.c:175 -#, c-format -msgid "path '%s' does not have necessary versions" -msgstr "" - -#: builtin/checkout.c:192 -#, c-format -msgid "path '%s': cannot merge" -msgstr "" - -#: builtin/checkout.c:209 -#, c-format -msgid "Unable to add merge result for '%s'" -msgstr "" - -#: builtin/checkout.c:212 builtin/reset.c:158 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "" - -#: builtin/checkout.c:234 builtin/checkout.c:392 -msgid "corrupt index file" -msgstr "" - -#: builtin/checkout.c:264 builtin/checkout.c:271 -#, c-format -msgid "path '%s' is unmerged" -msgstr "" - -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 -#: builtin/merge.c:811 -msgid "unable to write new index file" -msgstr "" - -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 -msgid "diff_setup_done failed" -msgstr "" - -#: builtin/checkout.c:414 -msgid "you need to resolve your current index first" -msgstr "" - -#: builtin/checkout.c:533 -#, c-format -msgid "Can not do reflog for '%s'\n" -msgstr "" - -#: builtin/checkout.c:565 -msgid "HEAD is now at" -msgstr "" - -#: builtin/checkout.c:572 -#, c-format -msgid "Reset branch '%s'\n" -msgstr "" - -#: builtin/checkout.c:575 -#, c-format -msgid "Already on '%s'\n" -msgstr "" - -#: builtin/checkout.c:579 -#, c-format -msgid "Switched to and reset branch '%s'\n" -msgstr "" - -#: builtin/checkout.c:581 -#, c-format -msgid "Switched to a new branch '%s'\n" -msgstr "" - -#: builtin/checkout.c:583 -#, c-format -msgid "Switched to branch '%s'\n" -msgstr "" - -#: builtin/checkout.c:639 -#, c-format -msgid " ... and %d more.\n" -msgstr "" - -#. The singular version -#: builtin/checkout.c:645 -#, 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" -"\n" -"%s\n" -msgstr[0] "" -msgstr[1] "" - -#: builtin/checkout.c:663 -#, 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" -msgstr "" - -#: builtin/checkout.c:692 -msgid "internal error in revision walk" -msgstr "" - -#: builtin/checkout.c:696 -msgid "Previous HEAD position was" -msgstr "" - -#: builtin/checkout.c:722 -msgid "You are on a branch yet to be born" -msgstr "" - -#. case (1) -#: builtin/checkout.c:853 -#, c-format -msgid "invalid reference: %s" -msgstr "" - -#. case (1): want a tree -#: builtin/checkout.c:892 -#, c-format -msgid "reference is not a tree: %s" -msgstr "" - -#: builtin/checkout.c:972 -msgid "-B cannot be used with -b" -msgstr "" - -#: builtin/checkout.c:981 -msgid "--patch is incompatible with all other options" -msgstr "" - -#: builtin/checkout.c:984 -msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "" - -#: builtin/checkout.c:986 -msgid "--detach cannot be used with -t" -msgstr "" - -#: builtin/checkout.c:992 -msgid "--track needs a branch name" -msgstr "" - -#: builtin/checkout.c:999 -msgid "Missing branch name; try -b" -msgstr "" - -#: builtin/checkout.c:1005 -msgid "--orphan and -b|-B are mutually exclusive" -msgstr "" - -#: builtin/checkout.c:1007 -msgid "--orphan cannot be used with -t" -msgstr "" - -#: builtin/checkout.c:1017 -msgid "git checkout: -f and -m are incompatible" -msgstr "" - -#: builtin/checkout.c:1051 -msgid "invalid path specification" -msgstr "" - -#: builtin/checkout.c:1059 -#, 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?" -msgstr "" - -#: builtin/checkout.c:1061 -msgid "git checkout: updating paths is incompatible with switching branches." -msgstr "" - -#: builtin/checkout.c:1066 -msgid "git checkout: --detach does not take a path argument" -msgstr "" - -#: builtin/checkout.c:1069 -msgid "" -"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" -"checking out of the index." -msgstr "" - -#: builtin/checkout.c:1088 -msgid "Cannot switch branch to a non-commit." -msgstr "" - -#: builtin/checkout.c:1091 -msgid "--ours/--theirs is incompatible with switching branches." -msgstr "" - -#: builtin/clean.c:78 -msgid "-x and -X cannot be used together" -msgstr "" - -#: builtin/clean.c:82 -msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" -msgstr "" - -#: builtin/clean.c:85 -msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" -msgstr "" - -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "" - -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "" - -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "" - -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "" - -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "" - -#: builtin/clone.c:243 -#, c-format -msgid "reference repository '%s' is not a local directory." -msgstr "" - -#: builtin/clone.c:302 -#, c-format -msgid "failed to open '%s'" -msgstr "" - -#: builtin/clone.c:306 -#, c-format -msgid "failed to create directory '%s'" -msgstr "" - -#: builtin/clone.c:308 builtin/diff.c:75 -#, c-format -msgid "failed to stat '%s'" -msgstr "" - -#: builtin/clone.c:310 -#, c-format -msgid "%s exists and is not a directory" -msgstr "" - -#: builtin/clone.c:324 -#, c-format -msgid "failed to stat %s\n" -msgstr "" - -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "" - -#: builtin/clone.c:346 -#, c-format -msgid "failed to create link '%s'" -msgstr "" - -#: builtin/clone.c:350 -#, c-format -msgid "failed to copy file to '%s'" -msgstr "" - -#: builtin/clone.c:373 -#, c-format -msgid "done.\n" -msgstr "" - -#: builtin/clone.c:440 -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "" - -#: builtin/clone.c:549 -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "" - -#: builtin/clone.c:639 -msgid "Too many arguments." -msgstr "" - -#: builtin/clone.c:643 -msgid "You must specify a repository to clone." -msgstr "" - -#: builtin/clone.c:654 -#, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "" - -#: builtin/clone.c:668 -#, c-format -msgid "repository '%s' does not exist" -msgstr "" - -#: builtin/clone.c:673 -msgid "--depth is ignored in local clones; use file:// instead." -msgstr "" - -#: builtin/clone.c:683 -#, c-format -msgid "destination path '%s' already exists and is not an empty directory." -msgstr "" - -#: builtin/clone.c:693 -#, c-format -msgid "working tree '%s' already exists." -msgstr "" - -#: builtin/clone.c:706 builtin/clone.c:720 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "" - -#: builtin/clone.c:709 -#, c-format -msgid "could not create work tree dir '%s'." -msgstr "" - -#: builtin/clone.c:728 -#, c-format -msgid "Cloning into bare repository '%s'...\n" -msgstr "" - -#: builtin/clone.c:730 -#, c-format -msgid "Cloning into '%s'...\n" -msgstr "" - -#: builtin/clone.c:786 -#, c-format -msgid "Don't know how to clone %s" -msgstr "" - -#: builtin/clone.c:835 -#, c-format -msgid "Remote branch %s not found in upstream %s" -msgstr "" - -#: builtin/clone.c:842 -msgid "You appear to have cloned an empty repository." -msgstr "" - -#: builtin/commit.c:42 -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/commit.c:54 -msgid "" -"You asked to amend the most recent commit, but doing so would make\n" -"it empty. You can repeat your command with --allow-empty, or you can\n" -"remove the commit entirely with \"git reset HEAD^\".\n" -msgstr "" - -#: builtin/commit.c:59 -msgid "" -"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/commit.c:205 builtin/reset.c:33 -msgid "merge" -msgstr "" - -#: builtin/commit.c:208 -msgid "cherry-pick" -msgstr "" - -#: builtin/commit.c:325 -msgid "failed to unpack HEAD tree object" -msgstr "" - -#: builtin/commit.c:367 -msgid "unable to create temporary index" -msgstr "" - -#: builtin/commit.c:373 -msgid "interactive add failed" -msgstr "" - -#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 -msgid "unable to write new_index file" -msgstr "" - -#: builtin/commit.c:457 -#, c-format -msgid "cannot do a partial commit during a %s." -msgstr "" - -#: builtin/commit.c:466 -msgid "cannot read the index" -msgstr "" - -#: builtin/commit.c:486 -msgid "unable to write temporary index file" -msgstr "" - -#: builtin/commit.c:550 builtin/commit.c:556 -#, c-format -msgid "invalid commit: %s" -msgstr "" - -#: builtin/commit.c:579 -msgid "malformed --author parameter" -msgstr "" - -#: builtin/commit.c:635 -#, c-format -msgid "Malformed ident string: '%s'" -msgstr "" - -#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 -#, c-format -msgid "could not lookup commit %s" -msgstr "" - -#: builtin/commit.c:682 builtin/shortlog.c:296 -#, c-format -msgid "(reading log message from standard input)\n" -msgstr "" - -#: builtin/commit.c:684 -msgid "could not read log from standard input" -msgstr "" - -#: builtin/commit.c:688 -#, c-format -msgid "could not read log file '%s'" -msgstr "" - -#: builtin/commit.c:694 -msgid "commit has empty message" -msgstr "" - -#: builtin/commit.c:710 -msgid "could not read MERGE_MSG" -msgstr "" - -#: builtin/commit.c:714 -msgid "could not read SQUASH_MSG" -msgstr "" - -#: builtin/commit.c:718 -#, c-format -msgid "could not read '%s'" -msgstr "" - -#: builtin/commit.c:746 -#, c-format -msgid "could not open '%s'" -msgstr "" - -#: builtin/commit.c:770 -msgid "could not write commit template" -msgstr "" - -#: builtin/commit.c:783 -#, c-format -msgid "" -"\n" -"It looks like you may be committing a %s.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" -"and try again.\n" -msgstr "" - -#: builtin/commit.c:796 -msgid "Please enter the commit message for your changes." -msgstr "" - -#: builtin/commit.c:799 -msgid "" -" Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" -msgstr "" - -#: builtin/commit.c:804 -msgid "" -" 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:816 -#, c-format -msgid "%sAuthor: %s" -msgstr "" - -#: builtin/commit.c:823 -#, c-format -msgid "%sCommitter: %s" -msgstr "" - -#: builtin/commit.c:843 -msgid "Cannot read index" -msgstr "" - -#: builtin/commit.c:880 -msgid "Error building trees" -msgstr "" - -#: builtin/commit.c:895 builtin/tag.c:357 -#, c-format -msgid "Please supply the message using either -m or -F option.\n" -msgstr "" - -#: builtin/commit.c:975 -#, c-format -msgid "No existing author found with '%s'" -msgstr "" - -#: builtin/commit.c:990 builtin/commit.c:1182 -#, c-format -msgid "Invalid untracked files mode '%s'" -msgstr "" - -#: builtin/commit.c:1030 -msgid "Using both --reset-author and --author does not make sense" -msgstr "" - -#: builtin/commit.c:1041 -msgid "You have nothing to amend." -msgstr "" - -#: builtin/commit.c:1043 -#, c-format -msgid "You are in the middle of a %s -- cannot amend." -msgstr "" - -#: builtin/commit.c:1045 -msgid "Options --squash and --fixup cannot be used together" -msgstr "" - -#: builtin/commit.c:1055 -msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "" - -#: builtin/commit.c:1057 -msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "" - -#: builtin/commit.c:1063 -msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "" - -#: builtin/commit.c:1080 -msgid "Only one of --include/--only/--all/--interactive/--patch can be used." -msgstr "" - -#: builtin/commit.c:1082 -msgid "No paths with --include/--only does not make sense." -msgstr "" - -#: builtin/commit.c:1084 -msgid "Clever... amending the last one with dirty index." -msgstr "" - -#: builtin/commit.c:1086 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." -msgstr "" - -#: builtin/commit.c:1096 builtin/tag.c:556 -#, c-format -msgid "Invalid cleanup mode %s" -msgstr "" - -#: builtin/commit.c:1101 -msgid "Paths with -a does not make sense." -msgstr "" - -#: builtin/commit.c:1280 -msgid "couldn't look up newly created commit" -msgstr "" - -#: builtin/commit.c:1282 -msgid "could not parse newly created commit" -msgstr "" - -#: builtin/commit.c:1323 -msgid "detached HEAD" -msgstr "" - -#: builtin/commit.c:1325 -msgid " (root-commit)" -msgstr "" - -#: builtin/commit.c:1415 -msgid "could not parse HEAD commit" -msgstr "" - -#: builtin/commit.c:1452 builtin/merge.c:509 -#, c-format -msgid "could not open '%s' for reading" -msgstr "" - -#: builtin/commit.c:1459 -#, c-format -msgid "Corrupt MERGE_HEAD file (%s)" -msgstr "" - -#: builtin/commit.c:1466 -msgid "could not read MERGE_MODE" -msgstr "" - -#: builtin/commit.c:1485 -#, c-format -msgid "could not read commit message: %s" -msgstr "" - -#: builtin/commit.c:1499 -#, c-format -msgid "Aborting commit due to empty commit message.\n" -msgstr "" - -#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 -msgid "failed to write commit object" -msgstr "" - -#: builtin/commit.c:1535 -msgid "cannot lock HEAD ref" -msgstr "" - -#: builtin/commit.c:1539 -msgid "cannot update HEAD ref" -msgstr "" - -#: builtin/commit.c:1550 -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." -msgstr "" - -#: builtin/describe.c:234 -#, c-format -msgid "annotated tag %s not available" -msgstr "" - -#: builtin/describe.c:238 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "" - -#: builtin/describe.c:240 -#, c-format -msgid "tag '%s' is really '%s' here" -msgstr "" - -#: builtin/describe.c:267 -#, c-format -msgid "Not a valid object name %s" -msgstr "" - -#: builtin/describe.c:270 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "" - -#: builtin/describe.c:287 -#, c-format -msgid "no tag exactly matches '%s'" -msgstr "" - -#: builtin/describe.c:289 -#, c-format -msgid "searching to describe %s\n" -msgstr "" - -#: builtin/describe.c:329 -#, c-format -msgid "finished search at %s\n" -msgstr "" - -#: builtin/describe.c:353 -#, c-format -msgid "" -"No annotated tags can describe '%s'.\n" -"However, there were unannotated tags: try --tags." -msgstr "" - -#: builtin/describe.c:357 -#, c-format -msgid "" -"No tags can describe '%s'.\n" -"Try --always, or create some tags." -msgstr "" - -#: builtin/describe.c:378 -#, c-format -msgid "traversed %lu commits\n" -msgstr "" - -#: builtin/describe.c:381 -#, c-format -msgid "" -"more than %i tags found; listed %i most recent\n" -"gave up search at %s\n" -msgstr "" - -#: 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 commit-ishes" -msgstr "" - -#: builtin/diff.c:77 -#, c-format -msgid "'%s': not a regular file or symlink" -msgstr "" - -#: builtin/diff.c:220 -#, c-format -msgid "invalid option: %s" -msgstr "" - -#: builtin/diff.c:297 -msgid "Not a git repository" -msgstr "" - -#: builtin/diff.c:347 -#, c-format -msgid "invalid object '%s' given." -msgstr "" - -#: builtin/diff.c:352 -#, c-format -msgid "more than %d trees given: '%s'" -msgstr "" - -#: builtin/diff.c:362 -#, c-format -msgid "more than two blobs given: '%s'" -msgstr "" - -#: builtin/diff.c:370 -#, c-format -msgid "unhandled object '%s' given." -msgstr "" - -#: builtin/fetch.c:200 -msgid "Couldn't find remote ref HEAD" -msgstr "" - -#: builtin/fetch.c:252 -#, c-format -msgid "object %s not found" -msgstr "" - -#: builtin/fetch.c:258 -msgid "[up to date]" -msgstr "" - -#: builtin/fetch.c:272 -#, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "" - -#: builtin/fetch.c:273 builtin/fetch.c:351 -msgid "[rejected]" -msgstr "" - -#: builtin/fetch.c:284 -msgid "[tag update]" -msgstr "" - -#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 -msgid " (unable to update local ref)" -msgstr "" - -#: builtin/fetch.c:298 -msgid "[new tag]" -msgstr "" - -#: builtin/fetch.c:302 -msgid "[new branch]" -msgstr "" - -#: builtin/fetch.c:347 -msgid "unable to update local ref" -msgstr "" - -#: builtin/fetch.c:347 -msgid "forced update" -msgstr "" - -#: builtin/fetch.c:353 -msgid "(non-fast-forward)" -msgstr "" - -#: builtin/fetch.c:384 builtin/fetch.c:676 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "" - -#: builtin/fetch.c:393 -#, c-format -msgid "%s did not send all necessary objects\n" -msgstr "" - -#: builtin/fetch.c:479 -#, c-format -msgid "From %.*s\n" -msgstr "" - -#: builtin/fetch.c:490 -#, c-format -msgid "" -"some local refs could not be updated; try running\n" -" 'git remote prune %s' to remove any old, conflicting branches" -msgstr "" - -#: builtin/fetch.c:540 -#, c-format -msgid " (%s will become dangling)\n" -msgstr "" - -#: builtin/fetch.c:541 -#, c-format -msgid " (%s has become dangling)\n" -msgstr "" - -#: builtin/fetch.c:548 -msgid "[deleted]" -msgstr "" - -#: builtin/fetch.c:549 -msgid "(none)" -msgstr "" - -#: builtin/fetch.c:666 -#, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "" - -#: builtin/fetch.c:700 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "" - -#: builtin/fetch.c:777 -#, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "" - -#: builtin/fetch.c:780 -#, c-format -msgid "Option \"%s\" is ignored for %s\n" -msgstr "" - -#: builtin/fetch.c:879 -#, c-format -msgid "Fetching %s\n" -msgstr "" - -#: builtin/fetch.c:881 -#, c-format -msgid "Could not fetch %s" -msgstr "" - -#: builtin/fetch.c:898 -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:918 -msgid "You need to specify a tag name." -msgstr "" - -#: builtin/fetch.c:970 -msgid "fetch --all does not take a repository argument" -msgstr "" - -#: builtin/fetch.c:972 -msgid "fetch --all does not make sense with refspecs" -msgstr "" - -#: builtin/fetch.c:983 -#, c-format -msgid "No such remote or remote group: %s" -msgstr "" - -#: builtin/fetch.c:991 -msgid "Fetching a group and specifying refspecs does not make sense" -msgstr "" - -#: builtin/gc.c:63 -#, c-format -msgid "Invalid %s: '%s'" -msgstr "" - -#: builtin/gc.c:78 -msgid "Too many options specified" -msgstr "" - -#: builtin/gc.c:103 -#, c-format -msgid "insanely long object directory %.*s" -msgstr "" - -#: builtin/gc.c:223 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "" - -#: builtin/gc.c:226 -#, 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:256 -msgid "" -"There are too many unreachable loose objects; run 'git prune' to remove them." -msgstr "" - -#: builtin/grep.c:216 -#, c-format -msgid "grep: failed to create thread: %s" -msgstr "" - -#: builtin/grep.c:402 -#, c-format -msgid "Failed to chdir: %s" -msgstr "" - -#: builtin/grep.c:478 builtin/grep.c:512 -#, c-format -msgid "unable to read tree (%s)" -msgstr "" - -#: builtin/grep.c:526 -#, c-format -msgid "unable to grep from object of type %s" -msgstr "" - -#: builtin/grep.c:584 -#, c-format -msgid "switch `%c' expects a numerical value" -msgstr "" - -#: builtin/grep.c:601 -#, c-format -msgid "cannot open '%s'" -msgstr "" - -#: builtin/grep.c:888 -msgid "no pattern given." -msgstr "" - -#: builtin/grep.c:902 -#, c-format -msgid "bad object %s" -msgstr "" - -#: builtin/grep.c:943 -msgid "--open-files-in-pager only works on the worktree" -msgstr "" - -#: builtin/grep.c:966 -msgid "--cached or --untracked cannot be used with --no-index." -msgstr "" - -#: builtin/grep.c:971 -msgid "--no-index or --untracked cannot be used with revs." -msgstr "" - -#: builtin/grep.c:974 -msgid "--[no-]exclude-standard cannot be used for tracked contents." -msgstr "" - -#: builtin/grep.c:982 -msgid "both --cached and trees are 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:322 builtin/init-db.c:325 -#, c-format -msgid "%s already exists" -msgstr "" - -#: builtin/init-db.c:354 -#, c-format -msgid "unable to handle file type %d" -msgstr "" - -#: builtin/init-db.c:357 -#, c-format -msgid "unable to move %s to %s" -msgstr "" - -#: builtin/init-db.c:362 -#, 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:419 -#, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "" - -#: builtin/init-db.c:420 -msgid "Reinitialized existing" -msgstr "" - -#: builtin/init-db.c:420 -msgid "Initialized empty" -msgstr "" - -#: builtin/init-db.c:421 -msgid " shared" -msgstr "" - -#: builtin/init-db.c:440 -msgid "cannot tell cwd" -msgstr "" - -#: builtin/init-db.c:521 builtin/init-db.c:528 -#, c-format -msgid "cannot mkdir %s" -msgstr "" - -#: builtin/init-db.c:532 -#, c-format -msgid "cannot chdir to %s" -msgstr "" - -#: builtin/init-db.c:554 -#, c-format -msgid "" -"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" -"dir=<directory>)" -msgstr "" - -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "" - -#: builtin/init-db.c:585 -#, c-format -msgid "Cannot access work tree '%s'" -msgstr "" - -#: builtin/log.c:187 -#, c-format -msgid "Final output: %d %s\n" -msgstr "" - -#: builtin/log.c:395 builtin/log.c:483 -#, c-format -msgid "Could not read object %s" -msgstr "" - -#: builtin/log.c:507 -#, c-format -msgid "Unknown type: %d" -msgstr "" - -#: builtin/log.c:596 -msgid "format.headers without value" -msgstr "" - -#: builtin/log.c:669 -msgid "name of output directory is too long" -msgstr "" - -#: builtin/log.c:680 -#, c-format -msgid "Cannot open patch file %s" -msgstr "" - -#: builtin/log.c:694 -msgid "Need exactly one range." -msgstr "" - -#: builtin/log.c:702 -msgid "Not a range." -msgstr "" - -#: builtin/log.c:739 -msgid "Could not extract email from committer identity." -msgstr "" - -#: builtin/log.c:785 -msgid "Cover letter needs email format" -msgstr "" - -#: builtin/log.c:879 -#, c-format -msgid "insane in-reply-to: %s" -msgstr "" - -#: builtin/log.c:952 -msgid "Two output directories?" -msgstr "" - -#: builtin/log.c:1173 -#, c-format -msgid "bogus committer info %s" -msgstr "" - -#: builtin/log.c:1218 -msgid "-n and -k are mutually exclusive." -msgstr "" - -#: builtin/log.c:1220 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "" - -#: builtin/log.c:1225 builtin/shortlog.c:284 -#, c-format -msgid "unrecognized argument: %s" -msgstr "" - -#: builtin/log.c:1228 -msgid "--name-only does not make sense" -msgstr "" - -#: builtin/log.c:1230 -msgid "--name-status does not make sense" -msgstr "" - -#: builtin/log.c:1232 -msgid "--check does not make sense" -msgstr "" - -#: builtin/log.c:1255 -msgid "standard output, or directory, which one?" -msgstr "" - -#: builtin/log.c:1257 -#, c-format -msgid "Could not create directory '%s'" -msgstr "" - -#: builtin/log.c:1410 -msgid "Failed to create output files" -msgstr "" - -#: builtin/log.c:1514 -#, c-format -msgid "" -"Could not find a tracked remote branch, please specify <upstream> manually.\n" -msgstr "" - -#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544 -#, c-format -msgid "Unknown commit %s" -msgstr "" - -#: builtin/merge.c:91 -msgid "switch `m' requires a value" -msgstr "" - -#: builtin/merge.c:128 -#, c-format -msgid "Could not find merge strategy '%s'.\n" -msgstr "" - -#: builtin/merge.c:129 -#, c-format -msgid "Available strategies are:" -msgstr "" - -#: builtin/merge.c:134 -#, c-format -msgid "Available custom strategies are:" -msgstr "" - -#: builtin/merge.c:241 -msgid "could not run stash." -msgstr "" - -#: builtin/merge.c:246 -msgid "stash failed" -msgstr "" - -#: builtin/merge.c:251 -#, c-format -msgid "not a valid object: %s" -msgstr "" - -#: builtin/merge.c:270 builtin/merge.c:287 -msgid "read-tree failed" -msgstr "" - -#: builtin/merge.c:317 -msgid " (nothing to squash)" -msgstr "" - -#: builtin/merge.c:330 -#, c-format -msgid "Squash commit -- not updating HEAD\n" -msgstr "" - -#: builtin/merge.c:362 -msgid "Writing SQUASH_MSG" -msgstr "" - -#: builtin/merge.c:364 -msgid "Finishing SQUASH_MSG" -msgstr "" - -#: builtin/merge.c:386 -#, c-format -msgid "No merge message -- not updating HEAD\n" -msgstr "" - -#: builtin/merge.c:437 -#, c-format -msgid "'%s' does not point to a commit" -msgstr "" - -#: builtin/merge.c:536 -#, c-format -msgid "Bad branch.%s.mergeoptions string: %s" -msgstr "" - -#: builtin/merge.c:629 -msgid "git write-tree failed to write a tree" -msgstr "" - -#: builtin/merge.c:679 -msgid "failed to read the cache" -msgstr "" - -#: builtin/merge.c:696 -msgid "Unable to write index." -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:1000 -#, c-format -msgid "Automatic merge failed; fix conflicts and then commit the result.\n" -msgstr "" - -#: builtin/merge.c:1016 -#, c-format -msgid "'%s' is not a commit" -msgstr "" - -#: builtin/merge.c:1057 -msgid "No current branch." -msgstr "" - -#: builtin/merge.c:1059 -msgid "No remote for the current branch." -msgstr "" - -#: builtin/merge.c:1061 -msgid "No default upstream defined for the current branch." -msgstr "" - -#: builtin/merge.c:1066 -#, c-format -msgid "No remote tracking branch for %s from %s" -msgstr "" - -#: builtin/merge.c:1188 -msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "" - -#: builtin/merge.c:1204 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:1207 git-pull.sh:34 -msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "" - -#: builtin/merge.c:1211 -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:1214 -msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "" - -#: builtin/merge.c:1223 -msgid "You cannot combine --squash with --no-ff." -msgstr "" - -#: builtin/merge.c:1228 -msgid "You cannot combine --no-ff with --ff-only." -msgstr "" - -#: builtin/merge.c:1235 -msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "" - -#: builtin/merge.c:1266 -msgid "Can merge only exactly one commit into empty head" -msgstr "" - -#: builtin/merge.c:1269 -msgid "Squash commit into empty head not supported yet" -msgstr "" - -#: builtin/merge.c:1271 -msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "" - -#: builtin/merge.c:1275 builtin/merge.c:1319 -#, c-format -msgid "%s - not something we can merge" -msgstr "" - -#: builtin/merge.c:1385 -#, c-format -msgid "Updating %s..%s\n" -msgstr "" - -#: builtin/merge.c:1423 -#, c-format -msgid "Trying really trivial in-index merge...\n" -msgstr "" - -#: builtin/merge.c:1430 -#, c-format -msgid "Nope.\n" -msgstr "" - -#: builtin/merge.c:1462 -msgid "Not possible to fast-forward, aborting." -msgstr "" - -#: builtin/merge.c:1485 builtin/merge.c:1562 -#, c-format -msgid "Rewinding the tree to pristine...\n" -msgstr "" - -#: builtin/merge.c:1489 -#, c-format -msgid "Trying merge strategy %s...\n" -msgstr "" - -#: builtin/merge.c:1553 -#, c-format -msgid "No merge strategy handled the merge.\n" -msgstr "" - -#: builtin/merge.c:1555 -#, c-format -msgid "Merge with strategy %s failed.\n" -msgstr "" - -#: builtin/merge.c:1564 -#, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "" - -#: builtin/merge.c:1575 -#, c-format -msgid "Automatic merge went well; stopped before committing as requested\n" -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 -#, c-format -msgid "renaming '%s' failed" -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:343 -#, 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:521 -#, c-format -msgid "cannot read '%s'" -msgstr "" - -#: builtin/notes.c:253 builtin/tag.c:524 -#, 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:537 -#, 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" -msgstr "" - -#: builtin/notes.c:513 builtin/notes.c:772 -#, c-format -msgid "No note found for object %s." -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: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:971 -#, c-format -msgid "Object %s has no note\n" -msgstr "" - -#: builtin/notes.c:1103 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "" - -#: builtin/pack-objects.c:2310 -#, c-format -msgid "unsupported index version %s" -msgstr "" - -#: builtin/pack-objects.c:2314 -#, c-format -msgid "bad index version '%s'" -msgstr "" - -#: builtin/pack-objects.c:2322 -#, c-format -msgid "option %s does not accept negative form" -msgstr "" - -#: builtin/pack-objects.c:2326 -#, c-format -msgid "unable to parse value '%s' for option %s" -msgstr "" - -#: builtin/push.c:44 -msgid "tag shorthand without <tag>" -msgstr "" - -#: builtin/push.c:63 -msgid "--delete only accepts plain target ref names" -msgstr "" - -#: builtin/push.c:73 -#, c-format -msgid "" -"You are not currently on a branch.\n" -"To push the history leading to the current (detached HEAD)\n" -"state now, use\n" -"\n" -" git push %s HEAD:<name-of-remote-branch>\n" -msgstr "" - -#: builtin/push.c:80 -#, c-format -msgid "" -"The current branch %s has no upstream branch.\n" -"To push the current branch and set the remote as upstream, use\n" -"\n" -" git push --set-upstream %s %s\n" -msgstr "" - -#: builtin/push.c:88 -#, c-format -msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "" - -#: builtin/push.c:111 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "" - -#: builtin/push.c:131 -#, c-format -msgid "Pushing to %s\n" -msgstr "" - -#: builtin/push.c:135 -#, c-format -msgid "failed to push some refs to '%s'" -msgstr "" - -#: builtin/push.c:143 -#, c-format -msgid "" -"To prevent you from losing history, non-fast-forward updates were rejected\n" -"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" -"'Note about fast-forwards' section of 'git push --help' for details.\n" -msgstr "" - -#: builtin/push.c:160 -#, c-format -msgid "bad repository '%s'" -msgstr "" - -#: builtin/push.c:161 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" - -#: builtin/push.c:176 -msgid "--all and --tags are incompatible" -msgstr "" - -#: builtin/push.c:177 -msgid "--all can't be combined with refspecs" -msgstr "" - -#: builtin/push.c:182 -msgid "--mirror and --tags are incompatible" -msgstr "" - -#: builtin/push.c:183 -msgid "--mirror can't be combined with refspecs" -msgstr "" - -#: builtin/push.c:188 -msgid "--all and --mirror are incompatible" -msgstr "" - -#: builtin/push.c:274 -msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "" - -#: builtin/push.c:276 -msgid "--delete doesn't make sense without any refs" -msgstr "" - -#: builtin/reset.c:33 -msgid "mixed" -msgstr "" - -#: builtin/reset.c:33 -msgid "soft" -msgstr "" - -#: builtin/reset.c:33 -msgid "hard" -msgstr "" - -#: builtin/reset.c:33 -msgid "keep" -msgstr "" - -#: builtin/reset.c:77 -msgid "You do not have a valid HEAD." -msgstr "" - -#: builtin/reset.c:79 -msgid "Failed to find tree of HEAD." -msgstr "" - -#: builtin/reset.c:85 -#, c-format -msgid "Failed to find tree of %s." -msgstr "" - -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "" - -#: builtin/reset.c:106 -#, c-format -msgid "HEAD is now at %s" -msgstr "" - -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "" - -#: builtin/reset.c:223 -#, c-format -msgid "Cannot do a %s reset in the middle of a merge." -msgstr "" - -#: builtin/reset.c:297 -#, c-format -msgid "Could not parse object '%s'." -msgstr "" - -#: builtin/reset.c:302 -msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "" - -#: builtin/reset.c:311 -msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "" - -#: builtin/reset.c:313 -#, c-format -msgid "Cannot do %s reset with paths." -msgstr "" - -#: builtin/reset.c:325 -#, c-format -msgid "%s reset is not allowed in a bare repository" -msgstr "" - -#: builtin/reset.c:341 -#, c-format -msgid "Could not reset index file to revision '%s'." -msgstr "" - -#: builtin/revert.c:70 builtin/revert.c:91 -#, c-format -msgid "%s: %s cannot be used with %s" -msgstr "" - -#: builtin/revert.c:126 -msgid "program error" -msgstr "" - -#: builtin/revert.c:209 -msgid "revert failed" -msgstr "" - -#: builtin/revert.c:224 -msgid "cherry-pick failed" -msgstr "" - -#: builtin/rm.c:109 -#, c-format -msgid "" -"'%s' has staged content different from both the file and the HEAD\n" -"(use -f to force removal)" -msgstr "" - -#: builtin/rm.c:115 -#, c-format -msgid "" -"'%s' has changes staged in the index\n" -"(use --cached to keep the file, or -f to force removal)" -msgstr "" - -#: builtin/rm.c:119 -#, c-format -msgid "" -"'%s' has local modifications\n" -"(use --cached to keep the file, or -f to force removal)" -msgstr "" - -#: builtin/rm.c:194 -#, c-format -msgid "not removing '%s' recursively without -r" -msgstr "" - -#: builtin/rm.c:230 -#, c-format -msgid "git rm: unable to remove %s" -msgstr "" - -#: builtin/shortlog.c:157 -#, c-format -msgid "Missing author: %s" -msgstr "" - -#: builtin/tag.c:58 -#, c-format -msgid "malformed object at '%s'" -msgstr "" - -#: builtin/tag.c:205 -#, c-format -msgid "tag name too long: %.*s..." -msgstr "" - -#: builtin/tag.c:210 -#, c-format -msgid "tag '%s' not found." -msgstr "" - -#: builtin/tag.c:225 -#, c-format -msgid "Deleted tag '%s' (was %s)\n" -msgstr "" - -#: builtin/tag.c:237 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "" - -#: builtin/tag.c:247 -msgid "" -"\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" -msgstr "" - -#: builtin/tag.c:254 -msgid "" -"\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " -"want to.\n" -"#\n" -msgstr "" - -#: builtin/tag.c:294 -msgid "unable to sign the tag" -msgstr "" - -#: builtin/tag.c:296 -msgid "unable to write tag file" -msgstr "" - -#: builtin/tag.c:321 -msgid "bad object type." -msgstr "" - -#: builtin/tag.c:334 -msgid "tag header too big." -msgstr "" - -#: builtin/tag.c:366 -msgid "no tag message?" -msgstr "" - -#: builtin/tag.c:372 -#, c-format -msgid "The tag message has been left in %s\n" -msgstr "" - -#: builtin/tag.c:421 -msgid "switch 'points-at' requires an object" -msgstr "" - -#: builtin/tag.c:423 -#, c-format -msgid "malformed object name '%s'" -msgstr "" - -#: builtin/tag.c:502 -msgid "-n option is only allowed with -l." -msgstr "" - -#: builtin/tag.c:504 -msgid "--contains option is only allowed with -l." -msgstr "" - -#: builtin/tag.c:506 -msgid "--points-at option is only allowed with -l." -msgstr "" - -#: builtin/tag.c:514 -msgid "only one -F or -m option is allowed." -msgstr "" - -#: builtin/tag.c:534 -msgid "too many params" -msgstr "" - -#: builtin/tag.c:540 -#, c-format -msgid "'%s' is not a valid tag name." -msgstr "" - -#: builtin/tag.c:545 -#, c-format -msgid "tag '%s' already exists" -msgstr "" - -#: builtin/tag.c:563 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "" - -#: builtin/tag.c:565 -#, c-format -msgid "%s: cannot update the ref" -msgstr "" - -#: builtin/tag.c:567 -#, c-format -msgid "Updated tag '%s' (was %s)\n" -msgstr "" - -#: git-am.sh:49 -msgid "You need to set your committer info first" -msgstr "" - -#: git-am.sh:136 -msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "" - -#: git-am.sh:147 -msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." -msgstr "" - -#: git-am.sh:156 -msgid "Falling back to patching base and 3-way merge..." -msgstr "" - -#: git-am.sh:268 -msgid "Only one StGIT patch series can be applied at once" -msgstr "" - -#: git-am.sh:355 -#, sh-format -msgid "Patch format $patch_format is not supported." -msgstr "" - -#: git-am.sh:357 -msgid "Patch format detection failed." -msgstr "" - -#: git-am.sh:411 -msgid "-d option is no longer supported. Do not use." -msgstr "" - -#: git-am.sh:474 -#, sh-format -msgid "previous rebase directory $dotest still exists but mbox given." -msgstr "" - -#: git-am.sh:479 -msgid "Please make up your mind. --skip or --abort?" -msgstr "" - -#: git-am.sh:506 -msgid "Resolve operation not in progress, we are not resuming." -msgstr "" - -#: git-am.sh:572 -#, sh-format -msgid "Dirty index: cannot apply patches (dirty: $files)" -msgstr "" - -#: git-am.sh:748 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "" - -#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] -#. in your translation. The program will only accept English -#. input at this point. -#: git-am.sh:759 -msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -msgstr "" - -#: git-am.sh:795 -#, sh-format -msgid "Applying: $FIRSTLINE" -msgstr "" - -#: git-am.sh:840 -msgid "No changes -- Patch already applied." -msgstr "" - -#: git-am.sh:866 -msgid "applying to an empty history" -msgstr "" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:54 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "" - -#: git-bisect.sh:95 -#, sh-format -msgid "unrecognised option: '$arg'" -msgstr "" - -#: git-bisect.sh:99 -#, sh-format -msgid "'$arg' does not appear to be a valid revision" -msgstr "" - -#: git-bisect.sh:117 -msgid "Bad HEAD - I need a HEAD" -msgstr "" - -#: git-bisect.sh:130 -#, sh-format -msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." -msgstr "" - -#: git-bisect.sh:140 -msgid "won't bisect on seeked tree" -msgstr "" - -#: git-bisect.sh:144 -msgid "Bad HEAD - strange symbolic ref" -msgstr "" - -#: git-bisect.sh:189 -#, sh-format -msgid "Bad bisect_write argument: $state" -msgstr "" - -#: git-bisect.sh:218 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "" - -#: git-bisect.sh:232 -msgid "Please call 'bisect_state' with at least one argument." -msgstr "" - -#: git-bisect.sh:244 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "" - -#: git-bisect.sh:250 -msgid "'git bisect bad' can take only one argument." -msgstr "" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:279 -msgid "Are you sure [Y/n]? " -msgstr "" - -#: git-bisect.sh:354 -#, sh-format -msgid "'$invalid' is not a valid commit" -msgstr "" - -#: git-bisect.sh:363 -#, sh-format -msgid "" -"Could not check out original HEAD '$branch'.\n" -"Try 'git bisect reset <commit>'." -msgstr "" - -#: git-bisect.sh:390 -msgid "No logfile given" -msgstr "" - -#: git-bisect.sh:391 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "" - -#: git-bisect.sh:408 -msgid "?? what are you talking about?" -msgstr "" - -#: git-bisect.sh:474 -msgid "We are not bisecting." -msgstr "" - -#: git-pull.sh:21 -msgid "" -"Pull is not possible because you have unmerged files.\n" -"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" -"as appropriate to mark resolution, or use 'git commit -a'." -msgstr "" - -#: git-pull.sh:25 -msgid "Pull is not possible because you have unmerged files." -msgstr "" - -#: git-pull.sh:197 -msgid "updating an unborn branch with changes added to the index" -msgstr "" - -#: git-pull.sh:253 -msgid "Cannot merge multiple branches into empty head" -msgstr "" - -#: git-pull.sh:257 -msgid "Cannot rebase onto multiple branches" -msgstr "" - -#: git-stash.sh:51 -msgid "git stash clear with parameters is unimplemented" -msgstr "" - -#: git-stash.sh:74 -msgid "You do not have the initial commit yet" -msgstr "" - -#: git-stash.sh:89 -msgid "Cannot save the current index state" -msgstr "" - -#: git-stash.sh:123 git-stash.sh:136 -msgid "Cannot save the current worktree state" -msgstr "" - -#: git-stash.sh:140 -msgid "No changes selected" -msgstr "" - -#: git-stash.sh:143 -msgid "Cannot remove temporary index (can't happen)" -msgstr "" - -#: git-stash.sh:156 -msgid "Cannot record working tree state" -msgstr "" - -#: git-stash.sh:223 -msgid "No local changes to save" -msgstr "" - -#: git-stash.sh:227 -msgid "Cannot initialize stash" -msgstr "" - -#: git-stash.sh:235 -msgid "Cannot save the current status" -msgstr "" - -#: git-stash.sh:253 -msgid "Cannot remove worktree changes" -msgstr "" - -#: git-stash.sh:352 -msgid "No stash found." -msgstr "" - -#: git-stash.sh:359 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "" - -#: git-stash.sh:365 -#, sh-format -msgid "$reference is not valid reference" -msgstr "" - -#: git-stash.sh:393 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "" - -#: git-stash.sh:404 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "" - -#: git-stash.sh:412 -msgid "unable to refresh index" -msgstr "" - -#: git-stash.sh:416 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "" - -#: git-stash.sh:424 -msgid "Conflicts in index. Try without --index." -msgstr "" - -#: git-stash.sh:426 -msgid "Could not save index tree" -msgstr "" - -#: git-stash.sh:460 -msgid "Cannot unstage modified files" -msgstr "" - -#: git-stash.sh:491 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "" - -#: git-stash.sh:492 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "" - -#: git-stash.sh:499 -msgid "No branch name specified" -msgstr "" - -#: git-stash.sh:570 -msgid "(To restore them type \"git stash apply\")" -msgstr "" - -#: git-submodule.sh:56 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "" - -#: git-submodule.sh:108 -#, sh-format -msgid "No submodule mapping found in .gitmodules for path '$path'" -msgstr "" - -#: git-submodule.sh:149 -#, sh-format -msgid "Clone of '$url' into submodule path '$path' failed" -msgstr "" - -#: git-submodule.sh:159 -#, sh-format -msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -msgstr "" - -#: git-submodule.sh:247 -#, sh-format -msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "" - -#: git-submodule.sh:264 -#, sh-format -msgid "'$path' already exists in the index" -msgstr "" - -#: git-submodule.sh:281 -#, sh-format -msgid "'$path' already exists and is not a valid git repo" -msgstr "" - -#: git-submodule.sh:295 -#, sh-format -msgid "Unable to checkout submodule '$path'" -msgstr "" - -#: git-submodule.sh:300 -#, sh-format -msgid "Failed to add submodule '$path'" -msgstr "" - -#: git-submodule.sh:305 -#, sh-format -msgid "Failed to register submodule '$path'" -msgstr "" - -#: git-submodule.sh:347 -#, sh-format -msgid "Entering '$prefix$path'" -msgstr "" - -#: git-submodule.sh:359 -#, sh-format -msgid "Stopping at '$path'; script returned non-zero status." -msgstr "" - -#: git-submodule.sh:401 -#, sh-format -msgid "No url found for submodule path '$path' in .gitmodules" -msgstr "" - -#: git-submodule.sh:410 -#, sh-format -msgid "Failed to register url for submodule path '$path'" -msgstr "" - -#: git-submodule.sh:418 -#, sh-format -msgid "Failed to register update mode for submodule path '$path'" -msgstr "" - -#: git-submodule.sh:420 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$path'" -msgstr "" - -#: git-submodule.sh:519 -#, sh-format -msgid "" -"Submodule path '$path' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" - -#: git-submodule.sh:532 -#, sh-format -msgid "Unable to find current revision in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:551 -#, sh-format -msgid "Unable to fetch in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:565 -#, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:566 -#, sh-format -msgid "Submodule path '$path': rebased into '$sha1'" -msgstr "" - -#: git-submodule.sh:571 -#, sh-format -msgid "Unable to merge '$sha1' in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:572 -#, sh-format -msgid "Submodule path '$path': merged in '$sha1'" -msgstr "" - -#: git-submodule.sh:577 -#, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:578 -#, sh-format -msgid "Submodule path '$path': checked out '$sha1'" -msgstr "" - -#: git-submodule.sh:600 git-submodule.sh:923 -#, sh-format -msgid "Failed to recurse into submodule path '$path'" -msgstr "" - -#: git-submodule.sh:708 -msgid "--" -msgstr "" - -#: git-submodule.sh:766 -#, sh-format -msgid " Warn: $name doesn't contain commit $sha1_src" -msgstr "" - -#: git-submodule.sh:769 -#, sh-format -msgid " Warn: $name doesn't contain commit $sha1_dst" -msgstr "" - -#: git-submodule.sh:772 -#, sh-format -msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" - -#: git-submodule.sh:797 -msgid "blob" -msgstr "" - -#: git-submodule.sh:798 -msgid "submodule" -msgstr "" - -#: git-submodule.sh:969 -#, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "" @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: git 1.8.5\n" +"Project-Id-Version: git 1.9\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-11-02 08:06+0800\n" +"POT-Creation-Date: 2014-02-01 08:06+0800\n" "PO-Revision-Date: 2013-07-28 18:42+0200\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" @@ -57,7 +57,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" @@ -78,8 +78,8 @@ msgstr "Präfix" msgid "prepend prefix to each pathname in the archive" msgstr "stellt einen Präfix vor jeden Pfadnamen in dem Archiv" -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 @@ -268,64 +268,64 @@ msgstr "Fehler beim Sperren der Referenz zur Aktualisierung." msgid "Failed to write ref" msgstr "Fehler beim Schreiben der Referenz." -#: bundle.c:36 +#: bundle.c:37 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" -#: bundle.c:63 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:89 builtin/commit.c:706 +#: bundle.c:90 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" -#: bundle.c:140 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" -#: bundle.c:186 +#: bundle.c:187 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Das Paket enthält diese Referenz:" msgstr[1] "Das Paket enthält diese %d Referenzen:" -#: bundle.c:193 +#: bundle.c:194 msgid "The bundle records a complete history." msgstr "Das Paket speichert eine komplette Historie." -#: bundle.c:195 +#: bundle.c:196 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Das Paket benötigt diese Referenz:" msgstr[1] "Das Paket benötigt diese %d Referenzen:" -#: bundle.c:294 +#: bundle.c:296 msgid "rev-list died" msgstr "\"rev-list\" abgebrochen" -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:335 +#: bundle.c:337 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:380 +#: bundle.c:382 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurückgewiesen." @@ -360,16 +360,16 @@ msgstr "%s %s ist kein Commit!" msgid "memory exhausted" msgstr "Speicher verbraucht" -#: connected.c:60 +#: connected.c:70 msgid "Could not run 'git rev-list'" msgstr "Konnte 'git rev-list' nicht ausführen" -#: connected.c:80 +#: connected.c:90 #, c-format msgid "failed write to rev-list: %s" msgstr "Fehler beim Schreiben nach rev-list: %s" -#: connected.c:88 +#: connected.c:98 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe: %s" @@ -441,23 +441,28 @@ msgid_plural "%lu years ago" msgstr[0] "vor %lu Jahr" msgstr[1] "vor %lu Jahren" -#: diff.c:112 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." + +#: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n" -#: diff.c:117 +#: diff.c:118 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" -#: diff.c:210 +#: diff.c:213 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" -#: diff.c:260 +#: diff.c:263 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -466,7 +471,7 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:3490 +#: diff.c:3509 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -475,7 +480,7 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3504 +#: diff.c:3523 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" @@ -586,7 +591,7 @@ msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 -#: builtin/clone.c:655 +#: builtin/clone.c:661 msgid "unable to write new index file" msgstr "Konnte neue Staging-Area-Datei nicht schreiben." @@ -635,7 +640,7 @@ msgstr "kann Objekt %s '%s' nicht lesen" msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:774 builtin/clone.c:311 +#: merge-recursive.c:774 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" @@ -685,7 +690,7 @@ msgstr "" msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1082 +#: merge-recursive.c:1082 wt-status.c:283 msgid "renamed" msgstr "umbenannt" @@ -750,7 +755,7 @@ msgstr "Objekt %s ist kein Blob" msgid "modify" msgstr "ändern" -#: merge-recursive.c:1565 +#: merge-recursive.c:1565 wt-status.c:281 msgid "modified" msgstr "geändert" @@ -772,7 +777,7 @@ msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1634 git-submodule.sh:1125 +#: merge-recursive.c:1634 git-submodule.sh:1148 msgid "submodule" msgstr "Submodul" @@ -844,7 +849,7 @@ msgstr "Merge hat keinen Commit zurückgegeben" msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2010 builtin/merge.c:672 +#: merge-recursive.c:2010 builtin/merge.c:665 msgid "Unable to write index." msgstr "Konnte Staging-Area nicht schreiben." @@ -901,47 +906,50 @@ msgstr " %s" msgid "-NUM" msgstr "-NUM" -#: pathspec.c:118 +#: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind inkompatibel." +msgstr "" +"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind " +"inkompatibel." -#: pathspec.c:128 +#: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" -msgstr "Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n" +msgstr "" +"Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n" "mit allen anderen Optionen." -#: pathspec.c:158 +#: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'" -#: pathspec.c:164 +#: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'" -#: pathspec.c:168 +#: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'" -#: pathspec.c:186 +#: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'" -#: pathspec.c:211 +#: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' und 'glob' sind inkompatibel" -#: pathspec.c:222 +#: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: '%s' liegt außerhalb des Repositories" -#: pathspec.c:278 +#: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" @@ -951,42 +959,75 @@ msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" #. * name. E.g. when add--interactive dies when running #. * "checkout -p" #. -#: pathspec.c:340 +#: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s: Pfadspezifikationsangabe wird von diesem Kommando nicht unterstützt: %s" +msgstr "" +"%s: Pfadspezifikationsangabe wird von diesem Kommando nicht unterstützt: %s" -#: pathspec.c:415 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "Pfadspezifikation '%s' ist hinter einem symbolischen Verweis" -#: remote.c:1833 +#: pathspec.c:442 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" +":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n" +"Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?" + +#: remote.c:753 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen." + +#: remote.c:757 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s folgt üblicherweise %s, nicht %s" + +#: remote.c:761 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s folgt sowohl %s als auch %s" + +#. +#. * This last possibility doesn't occur because +#. * FETCH_HEAD_IGNORE entries always appear at +#. * the end of the list. +#. +#: remote.c:769 +msgid "Internal error" +msgstr "Interner Fehler" + +#: remote.c:1871 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Ihr Branch basiert auf '%s', aber Upstream-Branch wurde entfernt.\n" -#: remote.c:1837 +#: remote.c:1875 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:1840 +#: remote.c:1878 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n" -#: remote.c:1844 +#: remote.c:1882 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Ihr Branch ist vor '%s' um %d Commit.\n" msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n" -#: remote.c:1850 +#: remote.c:1888 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\" um lokale Commits zu publizieren)\n" -#: remote.c:1853 +#: remote.c:1891 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -996,12 +1037,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n" -#: remote.c:1861 +#: remote.c:1899 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\" um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:1864 +#: remote.c:1902 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1016,7 +1057,7 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:1874 +#: remote.c:1912 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (benutzen Sie \"git pull\" um Ihren Branch mit dem Remote-Branch " @@ -1031,14 +1072,14 @@ msgstr "Öffnen von /dev/null fehlgeschlagen" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) fehlgeschlagen" -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 -#: builtin/merge.c:1013 builtin/merge.c:1023 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 +#: builtin/merge.c:1006 builtin/merge.c:1016 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 -#: builtin/merge.c:1015 builtin/merge.c:1028 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 +#: builtin/merge.c:1008 builtin/merge.c:1021 #, c-format msgid "Could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." @@ -1280,7 +1321,7 @@ msgstr "Kann nicht als allerersten Commit einen Revert ausführen." msgid "Can't cherry-pick into empty head" msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen." -#: sha1_name.c:440 +#: sha1_name.c:439 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1305,28 +1346,29 @@ msgstr "" "indem Sie \"git config advice.objectNameWarning false\"\n" "ausführen." -#: sha1_name.c:1112 +#: sha1_name.c:1070 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: sha1_name.c:1115 +#: sha1_name.c:1073 #, c-format msgid "No such branch: '%s'" msgstr "Kein solcher Branch '%s'" -#: sha1_name.c:1117 +#: sha1_name.c:1075 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert." -#: sha1_name.c:1121 +#: sha1_name.c:1079 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Upstream-Branch '%s' ist nicht als Remote-Tracking-Branch gespeichert" #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" -msgstr "Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n" +msgstr "" +"Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n" "Sie zuerst die Konflikte auf" #: submodule.c:68 submodule.c:102 @@ -1428,245 +1470,237 @@ msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s" msgid "no such user" msgstr "kein solcher Benutzer" -#: wt-status.c:146 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Nicht zusammengeführte Pfade:" -#: wt-status.c:173 wt-status.c:200 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:175 wt-status.c:202 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:179 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)" -#: wt-status.c:181 wt-status.c:185 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung entsprechend zu " "markieren)" -#: wt-status.c:183 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)" -#: wt-status.c:194 +#: wt-status.c:198 msgid "Changes to be committed:" msgstr "zum Commit vorgemerkte Änderungen:" -#: wt-status.c:212 +#: wt-status.c:216 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" -#: wt-status.c:216 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add <Datei>...\" um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:218 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\" um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:219 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (benutzen Sie \"git checkout -- <Datei>...\" um die Änderungen im " "Arbeitsverzeichnis zu verwerfen)" -#: wt-status.c:221 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (committen oder verwerfen Sie den unbeobachteten oder geänderten Inhalt in " "den Submodulen)" -#: wt-status.c:233 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (benutzen Sie \"git %s <Datei>...\" um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:250 +#: wt-status.c:254 msgid "bug" msgstr "Fehler" -#: wt-status.c:255 +#: wt-status.c:259 msgid "both deleted:" msgstr "beide gelöscht:" -#: wt-status.c:256 +#: wt-status.c:260 msgid "added by us:" msgstr "von uns hinzugefügt:" -#: wt-status.c:257 +#: wt-status.c:261 msgid "deleted by them:" msgstr "von denen gelöscht:" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "von denen hinzugefügt:" -#: wt-status.c:259 +#: wt-status.c:263 msgid "deleted by us:" msgstr "von uns gelöscht:" -#: wt-status.c:260 +#: wt-status.c:264 msgid "both added:" msgstr "von beiden hinzugefügt:" -#: wt-status.c:261 +#: wt-status.c:265 msgid "both modified:" msgstr "von beiden geändert:" -#: wt-status.c:291 -msgid "new commits, " -msgstr "neue Commits, " - -#: wt-status.c:293 -msgid "modified content, " -msgstr "geänderter Inhalt, " - -#: wt-status.c:295 -msgid "untracked content, " -msgstr "unbeobachteter Inhalt, " +#: wt-status.c:275 +msgid "new file" +msgstr "neue Datei" -#: wt-status.c:312 -#, c-format -msgid "new file: %s" -msgstr "neue Datei: %s" +#: wt-status.c:277 +msgid "copied" +msgstr "kopiert" -#: wt-status.c:315 -#, c-format -msgid "copied: %s -> %s" -msgstr "kopiert: %s -> %s" +#: wt-status.c:279 +msgid "deleted" +msgstr "gelöscht" -#: wt-status.c:318 -#, c-format -msgid "deleted: %s" -msgstr "gelöscht: %s" +#: wt-status.c:285 +msgid "typechange" +msgstr "Typänderung" -#: wt-status.c:321 -#, c-format -msgid "modified: %s" -msgstr "geändert: %s" +#: wt-status.c:287 +msgid "unknown" +msgstr "unbekannt" -#: wt-status.c:324 -#, c-format -msgid "renamed: %s -> %s" -msgstr "umbenannt: %s -> %s" +#: wt-status.c:289 +msgid "unmerged" +msgstr "nicht zusammengeführt" -#: wt-status.c:327 -#, c-format -msgid "typechange: %s" -msgstr "Typänderung: %s" +#: wt-status.c:336 +msgid "new commits, " +msgstr "neue Commits, " -#: wt-status.c:330 -#, c-format -msgid "unknown: %s" -msgstr "unbekannt: %s" +#: wt-status.c:338 +msgid "modified content, " +msgstr "geänderter Inhalt, " -#: wt-status.c:333 -#, c-format -msgid "unmerged: %s" -msgstr "nicht zusammengeführt: %s" +#: wt-status.c:340 +msgid "untracked content, " +msgstr "unbeobachteter Inhalt, " -#: wt-status.c:336 +#: wt-status.c:357 #, c-format msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:703 +#: wt-status.c:732 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:705 +#: wt-status.c:734 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:848 +#: wt-status.c:836 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" +"Ändern Sie nicht die obige Zeile.\n" +"Alles unterhalb von ihr wird entfernt." + +#: wt-status.c:899 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:851 +#: wt-status.c:902 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:854 +#: wt-status.c:905 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:857 +#: wt-status.c:908 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\" um den Merge abzuschließen)" -#: wt-status.c:867 +#: wt-status.c:918 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:870 +#: wt-status.c:921 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:874 +#: wt-status.c:925 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)" -#: wt-status.c:876 +#: wt-status.c:927 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\" um diesen Patch auszulassen)" -#: wt-status.c:878 +#: wt-status.c:929 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (benutzen Sie \"git am --abort\" um den ursprünglichen Branch " "wiederherzustellen)" -#: wt-status.c:938 wt-status.c:955 +#: wt-status.c:989 wt-status.c:1006 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'." -#: wt-status.c:943 wt-status.c:960 +#: wt-status.c:994 wt-status.c:1011 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:946 +#: wt-status.c:997 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" " "aus)" -#: wt-status.c:948 +#: wt-status.c:999 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\" um diesen Patch auszulassen)" -#: wt-status.c:950 +#: wt-status.c:1001 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (benutzen Sie \"git rebase --abort\" um den ursprünglichen Branch " "auszuchecken)" -#: wt-status.c:963 +#: wt-status.c:1014 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:967 +#: wt-status.c:1018 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1674,129 +1708,129 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:972 +#: wt-status.c:1023 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:975 +#: wt-status.c:1026 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --" "continue\" aus)" -#: wt-status.c:979 +#: wt-status.c:1030 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf " "'%s'." -#: wt-status.c:984 +#: wt-status.c:1035 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:987 +#: wt-status.c:1038 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\" um den aktuellen Commit nachzubessern)" -#: wt-status.c:989 +#: wt-status.c:1040 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen " "abgeschlossen sind)" -#: wt-status.c:999 +#: wt-status.c:1050 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1004 +#: wt-status.c:1055 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue" "\" aus)" -#: wt-status.c:1007 +#: wt-status.c:1058 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1009 +#: wt-status.c:1060 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (benutzen Sie \"git cherry-pick --abort\" um die Cherry-Pick-Operation " "abzubrechen)" -#: wt-status.c:1018 +#: wt-status.c:1069 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade an einem Revert von Commit '%s'." -#: wt-status.c:1023 +#: wt-status.c:1074 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" " "aus)" -#: wt-status.c:1026 +#: wt-status.c:1077 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1028 +#: wt-status.c:1079 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\" um die Revert-Operation abzubrechen)" -#: wt-status.c:1039 +#: wt-status.c:1090 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'." -#: wt-status.c:1043 +#: wt-status.c:1094 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1046 +#: wt-status.c:1097 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (benutzen Sie \"git bisect reset\" um zum ursprünglichen Branch " "zurückzukehren)" -#: wt-status.c:1221 +#: wt-status.c:1272 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1228 +#: wt-status.c:1279 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1235 +#: wt-status.c:1286 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1237 +#: wt-status.c:1288 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1240 +#: wt-status.c:1291 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1257 +#: wt-status.c:1308 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1271 +#: wt-status.c:1322 msgid "Untracked files" msgstr "Unbeobachtete Dateien" -#: wt-status.c:1273 +#: wt-status.c:1324 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1277 +#: wt-status.c:1328 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1807,32 +1841,32 @@ msgstr "" "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." -#: wt-status.c:1283 +#: wt-status.c:1334 #, c-format msgid "Untracked files not listed%s" msgstr "Unbeobachtete Dateien nicht aufgelistet%s" -#: wt-status.c:1285 +#: wt-status.c:1336 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u um unbeobachteten Dateien anzuzeigen)" -#: wt-status.c:1291 +#: wt-status.c:1342 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1296 +#: wt-status.c:1347 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder " "\"git commit -a\")\n" -#: wt-status.c:1299 +#: wt-status.c:1350 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1302 +#: wt-status.c:1353 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1841,60 +1875,60 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unbeobachtete Dateien (benutzen " "Sie \"git add\" zum Beobachten)\n" -#: wt-status.c:1305 +#: wt-status.c:1356 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Commit vorgemerkt, aber es gibt unbeobachtete Dateien\n" -#: wt-status.c:1308 +#: wt-status.c:1359 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git " "add\" zum Beobachten)\n" -#: wt-status.c:1311 wt-status.c:1316 +#: wt-status.c:1362 wt-status.c:1367 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1314 +#: wt-status.c:1365 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nichts zu committen (benutzen Sie die Option -u, um unbeobachtete Dateien " "anzuzeigen)\n" -#: wt-status.c:1318 +#: wt-status.c:1369 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1427 +#: wt-status.c:1478 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1433 +#: wt-status.c:1484 msgid "Initial commit on " msgstr "Initialer Commit auf " -#: wt-status.c:1463 +#: wt-status.c:1514 msgid "gone" msgstr "entfernt" -#: wt-status.c:1465 +#: wt-status.c:1516 msgid "behind " msgstr "hinterher " -#: wt-status.c:1468 wt-status.c:1471 +#: wt-status.c:1519 wt-status.c:1522 msgid "ahead " msgstr "voraus " -#: wt-status.c:1473 +#: wt-status.c:1524 msgid ", behind " msgstr ", hinterher " -#: compat/precompose_utf8.c:55 builtin/clone.c:350 +#: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." @@ -2027,15 +2061,15 @@ msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 #: builtin/rm.c:269 msgid "dry run" msgstr "Probelauf" #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "erweiterte Ausgaben" @@ -2120,11 +2154,11 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Wollten Sie vielleicht 'git add .' sagen?\n" #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "Staging-Area-Datei beschädigt" -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "Konnte neue Staging-Area-Datei nicht schreiben." @@ -2463,7 +2497,7 @@ msgid "unable to read index file" msgstr "Konnte Staging-Area-Datei nicht lesen" #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 -#: builtin/fetch.c:77 +#: builtin/fetch.c:78 msgid "path" msgstr "Pfad" @@ -2678,96 +2712,96 @@ msgstr "git blame [Optionen] [rev-opts] [rev] [--] Datei" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-opts] sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:2248 +#: builtin/blame.c:2249 msgid "Show blame entries as we find them, incrementally" msgstr "Zeigt \"blame\"-Einträge schrittweise, während wir sie generieren" -#: builtin/blame.c:2249 +#: builtin/blame.c:2250 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Zeigt leere SHA-1 für Grenz-Commits (Standard: aus)" -#: builtin/blame.c:2250 +#: builtin/blame.c:2251 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandelt Ursprungs-Commit nicht als Grenzen (Standard: aus)" -#: builtin/blame.c:2251 +#: builtin/blame.c:2252 msgid "Show work cost statistics" msgstr "Zeigt Statistiken zum Arbeitsaufwand" -#: builtin/blame.c:2252 +#: builtin/blame.c:2253 msgid "Show output score for blame entries" msgstr "Zeigt Ausgabebewertung für \"blame\"-Einträge" -#: builtin/blame.c:2253 +#: builtin/blame.c:2254 msgid "Show original filename (Default: auto)" msgstr "Zeigt ursprünglichen Dateinamen (Standard: auto)" -#: builtin/blame.c:2254 +#: builtin/blame.c:2255 msgid "Show original linenumber (Default: off)" msgstr "Zeigt ursprüngliche Zeilennummer (Standard: aus)" -#: builtin/blame.c:2255 +#: builtin/blame.c:2256 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:2256 +#: builtin/blame.c:2257 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:2257 +#: builtin/blame.c:2258 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Benutzt den gleichen Ausgabemodus wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:2258 +#: builtin/blame.c:2259 msgid "Show raw timestamp (Default: off)" msgstr "Zeigt unbearbeiteten Zeitstempel (Standard: aus)" -#: builtin/blame.c:2259 +#: builtin/blame.c:2260 msgid "Show long commit SHA1 (Default: off)" msgstr "Zeigt langen Commit-SHA1 (Standard: aus)" -#: builtin/blame.c:2260 +#: builtin/blame.c:2261 msgid "Suppress author name and timestamp (Default: off)" msgstr "Unterdrückt den Namen des Autors und den Zeitstempel (Standard: aus)" -#: builtin/blame.c:2261 +#: builtin/blame.c:2262 msgid "Show author email instead of name (Default: off)" msgstr "Zeigt anstatt des Namens die Email-Adresse des Autors (Standard: aus)" -#: builtin/blame.c:2262 +#: builtin/blame.c:2263 msgid "Ignore whitespace differences" msgstr "Ignoriert Unterschiede im Whitespace" -#: builtin/blame.c:2263 +#: builtin/blame.c:2264 msgid "Spend extra cycles to find better match" msgstr "arbeite länger, um bessere Übereinstimmungen zu finden" -#: builtin/blame.c:2264 +#: builtin/blame.c:2265 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Benutzt Commits von <Datei> anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:2265 +#: builtin/blame.c:2266 msgid "Use <file>'s contents as the final image" msgstr "Benutzt Inhalte der <Datei>en als entgültiges Abbild" -#: builtin/blame.c:2266 builtin/blame.c:2267 +#: builtin/blame.c:2267 builtin/blame.c:2268 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:2266 +#: builtin/blame.c:2267 msgid "Find line copies within and across files" msgstr "Findet kopierte Zeilen innerhalb oder zwischen Dateien" -#: builtin/blame.c:2267 +#: builtin/blame.c:2268 msgid "Find line movements within and across files" msgstr "Findet verschobene Zeilen innerhalb oder zwischen Dateien" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "Process only line range n,m, counting from 1" msgstr "Verarbeitet nur Zeilen im Bereich n,m, gezählt von 1" @@ -2873,252 +2907,252 @@ msgstr "Branch %s entfernt (war %s).\n" msgid "branch '%s' does not point at a commit" msgstr "Branch '%s' zeigt auf keinen Commit" -#: builtin/branch.c:453 +#: builtin/branch.c:454 #, c-format msgid "[%s: gone]" msgstr "[%s: entfernt]" -#: builtin/branch.c:456 +#: builtin/branch.c:459 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s: behind %d]" msgstr "[%s: %d hinterher]" -#: builtin/branch.c:461 +#: builtin/branch.c:466 #, c-format msgid "[behind %d]" msgstr "[%d hinterher]" -#: builtin/branch.c:465 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: %d voraus]" -#: builtin/branch.c:467 +#: builtin/branch.c:472 #, c-format msgid "[ahead %d]" msgstr "[%d voraus]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: %d voraus, %d hinterher]" -#: builtin/branch.c:473 +#: builtin/branch.c:478 #, c-format msgid "[ahead %d, behind %d]" msgstr "[%d voraus, %d hinterher]" -#: builtin/branch.c:496 +#: builtin/branch.c:502 msgid " **** invalid ref ****" msgstr " **** ungültige Referenz ****" -#: builtin/branch.c:588 +#: builtin/branch.c:594 #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: builtin/branch.c:591 +#: builtin/branch.c:597 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" -#: builtin/branch.c:594 +#: builtin/branch.c:600 #, c-format msgid "(detached from %s)" msgstr "(losgelöst von %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(kein Branch)" -#: builtin/branch.c:643 +#: builtin/branch.c:649 #, c-format msgid "object '%s' does not point to a commit" msgstr "Objekt '%s' zeigt auf keinen Commit" -#: builtin/branch.c:675 +#: builtin/branch.c:681 msgid "some refs could not be read" msgstr "Konnte einige Referenzen nicht lesen" -#: builtin/branch.c:688 +#: builtin/branch.c:694 msgid "cannot rename the current branch while not on any." msgstr "" "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden." -#: builtin/branch.c:698 +#: builtin/branch.c:704 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:713 +#: builtin/branch.c:719 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:717 +#: builtin/branch.c:723 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:721 +#: builtin/branch.c:727 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!" -#: builtin/branch.c:728 +#: builtin/branch.c:734 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:743 +#: builtin/branch.c:749 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: builtin/branch.c:767 +#: builtin/branch.c:773 #, c-format msgid "could not write branch description template: %s" msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s" -#: builtin/branch.c:797 +#: builtin/branch.c:803 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:799 +#: builtin/branch.c:805 msgid "show hash and subject, give twice for upstream branch" msgstr "Zeigt Hash und Betreff; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:800 +#: builtin/branch.c:806 msgid "suppress informational messages" msgstr "unterdrückt Informationsmeldungen" -#: builtin/branch.c:801 +#: builtin/branch.c:807 msgid "set up tracking mode (see git-pull(1))" msgstr "stellt den Übernahmemodus ein (siehe git-pull(1))" -#: builtin/branch.c:803 +#: builtin/branch.c:809 msgid "change upstream info" msgstr "ändert Informationen zum Upstream-Branch" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "use colored output" msgstr "verwendet farbliche Ausgaben" -#: builtin/branch.c:808 +#: builtin/branch.c:814 msgid "act on remote-tracking branches" msgstr "wirkt auf Remote-Tracking-Branches" -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "Commit" -#: builtin/branch.c:812 builtin/branch.c:818 +#: builtin/branch.c:818 builtin/branch.c:824 msgid "print only branches that contain the commit" msgstr "gibt nur Branches aus, welche diesen Commit beinhalten" -#: builtin/branch.c:824 +#: builtin/branch.c:830 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:825 +#: builtin/branch.c:831 msgid "list both remote-tracking and local branches" msgstr "listet Remote-Tracking und lokale Branches auf" -#: builtin/branch.c:827 +#: builtin/branch.c:833 msgid "delete fully merged branch" msgstr "entfernt vollständig zusammengeführten Branch" -#: builtin/branch.c:828 +#: builtin/branch.c:834 msgid "delete branch (even if not merged)" msgstr "löscht Branch (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:829 +#: builtin/branch.c:835 msgid "move/rename a branch and its reflog" msgstr "verschiebt/benennt einen Branch und dessen Reflog um" -#: builtin/branch.c:830 +#: builtin/branch.c:836 msgid "move/rename a branch, even if target exists" msgstr "" "verschiebt/benennt einen Branch um, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:831 +#: builtin/branch.c:837 msgid "list branch names" msgstr "listet Branchnamen auf" -#: builtin/branch.c:832 +#: builtin/branch.c:838 msgid "create the branch's reflog" msgstr "erzeugt das Reflog des Branches" -#: builtin/branch.c:834 +#: builtin/branch.c:840 msgid "edit the description for the branch" msgstr "bearbeitet die Beschreibung für den Branch" -#: builtin/branch.c:835 +#: builtin/branch.c:841 msgid "force creation (when already exists)" msgstr "erzeuge auch, wenn der Branch bereits existiert" -#: builtin/branch.c:838 +#: builtin/branch.c:844 msgid "print only not merged branches" msgstr "gibt nur Branches aus, die nicht zusammengeführt sind" -#: builtin/branch.c:844 +#: builtin/branch.c:850 msgid "print only merged branches" msgstr "gibt nur Branches aus, die zusammengeführt sind" -#: builtin/branch.c:848 +#: builtin/branch.c:854 msgid "list branches in columns" msgstr "listet Branches in Spalten auf" -#: builtin/branch.c:861 +#: builtin/branch.c:867 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: builtin/branch.c:866 builtin/clone.c:629 +#: builtin/branch.c:872 builtin/clone.c:635 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:890 +#: builtin/branch.c:896 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:896 builtin/branch.c:935 +#: builtin/branch.c:902 builtin/branch.c:941 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:911 +#: builtin/branch.c:917 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:916 +#: builtin/branch.c:922 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:923 +#: builtin/branch.c:929 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:926 +#: builtin/branch.c:932 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:941 +#: builtin/branch.c:947 msgid "too many branches for a rename operation" msgstr "zu viele Branches für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:946 +#: builtin/branch.c:952 msgid "too many branches to set new upstream" msgstr "zu viele Branches angegeben um Upstream-Branch zu setzen" -#: builtin/branch.c:950 +#: builtin/branch.c:956 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3126,43 +3160,43 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:957 +#: builtin/branch.c:963 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:969 +#: builtin/branch.c:975 msgid "too many branches to unset upstream" msgstr "" "zu viele Branches angegeben um Konfiguration zu Upstream-Branch zu entfernen" -#: builtin/branch.c:973 +#: builtin/branch.c:979 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n" "auf keinen Branch zeigt." -#: builtin/branch.c:979 +#: builtin/branch.c:985 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:994 +#: builtin/branch.c:999 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD' darf nicht manuell erstellt werden" -#: builtin/branch.c:1000 +#: builtin/branch.c:1005 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " "Branchnamen verwendet werden." -#: builtin/branch.c:1003 +#: builtin/branch.c:1008 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3171,7 +3205,7 @@ msgstr "" "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" "track oder --set-upstream-to\n" -#: builtin/branch.c:1020 +#: builtin/branch.c:1025 #, c-format msgid "" "\n" @@ -3182,12 +3216,12 @@ msgstr "" "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen " "Sie aus:\n" -#: builtin/branch.c:1021 +#: builtin/branch.c:1026 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1022 +#: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3205,45 +3239,45 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benötigt." -#: builtin/cat-file.c:312 +#: builtin/cat-file.c:328 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<Art>|--textconv) <Objekt>" -#: builtin/cat-file.c:313 +#: builtin/cat-file.c:329 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <Liste_von_Objekten>" -#: builtin/cat-file.c:350 +#: builtin/cat-file.c:366 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:351 +#: builtin/cat-file.c:367 msgid "show object type" msgstr "zeigt Objektart" -#: builtin/cat-file.c:352 +#: builtin/cat-file.c:368 msgid "show object size" msgstr "zeigt Objektgröße" -#: builtin/cat-file.c:354 +#: builtin/cat-file.c:370 msgid "exit with zero when there's no error" msgstr "beendet mit Rückgabewert 0, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:355 +#: builtin/cat-file.c:371 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:357 +#: builtin/cat-file.c:373 msgid "for blob objects, run textconv on object's content" msgstr "führt eine Textkonvertierung auf den Inhalt von Blob-Objekten aus" -#: builtin/cat-file.c:359 +#: builtin/cat-file.c:375 msgid "show info and content of objects fed from the standard input" msgstr "" "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-" "Eingabe" -#: builtin/cat-file.c:362 +#: builtin/cat-file.c:378 msgid "show info about objects fed from the standard input" msgstr "" "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" @@ -3273,7 +3307,7 @@ msgstr "liest Dateinamen von der Standard-Eingabe" msgid "terminate input and output records by a NUL character" msgstr "schließt Einträge von Ein- und Ausgabe mit NUL-Zeichen ab" -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 msgid "suppress progress reporting" msgstr "unterdrückt Fortschrittsanzeige" @@ -3569,7 +3603,7 @@ msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 -#: builtin/remote.c:169 builtin/remote.c:171 +#: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "Branch" @@ -3617,11 +3651,11 @@ msgstr "erzwingt Auschecken (verwirft lokale Änderungen)" msgid "perform a 3-way merge with the new branch" msgstr "führt einen 3-Wege-Merge mit dem neuen Branch aus" -#: builtin/checkout.c:1106 builtin/merge.c:232 +#: builtin/checkout.c:1106 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "aktualisiert ignorierte Dateien (Standard)" -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 msgid "style" msgstr "Stil" @@ -3820,7 +3854,7 @@ msgid "remove whole directories" msgstr "löscht ganze Verzeichnisse" #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "Muster" @@ -3860,8 +3894,8 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [Optionen] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 -#: builtin/push.c:474 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 +#: builtin/push.c:521 msgid "force progress reporting" msgstr "erzwingt Fortschrittsanzeige" @@ -3921,13 +3955,13 @@ msgstr "checkt <Branch> aus, anstatt HEAD des Remote-Repositories" msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 msgid "depth" msgstr "Tiefe" #: builtin/clone.c:93 msgid "create a shallow clone of that depth" -msgstr "erstellt einen flachen Klon mit dieser Tiefe" +msgstr "erstellt einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe" #: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" @@ -3954,42 +3988,52 @@ msgstr "setzt Konfiguration innerhalb des neuen Repositories" msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: builtin/clone.c:315 +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." + +#: builtin/clone.c:259 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") eingehängt." + +#: builtin/clone.c:321 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/clone.c:317 builtin/diff.c:77 +#: builtin/clone.c:323 builtin/diff.c:83 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: builtin/clone.c:319 +#: builtin/clone.c:325 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:333 +#: builtin/clone.c:339 #, c-format msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:355 +#: builtin/clone.c:361 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:359 +#: builtin/clone.c:365 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:382 builtin/clone.c:559 +#: builtin/clone.c:388 builtin/clone.c:565 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:395 +#: builtin/clone.c:401 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -3999,103 +4043,113 @@ msgstr "" "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n" "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n" -#: builtin/clone.c:474 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:554 +#: builtin/clone.c:560 #, c-format msgid "Checking connectivity... " msgstr "Prüfe Konnektivität... " -#: builtin/clone.c:557 +#: builtin/clone.c:563 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: builtin/clone.c:620 +#: builtin/clone.c:626 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann " "nicht ausgecheckt werden.\n" -#: builtin/clone.c:651 +#: builtin/clone.c:657 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:759 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:763 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:774 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:777 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:790 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:795 +#: builtin/clone.c:802 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " "stattdessen file://" -#: builtin/clone.c:797 +#: builtin/clone.c:805 +msgid "source repository is shallow, ignoring --local" +msgstr "Quelle ist ein Repository mit unvollständiger Historie (shallow)," +"ignoriere --local" + +#: builtin/clone.c:810 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:807 +#: builtin/clone.c:814 builtin/fetch.c:1119 +#, c-format +msgid "depth %s is not a positive number" +msgstr "Tiefe %s ist keine positive Zahl" + +#: builtin/clone.c:824 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:817 +#: builtin/clone.c:834 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:830 builtin/clone.c:842 +#: builtin/clone.c:847 builtin/clone.c:859 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:833 +#: builtin/clone.c:850 #, c-format msgid "could not create work tree dir '%s'." msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen." -#: builtin/clone.c:852 +#: builtin/clone.c:869 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s'...\n" -#: builtin/clone.c:854 +#: builtin/clone.c:871 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s'...\n" -#: builtin/clone.c:888 +#: builtin/clone.c:906 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:939 builtin/clone.c:947 +#: builtin/clone.c:957 builtin/clone.c:965 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:950 +#: builtin/clone.c:968 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -4464,7 +4518,7 @@ msgstr "zeigt Status im Kurzformat" msgid "show branch information" msgstr "zeigt Branchinformationen" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" @@ -4547,7 +4601,7 @@ msgstr "Autor" msgid "override author for commit" msgstr "überschreibt Autor eines Commits" -#: builtin/commit.c:1458 builtin/gc.c:260 +#: builtin/commit.c:1458 builtin/gc.c:261 msgid "date" msgstr "Datum" @@ -4555,7 +4609,7 @@ msgstr "Datum" msgid "override date for commit" msgstr "überschreibt Datum eines Commits" -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 #: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "Beschreibung" @@ -4613,11 +4667,11 @@ msgstr "" msgid "include status in commit message template" msgstr "fügt Status in die Commit-Beschreibungsvorlage ein" -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 msgid "key id" msgstr "Schlüssel-ID" -#: builtin/commit.c:1471 builtin/merge.c:231 +#: builtin/commit.c:1471 builtin/merge.c:224 msgid "GPG sign commit" msgstr "signiert Commit mit GPG" @@ -4674,7 +4728,7 @@ msgstr "erlaubt Aufzeichnung einer Änderung mit einer leeren Beschreibung" msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: builtin/commit.c:1567 builtin/merge.c:525 +#: builtin/commit.c:1567 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." @@ -4693,29 +4747,29 @@ msgstr "Konnte MERGE_MODE nicht lesen" msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1614 +#: builtin/commit.c:1611 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: builtin/commit.c:1655 +#: builtin/commit.c:1652 msgid "cannot lock HEAD ref" msgstr "Kann Referenz von HEAD nicht sperren." -#: builtin/commit.c:1659 +#: builtin/commit.c:1656 msgid "cannot update HEAD ref" msgstr "Kann Referenz von HEAD nicht aktualisieren." -#: builtin/commit.c:1670 +#: builtin/commit.c:1667 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4978,7 +5032,7 @@ msgstr "betrachtet die jüngsten <n> Tags (Standard: 10)" msgid "only consider tags matching <pattern>" msgstr "betrachtet nur Tags die <Muster> entsprechen" -#: builtin/describe.c:423 builtin/name-rev.c:322 +#: builtin/describe.c:423 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "zeigt gekürztes Commit-Objekt, wenn sonst nichts zutrifft" @@ -5004,31 +5058,31 @@ msgstr "Keine Namen gefunden, kann nichts beschreiben." msgid "--dirty is incompatible with commit-ishes" msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." -#: builtin/diff.c:79 +#: builtin/diff.c:85 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': keine reguläre Datei oder symbolischer Verweis" -#: builtin/diff.c:230 +#: builtin/diff.c:236 #, c-format msgid "invalid option: %s" msgstr "Ungültige Option: %s" -#: builtin/diff.c:307 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Kein Git-Repository" -#: builtin/diff.c:350 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungültig." -#: builtin/diff.c:359 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:366 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" @@ -5089,147 +5143,157 @@ msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:74 +#: builtin/fetch.c:75 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:76 +#: builtin/fetch.c:77 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "hängt an .git/FETCH_HEAD an, anstatt zu überschreiben" -#: builtin/fetch.c:78 +#: builtin/fetch.c:79 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:79 +#: builtin/fetch.c:80 msgid "force overwrite of local branch" msgstr "erzwingt das Überschreiben von lokalen Branches" -#: builtin/fetch.c:81 +#: builtin/fetch.c:82 msgid "fetch from multiple remotes" msgstr "fordert von mehreren Remote-Repositories an" -#: builtin/fetch.c:83 +#: builtin/fetch.c:84 msgid "fetch all tags and associated objects" msgstr "fordert alle Tags und verbundene Objekte an" -#: builtin/fetch.c:85 +#: builtin/fetch.c:86 msgid "do not fetch all tags (--no-tags)" msgstr "fordert nicht alle Tags an (--no-tags)" -#: builtin/fetch.c:87 +#: builtin/fetch.c:88 msgid "prune remote-tracking branches no longer on remote" msgstr "" "entfernt Remote-Tracking-Branches, die sich nicht mehr im Remote-Repository " "befinden" -#: builtin/fetch.c:88 +#: builtin/fetch.c:89 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:89 +#: builtin/fetch.c:90 msgid "control recursive fetching of submodules" msgstr "kontrolliert rekursive Anforderungen von Submodulen" -#: builtin/fetch.c:93 +#: builtin/fetch.c:94 msgid "keep downloaded pack" msgstr "behält heruntergeladenes Paket" -#: builtin/fetch.c:95 +#: builtin/fetch.c:96 msgid "allow updating of HEAD ref" msgstr "erlaubt Aktualisierung der \"HEAD\"-Referenz" -#: builtin/fetch.c:98 +#: builtin/fetch.c:99 msgid "deepen history of shallow clone" -msgstr "vertieft die Historie eines flachen Klons" +msgstr "vertieft die Historie eines Klons mit unvollständiger Historie (shallow)" -#: builtin/fetch.c:100 +#: builtin/fetch.c:101 msgid "convert to a complete repository" msgstr "konvertiert zu einem vollständigen Repository" -#: builtin/fetch.c:102 builtin/log.c:1197 +#: builtin/fetch.c:103 builtin/log.c:1197 msgid "dir" msgstr "Verzeichnis" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 msgid "prepend this to submodule path output" msgstr "stellt dies an die Ausgabe der Submodul-Pfade voran" -#: builtin/fetch.c:106 +#: builtin/fetch.c:107 msgid "default mode for recursion" msgstr "Standard-Modus für Rekursion" -#: builtin/fetch.c:236 +#: builtin/fetch.c:109 +msgid "accept refs that update .git/shallow" +msgstr "akzeptiert Referenzen die .git/shallow aktualisieren" + +#: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:290 +#: builtin/fetch.c:411 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:295 +#: builtin/fetch.c:416 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:309 +#: builtin/fetch.c:430 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" "! %-*s %-*s -> %s (kann \"fetch\" im aktuellen Branch nicht ausführen)" -#: builtin/fetch.c:310 builtin/fetch.c:396 +#: builtin/fetch.c:431 builtin/fetch.c:517 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:321 +#: builtin/fetch.c:442 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 msgid " (unable to update local ref)" msgstr " (kann lokale Referenz nicht aktualisieren)" -#: builtin/fetch.c:341 +#: builtin/fetch.c:462 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:344 +#: builtin/fetch.c:465 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:347 +#: builtin/fetch.c:468 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:398 +#: builtin/fetch.c:519 msgid "(non-fast-forward)" msgstr "(kein Vorspulen)" -#: builtin/fetch.c:429 builtin/fetch.c:735 +#: builtin/fetch.c:552 builtin/fetch.c:785 #, c-format msgid "cannot open %s: %s\n" msgstr "kann %s nicht öffnen: %s\n" -#: builtin/fetch.c:438 +#: builtin/fetch.c:561 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:537 +#: builtin/fetch.c:579 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "%s wurde zurückgewiesen, da Ursprungs-Commits von Repositories" +"mit unvollständiger Historie (shallow) nicht aktualisiert werden dürfen." + +#: builtin/fetch.c:667 builtin/fetch.c:750 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:548 +#: builtin/fetch.c:678 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5238,57 +5302,57 @@ msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" "'git remote prune %s' um jeden älteren, widersprüchlichen Branch zu löschen." -#: builtin/fetch.c:598 +#: builtin/fetch.c:730 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:599 +#: builtin/fetch.c:731 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:606 +#: builtin/fetch.c:755 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:607 builtin/remote.c:1055 +#: builtin/fetch.c:756 builtin/remote.c:1050 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:725 +#: builtin/fetch.c:775 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Der \"fetch\" in den aktuellen Branch %s von einem nicht-Bare-Repository " "wurde verweigert." -#: builtin/fetch.c:744 +#: builtin/fetch.c:794 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" -#: builtin/fetch.c:747 +#: builtin/fetch.c:797 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:801 +#: builtin/fetch.c:853 #, c-format msgid "Don't know how to fetch from %s" msgstr "Weiß nicht wie von %s angefordert wird." -#: builtin/fetch.c:976 +#: builtin/fetch.c:1015 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:978 builtin/remote.c:100 +#: builtin/fetch.c:1017 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1036 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5297,35 +5361,35 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1020 +#: builtin/fetch.c:1059 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1068 +#: builtin/fetch.c:1107 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1109 msgid "--unshallow on a complete repository does not make sense" msgstr "" -"Die Option --unshallow kann nicht in einem vollständigen Repository " +"Die Option --unshallow kann nicht in einem Repository mit unvollständiger Historie " "verwendet werden." -#: builtin/fetch.c:1089 +#: builtin/fetch.c:1132 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1091 +#: builtin/fetch.c:1134 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1145 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1110 +#: builtin/fetch.c:1153 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n" @@ -5337,8 +5401,9 @@ msgstr "" "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>]|--no-log] [--file <Datei>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 +#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446 +#: parse-options.h:135 parse-options.h:242 msgid "n" msgstr "Anzahl" @@ -5362,43 +5427,43 @@ msgstr "verwendet <Text> als Beschreibungsanfang" msgid "file to read from" msgstr "Datei zum Einlesen" -#: builtin/for-each-ref.c:995 +#: builtin/for-each-ref.c:1063 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [Optionen] [<Muster>]" -#: builtin/for-each-ref.c:1010 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "formatiert Platzhalter als Shell-String" -#: builtin/for-each-ref.c:1012 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "formatiert Platzhalter als Perl-String" -#: builtin/for-each-ref.c:1014 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "formatiert Platzhalter als Python-String" -#: builtin/for-each-ref.c:1016 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for tcl" msgstr "formatiert Platzhalter als TCL-String" -#: builtin/for-each-ref.c:1019 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "zeigt nur <n> passende Referenzen" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177 msgid "format" msgstr "Format" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/for-each-ref.c:1021 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "Schüssel" -#: builtin/for-each-ref.c:1022 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" @@ -5442,42 +5507,43 @@ msgstr "aktiviert genauere Prüfung" msgid "write dangling objects in .git/lost-found" msgstr "schreibt unreferenzierte Objekte nach .git/lost-found" -#: builtin/fsck.c:623 builtin/prune.c:134 +#: builtin/fsck.c:623 builtin/prune.c:144 msgid "show progress" msgstr "zeigt Fortschrittsanzeige" -#: builtin/gc.c:23 +#: builtin/gc.c:24 msgid "git gc [options]" msgstr "git gc [Optionen]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Invalid %s: '%s'" msgstr "Ungültiger %s: '%s'" -#: builtin/gc.c:106 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "zu langes Objekt-Verzeichnis %.*s" -#: builtin/gc.c:261 +#: builtin/gc.c:262 msgid "prune unreferenced objects" msgstr "entfernt unreferenzierte Objekte" -#: builtin/gc.c:263 +#: builtin/gc.c:264 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:264 +#: builtin/gc.c:265 msgid "enable auto-gc mode" msgstr "aktiviert \"auto-gc\" Modus" -#: builtin/gc.c:265 +#: builtin/gc.c:266 msgid "force running gc even if there may be another gc running" -msgstr "erzwingt Ausführung von \"git gc\" selbst wenn ein anderes\n" +msgstr "" +"erzwingt Ausführung von \"git gc\" selbst wenn ein anderes\n" "\"git gc\" bereits ausgeführt wird" -#: builtin/gc.c:305 +#: builtin/gc.c:306 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -5488,7 +5554,7 @@ msgstr "" "Siehe \"git help gc\" für weitere Informationen.\n" #. be quiet on --auto -#: builtin/gc.c:315 +#: builtin/gc.c:316 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5496,7 +5562,7 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:340 +#: builtin/gc.c:341 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5845,57 +5911,57 @@ msgstr "" "'%s': Kommando für unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen." -#: builtin/help.c:349 +#: builtin/help.c:353 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': unbekannter Handbuch-Betrachter." -#: builtin/help.c:366 +#: builtin/help.c:370 msgid "no man viewer handled the request" msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:374 +#: builtin/help.c:378 msgid "no info viewer handled the request" msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:420 +#: builtin/help.c:424 msgid "Defining attributes per path" msgstr "Definition von Attributen pro Pfad" -#: builtin/help.c:421 +#: builtin/help.c:425 msgid "A Git glossary" msgstr "Ein Git-Glossar" -#: builtin/help.c:422 +#: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" msgstr "Spezifikation von bewusst ignorierten, unbeobachteten Dateien" -#: builtin/help.c:423 +#: builtin/help.c:427 msgid "Defining submodule properties" msgstr "Definition von Submodul-Eigenschaften" -#: builtin/help.c:424 +#: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" msgstr "Spezifikation von Commits und Bereichen für Git" -#: builtin/help.c:425 +#: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Eine einführende Anleitung zu Git (für Version 1.5.1 oder neuer)" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "An overview of recommended workflows with Git" msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git" -#: builtin/help.c:438 +#: builtin/help.c:442 msgid "The common Git guides are:\n" msgstr "Die allgemein verwendeten Git-Anleitungen sind:\n" -#: builtin/help.c:460 builtin/help.c:476 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "Verwendung: %s%s" -#: builtin/help.c:492 +#: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "für `git %s' wurde der Alias `%s' angelegt" @@ -6305,21 +6371,21 @@ msgstr "Berechtigungen" msgid "specify that the git repository is to be shared amongst several users" msgstr "gibt an, dass das Git-Repository mit mehreren Benutzern geteilt wird" -#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/init-db.c:522 builtin/init-db.c:529 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht erstellen" -#: builtin/init-db.c:533 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:555 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6328,11 +6394,11 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:579 +#: builtin/init-db.c:580 msgid "Cannot access current working directory" msgstr "Kann nicht auf aktuelles Arbeitsverzeichnis zugreifen." -#: builtin/init-db.c:586 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen." @@ -6768,153 +6834,153 @@ msgstr "Verfügbare Strategien sind:" msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:198 +#: builtin/merge.c:191 msgid "do not show a diffstat at the end of the merge" msgstr "zeigt keine Zusammenfassung der Unterschiede am Schluss des Merges an" -#: builtin/merge.c:201 +#: builtin/merge.c:194 msgid "show a diffstat at the end of the merge" msgstr "zeigt eine Zusammenfassung der Unterschiede am Schluss des Merges an" -#: builtin/merge.c:202 +#: builtin/merge.c:195 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:204 +#: builtin/merge.c:197 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "fügt (höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-" "Commits hinzu" -#: builtin/merge.c:207 +#: builtin/merge.c:200 msgid "create a single commit instead of doing a merge" msgstr "erzeugt einen einzelnen Commit anstatt eines Merges" -#: builtin/merge.c:209 +#: builtin/merge.c:202 msgid "perform a commit if the merge succeeds (default)" msgstr "führt einen Commit durch, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:211 +#: builtin/merge.c:204 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:212 +#: builtin/merge.c:205 msgid "allow fast-forward (default)" msgstr "erlaubt Vorspulen (Standard)" -#: builtin/merge.c:214 +#: builtin/merge.c:207 msgid "abort if fast-forward is not possible" msgstr "bricht ab, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:218 +#: builtin/merge.c:211 msgid "Verify that the named commit has a valid GPG signature" msgstr "überprüft den genannten Commit auf eine gültige GPG-Signatur" -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:220 +#: builtin/merge.c:213 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:221 +#: builtin/merge.c:214 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:222 +#: builtin/merge.c:215 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:224 +#: builtin/merge.c:217 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "führt Commit-Beschreibung zusammen (für einen Merge, der kein Vorspulen war)" -#: builtin/merge.c:228 +#: builtin/merge.c:221 msgid "abort the current in-progress merge" msgstr "bricht den sich im Gange befindlichen Merge ab" -#: builtin/merge.c:257 +#: builtin/merge.c:250 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." -#: builtin/merge.c:262 +#: builtin/merge.c:255 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:267 +#: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:286 builtin/merge.c:303 +#: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:333 +#: builtin/merge.c:326 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:346 +#: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:378 +#: builtin/merge.c:371 msgid "Writing SQUASH_MSG" msgstr "Schreibe SQUASH_MSG" -#: builtin/merge.c:380 +#: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" msgstr "Schließe SQUASH_MSG ab" -#: builtin/merge.c:403 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:453 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:565 +#: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:650 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: builtin/merge.c:685 +#: builtin/merge.c:678 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:699 +#: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:713 +#: builtin/merge.c:706 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:802 +#: builtin/merge.c:795 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:811 +#: builtin/merge.c:804 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Merge wurde nicht committet; benutzen Sie 'git commit' um den Merge " "abzuschließen.\n" -#: builtin/merge.c:817 +#: builtin/merge.c:810 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6930,50 +6996,50 @@ msgstr "" "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/merge.c:841 +#: builtin/merge.c:834 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:853 +#: builtin/merge.c:846 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:918 +#: builtin/merge.c:911 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen " "Sie dann das Ergebnis.\n" -#: builtin/merge.c:934 +#: builtin/merge.c:927 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ist kein Commit" -#: builtin/merge.c:975 +#: builtin/merge.c:968 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:977 +#: builtin/merge.c:970 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:979 +#: builtin/merge.c:972 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert." -#: builtin/merge.c:984 +#: builtin/merge.c:977 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:1140 +#: builtin/merge.c:1133 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge zum Abbrechen (vermisse MERGE_HEAD)" -#: builtin/merge.c:1156 git-pull.sh:31 +#: builtin/merge.c:1149 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6981,11 +7047,11 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen können." -#: builtin/merge.c:1159 git-pull.sh:34 +#: builtin/merge.c:1152 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: builtin/merge.c:1163 +#: builtin/merge.c:1156 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6993,143 +7059,151 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen können." -#: builtin/merge.c:1166 +#: builtin/merge.c:1159 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1175 +#: builtin/merge.c:1168 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1184 +#: builtin/merge.c:1177 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1216 +#: builtin/merge.c:1209 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen." -#: builtin/merge.c:1219 +#: builtin/merge.c:1212 msgid "Squash commit into empty head not supported yet" msgstr "" "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen." -#: builtin/merge.c:1221 +#: builtin/merge.c:1214 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet " "werden." -#: builtin/merge.c:1226 +#: builtin/merge.c:1219 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1277 +#: builtin/merge.c:1270 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1280 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s." #. 'N' -#: builtin/merge.c:1283 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: builtin/merge.c:1286 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n" -#: builtin/merge.c:1370 +#: builtin/merge.c:1363 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1409 +#: builtin/merge.c:1402 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge...\n" -#: builtin/merge.c:1416 +#: builtin/merge.c:1409 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1448 +#: builtin/merge.c:1441 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1471 builtin/merge.c:1550 +#: builtin/merge.c:1464 builtin/merge.c:1543 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung...\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1468 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s...\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1534 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1543 +#: builtin/merge.c:1536 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1545 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutzen Sie \"%s\" um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1557 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n" -#: builtin/merge-base.c:26 +#: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." msgstr "git merge-base [-a|--all] <Commit> <Commit>..." -#: builtin/merge-base.c:27 +#: builtin/merge-base.c:30 msgid "git merge-base [-a|--all] --octopus <commit>..." msgstr "git merge-base [-a|--all] --octopus <Commit>..." -#: builtin/merge-base.c:28 +#: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <Commit>..." -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <Commit> <Commit>" -#: builtin/merge-base.c:98 +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <Referenz> [<Commit>]" + +#: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits" -#: builtin/merge-base.c:99 +#: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "findet Vorgänger-Commits für einen einzelnen n-Wege-Merge" -#: builtin/merge-base.c:100 +#: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "listet Commits auf, die nicht durch Andere erreichbar sind" -#: builtin/merge-base.c:102 +#: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "ist der Erste ein Vorgänger-Commit von dem Anderen?" +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "findet wo <Commit> von Reflog von <Referenz> abgespalten wurde" + #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " @@ -7190,124 +7264,129 @@ msgstr "erlaubt die Erstellung von mehr als einem \"Tree\"-Objekt" msgid "git mv [options] <source>... <destination>" msgstr "git mv [Optionen] <Quelle>... <Ziel>" -#: builtin/mv.c:67 +#: builtin/mv.c:71 msgid "force move/rename even if target exists" msgstr "erzwingt Verschieben/Umbenennen, auch wenn das Ziel existiert" -#: builtin/mv.c:68 +#: builtin/mv.c:72 msgid "skip move/rename errors" msgstr "überspringt Fehler beim Verschieben oder Umbenennen" -#: builtin/mv.c:113 +#: builtin/mv.c:122 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Prüfe Umbenennung von '%s' nach '%s'\n" -#: builtin/mv.c:117 +#: builtin/mv.c:126 msgid "bad source" msgstr "ungültige Quelle" -#: builtin/mv.c:120 +#: builtin/mv.c:129 msgid "can not move directory into itself" msgstr "kann Verzeichnis nicht in sich selbst verschieben" -#: builtin/mv.c:123 +#: builtin/mv.c:132 msgid "cannot move directory over file" msgstr "kann Verzeichnis nicht über Datei verschieben" -#: builtin/mv.c:129 +#: builtin/mv.c:138 #, c-format msgid "Huh? Directory %s is in index and no submodule?" msgstr "Huh? Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?" -#: builtin/mv.c:131 builtin/rm.c:318 +#: builtin/mv.c:140 builtin/rm.c:318 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder benutzen\n" +"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder " +"benutzen\n" "Sie \"stash\" um fortzufahren." -#: builtin/mv.c:147 +#: builtin/mv.c:156 #, c-format msgid "Huh? %.*s is in index?" msgstr "Huh? %.*s ist zum Commit vorgemerkt?" -#: builtin/mv.c:159 +#: builtin/mv.c:168 msgid "source directory is empty" msgstr "Quellverzeichnis ist leer" -#: builtin/mv.c:191 +#: builtin/mv.c:200 msgid "not under version control" msgstr "nicht unter Versionskontrolle" -#: builtin/mv.c:193 +#: builtin/mv.c:202 msgid "destination exists" msgstr "Ziel existiert bereits" -#: builtin/mv.c:201 +#: builtin/mv.c:210 #, c-format msgid "overwriting '%s'" msgstr "überschreibe '%s'" -#: builtin/mv.c:204 +#: builtin/mv.c:213 msgid "Cannot overwrite" msgstr "Kann nicht überschreiben" -#: builtin/mv.c:207 +#: builtin/mv.c:216 msgid "multiple sources for the same target" msgstr "mehrere Quellen für das selbe Ziel" -#: builtin/mv.c:222 +#: builtin/mv.c:218 +msgid "destination directory does not exist" +msgstr "Zielverzeichnis existiert nicht" + +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, Quelle=%s, Ziel=%s" -#: builtin/mv.c:232 +#: builtin/mv.c:243 #, c-format msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [options] <commit>..." msgstr "git name-rev [Optionen] <Commit>..." -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [options] --all" msgstr "git name-rev [Optionen] --all" -#: builtin/name-rev.c:261 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --stdin" msgstr "git name-rev [Optionen] --stdin" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "zeigt nur Namen an (keine SHA-1)" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "verwendet nur Tags um die Commits zu benennen" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "verwendet nur Referenzen die <Muster> entsprechen" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "listet alle Commits auf, die von allen Referenzen erreichbar sind" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "liest von der Standard-Eingabe" -#: builtin/name-rev.c:320 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "erlaubt Ausgabe von `undefinierten` Namen (Standard)" -#: builtin/name-rev.c:326 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "dereferenziert Tags in der Eingabe (interne Verwendung)" @@ -7636,7 +7715,7 @@ msgstr "Notiz-Referenz" msgid "use notes from <notes_ref>" msgstr "verwendet Notizen von <Notiz-Referenz>" -#: builtin/notes.c:974 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekanntes Unterkommando: %s" @@ -7656,150 +7735,150 @@ msgstr "" msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2396 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Staging-Area-Version %s" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2400 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Staging-Area-Version '%s'" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2423 #, c-format msgid "option %s does not accept negative form" msgstr "Option %s akzeptiert keine negative Form" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2427 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "konnte Wert '%s' für Option %s nicht parsen" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2446 msgid "do not show progress meter" msgstr "zeigt keine Fortschrittsanzeige" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2448 msgid "show progress meter" msgstr "zeigt Fortschrittsanzeige" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2450 msgid "show progress meter during object writing phase" msgstr "zeigt Forschrittsanzeige während der Phase des Schreibens der Objekte" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2453 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2454 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2455 msgid "write the pack index file in the specified idx format version" msgstr "" "schreibt die Index-Datei des Paketes in der angegebenen Indexformat-Version" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2458 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2460 msgid "ignore borrowed objects from alternate object store" msgstr "ignoriert geliehene Objekte von alternativem Objektspeicher" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2462 msgid "ignore packed objects" msgstr "ignoriert gepackte Objekte" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2464 msgid "limit pack window by objects" msgstr "begrenzt Paketfenster durch Objekte" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2466 msgid "limit pack window by memory in addition to object limit" msgstr "begrenzt Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2468 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2470 msgid "reuse existing deltas" msgstr "verwendet existierende Unterschiede wieder" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2472 msgid "reuse existing objects" msgstr "verwendet existierende Objekte wieder" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2474 msgid "use OFS_DELTA objects" msgstr "verwendet OFS_DELTA Objekte" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2476 msgid "use threads when searching for best delta matches" msgstr "" "verwendet Threads bei der Suche nach den besten Übereinstimmungen bei " "Unterschieden" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2478 msgid "do not create an empty pack output" msgstr "erzeugt keine leeren Pakete" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2480 msgid "read revision arguments from standard input" msgstr "liest Argumente bezüglich Commits von der Standard-Eingabe" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2482 msgid "limit the objects to those that are not yet packed" msgstr "begrenzt die Objekte zu solchen, die noch nicht gepackt wurden" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2485 msgid "include objects reachable from any reference" msgstr "schließt Objekte ein, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2488 msgid "include objects referred by reflog entries" msgstr "" "schließt Objekte ein, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2491 msgid "output pack to stdout" msgstr "schreibt Paket in die Standard-Ausgabe" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2493 msgid "include tag objects that refer to objects to be packed" msgstr "schließt Tag-Objekte ein, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2495 msgid "keep unreachable objects" msgstr "behält nicht erreichbare Objekte" -#: builtin/pack-objects.c:2498 parse-options.h:143 +#: builtin/pack-objects.c:2496 parse-options.h:143 msgid "time" msgstr "Zeit" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2497 msgid "unpack unreachable objects newer than <time>" msgstr "entpackt nicht erreichbare Objekte, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2500 msgid "create thin packs" msgstr "erzeugt dünnere Pakete" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2502 msgid "ignore packs that have companion .keep file" msgstr "ignoriert Pakete die .keep Dateien haben" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2504 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:2508 +#: builtin/pack-objects.c:2506 msgid "do not hide commits by grafts" -msgstr "verbirgt keine Commits mit künstlichen Vorgängern (\"grafts\")" +msgstr "verbirgt keine künstlichen Vorgänger-Commits (\"grafts\")" #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" @@ -7821,15 +7900,15 @@ msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]" -#: builtin/prune.c:132 +#: builtin/prune.c:142 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" -#: builtin/prune.c:133 +#: builtin/prune.c:143 msgid "report pruned objects" msgstr "meldet gelöschte Objekte" -#: builtin/prune.c:136 +#: builtin/prune.c:146 msgid "expire objects older than <time>" msgstr "lässt Objekte älter als <Zeit> verfallen" @@ -7837,15 +7916,15 @@ msgstr "lässt Objekte älter als <Zeit> verfallen" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/push.c:47 +#: builtin/push.c:86 msgid "tag shorthand without <tag>" msgstr "Kurzschrift für Tag ohne <Tag>" -#: builtin/push.c:66 +#: builtin/push.c:96 msgid "--delete only accepts plain target ref names" msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel." -#: builtin/push.c:101 +#: builtin/push.c:141 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -7854,7 +7933,7 @@ msgstr "" "Um eine Variante permanent zu verwenden, siehe push.default in 'git help " "config'." -#: builtin/push.c:104 +#: builtin/push.c:144 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7880,7 +7959,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:119 +#: builtin/push.c:159 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7895,7 +7974,7 @@ msgstr "" "\n" " git push %s HEAD:<Name-des-Remote-Branches>\n" -#: builtin/push.c:133 +#: builtin/push.c:173 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7909,13 +7988,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:141 +#: builtin/push.c:181 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert." -#: builtin/push.c:144 +#: builtin/push.c:184 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7926,7 +8005,7 @@ msgstr "" "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n" "Remote-Branch zu aktualisieren." -#: builtin/push.c:167 +#: builtin/push.c:207 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7938,6 +8017,13 @@ msgid "" "\n" " git config --global push.default simple\n" "\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"In Git 2.0, Git will default to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" @@ -7955,20 +8041,27 @@ msgstr "" "\n" " git config --global push.default simple\n" "\n" -"Führen Sie 'git help config' aus und suchen Sie nach 'push.default' für " +"Wenn 'push.default' auf den Wert 'matching' gesetzt ist, werden lokale\n" +"Branches zu den Remote-Branches mit den selben Namen versendet.\n" +"\n" +"In Git 2.0 wird das Standardverhalten zu 'simple' geändert. Hierbei wird\n" +"der aktuelle Branch zu dem entsprechenden Remote-Branch versendet, den\n" +"'git pull' zur Aktualisierung des aktuellen Branches verwendet.\n" +"\n" +"Führen Sie 'git help config' aus und suchen Sie nach 'push.default' für\n" "weitere Informationen.\n" -"(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den ähnlichen " -"Modus 'current' anstatt 'simple', falls Sie gelegentlich ältere Versionen " -"von Git benutzen.)" +"(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutzen Sie den ähnlichen\n" +"Modus 'current' anstatt 'simple', falls Sie gelegentlich ältere Versionen von\n" +"Git benutzen.)" -#: builtin/push.c:227 +#: builtin/push.c:274 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Sie haben keine Refspec für \"push\" angegeben, und push.default ist " "\"nothing\"." -#: builtin/push.c:234 +#: builtin/push.c:281 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7982,7 +8075,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:240 +#: builtin/push.c:287 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7998,7 +8091,7 @@ msgstr "" "'simple', 'current'\n" "oder 'upstream' setzen, um nur den aktuellen Branch zu versenden." -#: builtin/push.c:246 +#: builtin/push.c:293 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -8012,7 +8105,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:252 +#: builtin/push.c:299 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -8031,13 +8124,13 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:259 +#: builtin/push.c:306 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n" "im Remote-Repository existiert." -#: builtin/push.c:262 +#: builtin/push.c:309 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -8047,22 +8140,22 @@ msgstr "" "das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n" "die Option '--force' zu verwenden.\n" -#: builtin/push.c:328 +#: builtin/push.c:375 #, c-format msgid "Pushing to %s\n" msgstr "Versende nach %s\n" -#: builtin/push.c:332 +#: builtin/push.c:379 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: builtin/push.c:365 +#: builtin/push.c:412 #, c-format msgid "bad repository '%s'" msgstr "ungültiges Repository '%s'" -#: builtin/push.c:366 +#: builtin/push.c:413 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -8084,95 +8177,95 @@ msgstr "" "\n" " git push <Name>\n" -#: builtin/push.c:381 +#: builtin/push.c:428 msgid "--all and --tags are incompatible" msgstr "Die Optionen --all und --tags sind inkompatibel." -#: builtin/push.c:382 +#: builtin/push.c:429 msgid "--all can't be combined with refspecs" msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden." -#: builtin/push.c:387 +#: builtin/push.c:434 msgid "--mirror and --tags are incompatible" msgstr "Die Optionen --mirror und --tags sind inkompatibel." -#: builtin/push.c:388 +#: builtin/push.c:435 msgid "--mirror can't be combined with refspecs" msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." -#: builtin/push.c:393 +#: builtin/push.c:440 msgid "--all and --mirror are incompatible" msgstr "Die Optionen --all und --mirror sind inkompatibel." -#: builtin/push.c:453 +#: builtin/push.c:500 msgid "repository" msgstr "Repository" -#: builtin/push.c:454 +#: builtin/push.c:501 msgid "push all refs" msgstr "versendet alle Referenzen" -#: builtin/push.c:455 +#: builtin/push.c:502 msgid "mirror all refs" msgstr "spiegelt alle Referenzen" -#: builtin/push.c:457 +#: builtin/push.c:504 msgid "delete refs" msgstr "löscht Referenzen" -#: builtin/push.c:458 +#: builtin/push.c:505 msgid "push tags (can't be used with --all or --mirror)" msgstr "versendet Tags (kann nicht mit --all oder --mirror verwendet werden)" -#: builtin/push.c:461 +#: builtin/push.c:508 msgid "force updates" msgstr "erzwingt Aktualisierung" -#: builtin/push.c:463 +#: builtin/push.c:510 msgid "refname>:<expect" msgstr "Referenzname>:<Erwartungswert" -#: builtin/push.c:464 +#: builtin/push.c:511 msgid "require old value of ref to be at this value" msgstr "Referenz muss sich auf dem angegebenen Wert befinden" -#: builtin/push.c:466 +#: builtin/push.c:513 msgid "check" msgstr "" -#: builtin/push.c:467 +#: builtin/push.c:514 msgid "control recursive pushing of submodules" msgstr "steuert rekursiven \"push\" von Submodulen" -#: builtin/push.c:469 +#: builtin/push.c:516 msgid "use thin pack" msgstr "verwendet kleinere Pakete" -#: builtin/push.c:470 builtin/push.c:471 +#: builtin/push.c:517 builtin/push.c:518 msgid "receive pack program" msgstr "'receive pack' Programm" -#: builtin/push.c:472 +#: builtin/push.c:519 msgid "set upstream for git pull/status" msgstr "setzt Upstream für \"git pull/status\"" -#: builtin/push.c:475 +#: builtin/push.c:522 msgid "prune locally removed refs" msgstr "entfernt lokal gelöschte Referenzen" -#: builtin/push.c:477 +#: builtin/push.c:524 msgid "bypass pre-push hook" msgstr "umgeht \"pre-push hook\"" -#: builtin/push.c:478 +#: builtin/push.c:525 msgid "push missing but relevant tags" msgstr "versendet fehlende, aber relevante Tags" -#: builtin/push.c:488 +#: builtin/push.c:535 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:490 +#: builtin/push.c:537 msgid "--delete doesn't make sense without any refs" msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." @@ -8261,11 +8354,11 @@ msgstr "'%s' für '%s' ist kein gültiger Zeitstempel" msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel" -#: builtin/remote.c:11 +#: builtin/remote.c:12 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -8273,82 +8366,82 @@ msgstr "" "git remote add [-t <Branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <Name> <URL>" -#: builtin/remote.c:13 builtin/remote.c:32 +#: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "git remote rename <alt> <neu>" -#: builtin/remote.c:14 builtin/remote.c:37 +#: builtin/remote.c:15 builtin/remote.c:38 msgid "git remote remove <name>" msgstr "git remote remove <Name>" -#: builtin/remote.c:15 +#: builtin/remote.c:16 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <Name>" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <Name>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <Name> <Branch>..." -#: builtin/remote.c:20 builtin/remote.c:68 +#: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <Name> <neueURL>" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <Name> <URL>" -#: builtin/remote.c:27 +#: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<Optionen>] <Name> <URL>" -#: builtin/remote.c:42 +#: builtin/remote.c:43 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" -#: builtin/remote.c:47 +#: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <Name> <Branch>..." -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <Name> <Branch>..." -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "git remote show [<Optionen>] <Name>" -#: builtin/remote.c:58 +#: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<Optionen>] <Name>" -#: builtin/remote.c:63 +#: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "Aktualisiere %s" -#: builtin/remote.c:130 +#: builtin/remote.c:120 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -8356,107 +8449,107 @@ msgstr "" "--mirror ist gefährlich und veraltet; bitte\n" "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push" -#: builtin/remote.c:147 +#: builtin/remote.c:137 #, c-format msgid "unknown mirror argument: %s" msgstr "unbekanntes Argument für Option --mirror: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:153 msgid "fetch the remote branches" msgstr "fordert die Remote-Branches an" -#: builtin/remote.c:165 +#: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" msgstr "importiert alle Tags und verbundene Objekte beim Anfordern" -#: builtin/remote.c:168 +#: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" msgstr "oder fordere gar keine Zweige an (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:160 msgid "branch(es) to track" msgstr "Branch(es) zur Übernahme" -#: builtin/remote.c:171 +#: builtin/remote.c:161 msgid "master branch" msgstr "Hauptbranch" -#: builtin/remote.c:172 +#: builtin/remote.c:162 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:173 +#: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und " "\"fetch\"" -#: builtin/remote.c:185 +#: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "" "Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet " "werden." -#: builtin/remote.c:187 +#: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von " "Spiegelarchiven verwendet werden." -#: builtin/remote.c:195 builtin/remote.c:646 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "externes Repository %s existiert bereits" -#: builtin/remote.c:199 builtin/remote.c:650 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ist kein gültiger Name für ein Remote-Repository" -#: builtin/remote.c:243 +#: builtin/remote.c:233 #, c-format msgid "Could not setup master '%s'" msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten" -#: builtin/remote.c:299 +#: builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "mehr als ein %s" -#: builtin/remote.c:339 +#: builtin/remote.c:334 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen" -#: builtin/remote.c:440 builtin/remote.c:448 +#: builtin/remote.c:435 builtin/remote.c:443 msgid "(matching)" msgstr "(übereinstimmend)" -#: builtin/remote.c:452 +#: builtin/remote.c:447 msgid "(delete)" msgstr "(lösche)" -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Konnte '%s' nicht an '%s' anhängen." -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 #, c-format msgid "No such remote: %s" msgstr "Kein solches Remote-Repository: %s" -#: builtin/remote.c:656 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" -#: builtin/remote.c:662 builtin/remote.c:799 +#: builtin/remote.c:657 builtin/remote.c:794 #, c-format msgid "Could not remove config section '%s'" msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" -#: builtin/remote.c:677 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8467,32 +8560,32 @@ msgstr "" "\t%s\n" "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell." -#: builtin/remote.c:683 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Konnte '%s' nicht anhängen." -#: builtin/remote.c:694 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Konnte '%s' nicht setzen" -#: builtin/remote.c:716 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "Konnte '%s' nicht löschen" -#: builtin/remote.c:750 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "Konnte '%s' nicht erstellen" -#: builtin/remote.c:764 +#: builtin/remote.c:759 #, c-format msgid "Could not remove branch %s" msgstr "Konnte Branch %s nicht löschen" -#: builtin/remote.c:834 +#: builtin/remote.c:829 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8508,120 +8601,120 @@ msgstr[1] "" "entfernt;\n" "um diese zu entfernen, benutzen Sie:" -#: builtin/remote.c:943 +#: builtin/remote.c:938 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)" -#: builtin/remote.c:946 +#: builtin/remote.c:941 msgid " tracked" msgstr " gefolgt" -#: builtin/remote.c:948 +#: builtin/remote.c:943 msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" -#: builtin/remote.c:950 +#: builtin/remote.c:945 msgid " ???" msgstr " ???" -#: builtin/remote.c:991 +#: builtin/remote.c:986 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen" -#: builtin/remote.c:998 +#: builtin/remote.c:993 #, c-format msgid "rebases onto remote %s" msgstr "Rebase auf Remote-Branch %s" -#: builtin/remote.c:1001 +#: builtin/remote.c:996 #, c-format msgid " merges with remote %s" msgstr " führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:1002 +#: builtin/remote.c:997 msgid " and with remote" msgstr " und mit Remote-Branch" -#: builtin/remote.c:1004 +#: builtin/remote.c:999 #, c-format msgid "merges with remote %s" msgstr "führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:1005 +#: builtin/remote.c:1000 msgid " and with remote" msgstr " und mit Remote-Branch" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 msgid "create" msgstr "erstellt" -#: builtin/remote.c:1054 +#: builtin/remote.c:1049 msgid "delete" msgstr "gelöscht" -#: builtin/remote.c:1058 +#: builtin/remote.c:1053 msgid "up to date" msgstr "aktuell" -#: builtin/remote.c:1061 +#: builtin/remote.c:1056 msgid "fast-forwardable" msgstr "vorspulbar" -#: builtin/remote.c:1064 +#: builtin/remote.c:1059 msgid "local out of date" msgstr "lokal nicht aktuell" -#: builtin/remote.c:1071 +#: builtin/remote.c:1066 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s erzwingt Versandt nach %-*s (%s)" -#: builtin/remote.c:1074 +#: builtin/remote.c:1069 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s versendet nach %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %s" msgstr " %-*s erzwingt Versand nach %s" -#: builtin/remote.c:1081 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" -#: builtin/remote.c:1091 +#: builtin/remote.c:1144 msgid "do not query remotes" msgstr "keine Abfrage von Remote-Repositories" -#: builtin/remote.c:1118 +#: builtin/remote.c:1171 #, c-format msgid "* remote %s" msgstr "* Remote-Repository %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1172 #, c-format msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1120 builtin/remote.c:1285 +#: builtin/remote.c:1173 builtin/remote.c:1318 msgid "(no URL)" msgstr "(keine URL)" -#: builtin/remote.c:1129 builtin/remote.c:1131 +#: builtin/remote.c:1182 builtin/remote.c:1184 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1192 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -8629,146 +8722,146 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1151 +#: builtin/remote.c:1204 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1154 builtin/remote.c:1181 +#: builtin/remote.c:1207 builtin/remote.c:1234 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1163 +#: builtin/remote.c:1216 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokaler Branch konfiguriert für 'git pull':" msgstr[1] " Lokale Branches konfiguriert für 'git pull':" -#: builtin/remote.c:1171 +#: builtin/remote.c:1224 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1178 +#: builtin/remote.c:1231 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:" msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:" -#: builtin/remote.c:1199 +#: builtin/remote.c:1252 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository" -#: builtin/remote.c:1201 +#: builtin/remote.c:1254 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1216 +#: builtin/remote.c:1269 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1218 +#: builtin/remote.c:1271 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen " "aus mit:" -#: builtin/remote.c:1228 +#: builtin/remote.c:1281 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1236 +#: builtin/remote.c:1289 #, c-format msgid "Not a valid ref: %s" msgstr "keine gültige Referenz: %s" -#: builtin/remote.c:1238 +#: builtin/remote.c:1291 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1274 +#: builtin/remote.c:1307 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1275 +#: builtin/remote.c:1308 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1281 +#: builtin/remote.c:1314 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1315 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1295 +#: builtin/remote.c:1328 #, c-format msgid " * [would prune] %s" msgstr " * [würde veralteten Branch entfernen] %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1331 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1321 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "entfernt veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1387 builtin/remote.c:1461 +#: builtin/remote.c:1440 builtin/remote.c:1514 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1407 +#: builtin/remote.c:1460 msgid "add branch" msgstr "fügt Branch hinzu" -#: builtin/remote.c:1414 +#: builtin/remote.c:1467 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1436 +#: builtin/remote.c:1489 msgid "manipulate push URLs" msgstr "manipuliert URLs für \"push\"" -#: builtin/remote.c:1438 +#: builtin/remote.c:1491 msgid "add URL" msgstr "fügt URL hinzu" -#: builtin/remote.c:1440 +#: builtin/remote.c:1493 msgid "delete URLs" msgstr "löscht URLs" -#: builtin/remote.c:1447 +#: builtin/remote.c:1500 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete können nicht gemeinsam verwendet werden." -#: builtin/remote.c:1487 +#: builtin/remote.c:1540 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungültiges altes URL Format: %s" -#: builtin/remote.c:1495 +#: builtin/remote.c:1548 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1497 +#: builtin/remote.c:1550 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/remote.c:1569 +#: builtin/remote.c:1564 msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterkommando angegeben werden" @@ -8816,9 +8909,14 @@ msgstr "mit -A, löscht keine Objekte älter als dieses Datum" msgid "size of the window used for delta compression" msgstr "Größe des Fensters für die Delta-Kompression" +#: builtin/repack.c:162 builtin/repack.c:166 +msgid "bytes" +msgstr "Bytes" + #: builtin/repack.c:163 msgid "same as the above, but limit memory size instead of entries count" -msgstr "gleiches wie oben, limitiert aber die Speichergröße anstatt der\n" +msgstr "" +"gleiches wie oben, limitiert aber die Speichergröße anstatt der\n" "Anzahl der Einträge" #: builtin/repack.c:165 @@ -8829,7 +8927,7 @@ msgstr "limitiert die maximale Delta-Tiefe" msgid "maximum size of each packfile" msgstr "maximale Größe für jede Paketdatei" -#: builtin/repack.c:345 +#: builtin/repack.c:343 #, c-format msgid "removing '%s' failed" msgstr "Löschen von '%s' fehlgeschlagen" @@ -8843,21 +8941,25 @@ msgid "git replace -d <object>..." msgstr "git replace -d <Objekt>..." #: builtin/replace.c:19 -msgid "git replace -l [<pattern>]" -msgstr "git replace -l [<Muster>]" +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<Format>] [-l [<Muster>]]" -#: builtin/replace.c:131 +#: builtin/replace.c:174 msgid "list replace refs" msgstr "listet ersetzende Referenzen auf" -#: builtin/replace.c:132 +#: builtin/replace.c:175 msgid "delete replace refs" msgstr "löscht ersetzende Referenzen" -#: builtin/replace.c:133 +#: builtin/replace.c:176 msgid "replace the ref if it exists" msgstr "ersetzt die Referenz, wenn sie existiert" +#: builtin/replace.c:177 +msgid "use this format" +msgstr "benutzt das angegebene Format" + #: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "git rerere [clean | forget path... | status | remaining | diff | gc]" @@ -8991,19 +9093,23 @@ msgstr "Konnte Staging-Area-Datei nicht zu Commit '%s' setzen." msgid "Could not write new index file." msgstr "Konnte neue Staging-Area-Datei nicht schreiben." -#: builtin/rev-parse.c:345 +#: builtin/rev-parse.c:359 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [Optionen] -- [<Argumente>...]" -#: builtin/rev-parse.c:350 +#: builtin/rev-parse.c:364 msgid "keep the `--` passed as an arg" msgstr "lässt `--` als Argument" -#: builtin/rev-parse.c:352 +#: builtin/rev-parse.c:366 msgid "stop parsing after the first non-option argument" msgstr "stoppt das Parsen nach dem ersten Argument was keine Option ist" -#: builtin/rev-parse.c:470 +#: builtin/rev-parse.c:369 +msgid "output in stuck long form" +msgstr "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')" + +#: builtin/rev-parse.c:486 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9253,67 +9359,67 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" msgstr "zeigt Remote-Tracking und lokale Branches an" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show remote-tracking branches" msgstr "zeigt Remote-Tracking-Branches an" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" msgstr "färbt '*!+-' entsprechend des Branches ein" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" msgstr "zeigt <n> weitere Commits nach dem gemeinsamen Vorgänger-Commit" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "synonym to more=-1" msgstr "Synonym für more=-1" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "suppress naming strings" msgstr "unterdrückt Namen" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "include the current branch" msgstr "bezieht den aktuellen Branch ein" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "name commits with their object names" msgstr "benennt Commits nach ihren Objektnamen" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show possible merge bases" msgstr "zeigt mögliche Merge-Basen an" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" msgstr "zeigt Referenzen die unerreichbar von allen anderen Referenzen sind" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show commits in topological order" msgstr "zeigt Commits in topologischer Ordnung" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "zeigt nur Commits, die sich nicht im ersten Branch befinden" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "zeigt Merges, die nur von einem Branch aus erreichbar sind" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "topologically sort, maintaining date order where possible" msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:678 msgid "<n>[,<base>]" msgstr "<n>[,<Basis>]" -#: builtin/show-branch.c:680 +#: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" msgstr "zeigt die <n> jüngsten Einträge im Reflog beginnend an der Basis" @@ -9815,15 +9921,15 @@ msgstr "Verfallsdatum" msgid "no-op (backward compatibility)" msgstr "Kein Effekt (Rückwärtskompatibilität)" -#: parse-options.h:238 +#: parse-options.h:235 msgid "be more verbose" msgstr "erweiterte Ausgaben" -#: parse-options.h:240 +#: parse-options.h:237 msgid "be more quiet" msgstr "weniger Ausgaben" -#: parse-options.h:246 +#: parse-options.h:243 msgid "use <n> digits to display SHA-1s" msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" @@ -10141,8 +10247,9 @@ msgstr "" "<gueltigerbranch>'." #: git-bisect.sh:140 -msgid "won't bisect on seeked tree" -msgstr "binäre Suche auf gesuchtem Branch nicht möglich" +msgid "won't bisect on cg-seek'ed tree" +msgstr "" +"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" @@ -10292,7 +10399,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:255 +#: git-pull.sh:247 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10302,15 +10409,15 @@ msgstr "" "Warnung: \"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Warnung: Spule Ihr Arbeitsverzeichnis von Commit $orig_head vor." -#: git-pull.sh:280 +#: git-pull.sh:272 msgid "Cannot merge multiple branches into empty head" msgstr "Kann nicht mehrere Branches in einen ungeborenen Branch zusammenführen" -#: git-pull.sh:284 +#: git-pull.sh:276 msgid "Cannot rebase onto multiple branches" msgstr "kann Rebase nicht auf mehrere Branches ausführen" -#: git-rebase.sh:54 +#: git-rebase.sh:55 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -10324,16 +10431,16 @@ msgstr "" "Um den ursprünglichen Branch wiederherzustellen und den Rebase abzubrechen,\n" "führen Sie \"git rebase --abort\" aus." -#: git-rebase.sh:156 +#: git-rebase.sh:158 msgid "Applied autostash." msgstr "\"autostash\" angewendet." -#: git-rebase.sh:159 +#: git-rebase.sh:161 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kann $stash_sha1 nicht speichern." -#: git-rebase.sh:160 +#: git-rebase.sh:162 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -10343,33 +10450,33 @@ msgstr "" "Ihre Änderungen sind im Stash sicher.\n" "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n" -#: git-rebase.sh:199 +#: git-rebase.sh:201 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen." -#: git-rebase.sh:204 +#: git-rebase.sh:206 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen." -#: git-rebase.sh:338 +#: git-rebase.sh:346 msgid "The --exec option must be used with the --interactive option" msgstr "Die Option --exec muss mit --interactive verwendet werden." -#: git-rebase.sh:343 +#: git-rebase.sh:351 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: git-rebase.sh:354 +#: git-rebase.sh:362 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet " "werden." -#: git-rebase.sh:361 +#: git-rebase.sh:369 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: git-rebase.sh:364 +#: git-rebase.sh:372 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -10377,12 +10484,12 @@ msgstr "" "Sie müssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelöst markieren" -#: git-rebase.sh:382 +#: git-rebase.sh:390 #, sh-format msgid "Could not move back to $head_name" msgstr "Konnte nicht zu $head_name zurückgehen" -#: git-rebase.sh:401 +#: git-rebase.sh:409 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10403,68 +10510,68 @@ msgstr "" "und führen Sie dieses Kommando nochmal aus. Es wird angehalten, falls noch\n" "etwas Schützenswertes vorhanden ist." -#: git-rebase.sh:446 +#: git-rebase.sh:456 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ungültiger Upstream-Branch $upstream_name" -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: es gibt mehr als eine Merge-Basis" -#: git-rebase.sh:473 git-rebase.sh:477 +#: git-rebase.sh:483 git-rebase.sh:487 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: es gibt keine Merge-Basis" -#: git-rebase.sh:482 +#: git-rebase.sh:492 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "$onto_name zeigt auf keinen gültigen Commit" -#: git-rebase.sh:505 +#: git-rebase.sh:515 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal: Branch $branch_name nicht gefunden" -#: git-rebase.sh:528 +#: git-rebase.sh:548 msgid "Cannot autostash" msgstr "Kann \"autostash\" nicht ausführen." -#: git-rebase.sh:533 +#: git-rebase.sh:553 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "\"autostash\" erzeugt: $stash_abbrev" -#: git-rebase.sh:537 +#: git-rebase.sh:557 msgid "Please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: git-rebase.sh:557 +#: git-rebase.sh:577 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktueller Branch $branch_name ist auf dem neusten Stand." -#: git-rebase.sh:561 +#: git-rebase.sh:581 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Aktueller Branch $branch_name ist auf dem neusten Stand, Rebase erzwungen." -#: git-rebase.sh:572 +#: git-rebase.sh:592 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Änderungen von $mb zu $onto:" #. Detach HEAD and reset the tree -#: git-rebase.sh:581 +#: git-rebase.sh:601 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n" "darauf neu anzuwenden..." -#: git-rebase.sh:591 +#: git-rebase.sh:611 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name zu $onto_name vorgespult." @@ -10718,52 +10825,52 @@ msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." msgid "Entering '$prefix$displaypath'" msgstr "Betrete '$prefix$displaypath'" -#: git-submodule.sh:554 +#: git-submodule.sh:559 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "Stoppe bei '$prefix$displaypath'; Skript gab nicht-Null Status zurück." -#: git-submodule.sh:600 +#: git-submodule.sh:605 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "Keine URL für Submodul-Pfad '$displaypath' in .gitmodules gefunden" -#: git-submodule.sh:609 +#: git-submodule.sh:614 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "" "Fehler beim Eintragen der URL für Submodul-Pfad '$displaypath' in die " "Konfiguration." -#: git-submodule.sh:611 +#: git-submodule.sh:616 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" "Submodul '$name' ($url) für Pfad '$displaypath' in die Konfiguration " "eingetragen." -#: git-submodule.sh:619 +#: git-submodule.sh:633 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" "Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad " "'$displaypath' in der Konfiguration." -#: git-submodule.sh:656 +#: git-submodule.sh:671 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "" "Verwenden Sie '.' wenn Sie wirklich alle Submodule\n" "deinitialisieren möchten." -#: git-submodule.sh:673 +#: git-submodule.sh:688 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "Arbeitsverzeichnis des Submoduls in '$displaypath' enthält ein .git-" "Verzeichnis" -#: git-submodule.sh:674 +#: git-submodule.sh:689 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -10771,7 +10878,7 @@ msgstr "" "(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n" "seiner Historie löschen möchten)" -#: git-submodule.sh:680 +#: git-submodule.sh:695 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -10780,31 +10887,31 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; " "verwenden Sie '-f' um diese zu verwerfen" -#: git-submodule.sh:683 +#: git-submodule.sh:698 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Verzeichnis '$displaypath' bereinigt." -#: git-submodule.sh:684 +#: git-submodule.sh:699 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen." -#: git-submodule.sh:687 +#: git-submodule.sh:702 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" "Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen." -#: git-submodule.sh:696 +#: git-submodule.sh:711 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration " "entfernt." -#: git-submodule.sh:811 +#: git-submodule.sh:834 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" @@ -10813,42 +10920,42 @@ msgstr "" "Submodul-Pfad '$displaypath' ist nicht initialisiert.\n" "Vielleicht möchten Sie 'update --init' benutzen?" -#: git-submodule.sh:824 +#: git-submodule.sh:847 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden." -#: git-submodule.sh:833 +#: git-submodule.sh:856 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen" -#: git-submodule.sh:857 +#: git-submodule.sh:880 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen" -#: git-submodule.sh:871 +#: git-submodule.sh:894 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich" -#: git-submodule.sh:872 +#: git-submodule.sh:895 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:877 +#: git-submodule.sh:900 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:878 +#: git-submodule.sh:901 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'" -#: git-submodule.sh:883 +#: git-submodule.sh:906 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" @@ -10856,67 +10963,82 @@ msgstr "" "Ausführung von '$command $sha1' in Submodul-Pfad '$prefix$sm_path' " "fehlgeschlagen" -#: git-submodule.sh:884 +#: git-submodule.sh:907 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "Submodul-Pfad '$prefix$sm_path': '$command $sha1'" -#: git-submodule.sh:889 +#: git-submodule.sh:912 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:890 +#: git-submodule.sh:913 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:917 +#: git-submodule.sh:940 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: git-submodule.sh:1025 +#: git-submodule.sh:1048 msgid "The --cached option cannot be used with the --files option" msgstr "" "Die Optionen --cached und --files können nicht gemeinsam verwendet werden." #. unexpected type -#: git-submodule.sh:1073 +#: git-submodule.sh:1096 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:1093 +#: git-submodule.sh:1116 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src" -#: git-submodule.sh:1096 +#: git-submodule.sh:1119 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst" -#: git-submodule.sh:1099 +#: git-submodule.sh:1122 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst" -#: git-submodule.sh:1124 +#: git-submodule.sh:1147 msgid "blob" msgstr "Blob" -#: git-submodule.sh:1238 +#: git-submodule.sh:1261 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'" -#: git-submodule.sh:1302 +#: git-submodule.sh:1325 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisiere Submodul-URL für '$displaypath'" +#~ msgid "copied: %s -> %s" +#~ msgstr "kopiert: %s -> %s" + +#~ msgid "deleted: %s" +#~ msgstr "gelöscht: %s" + +#~ msgid "modified: %s" +#~ msgstr "geändert: %s" + +#~ msgid "renamed: %s -> %s" +#~ msgstr "umbenannt: %s -> %s" + +#~ msgid "unmerged: %s" +#~ msgstr "nicht zusammengeführt: %s" + #~ msgid "input paths are terminated by a null character" #~ msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen" @@ -53,6 +53,7 @@ # repository | dépôt # remote | distante (ou serveur distant) # revision | révision +# shallow | superficiel # shell | interpréteur de commandes # stash | remisage # to stash | remiser @@ -72,16 +73,15 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-11-02 08:06+0800\n" -"PO-Revision-Date: 2013-11-07 21:41+0100\n" -"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" +"POT-Creation-Date: 2014-02-01 08:06+0800\n" +"PO-Revision-Date: 2014-02-02 14:35+0100\n" +"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -"X-Generator: Poedit 1.5.4\n" #: advice.c:57 #, c-format @@ -123,7 +123,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -144,8 +144,8 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 @@ -335,64 +335,64 @@ msgstr "Échec du verrouillage de la référence pour mise à jour" msgid "Failed to write ref" msgstr "Échec de l'écriture de la référence" -#: bundle.c:36 +#: bundle.c:37 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ne semble pas être un fichier bundle v2" -#: bundle.c:63 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:89 builtin/commit.c:706 +#: bundle.c:90 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" -#: bundle.c:140 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis :" -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: bundle.c:186 +#: bundle.c:187 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette référence :" msgstr[1] "Le colis contient ces %d références :" -#: bundle.c:193 +#: bundle.c:194 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." -#: bundle.c:195 +#: bundle.c:196 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:294 +#: bundle.c:296 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:335 +#: bundle.c:337 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:380 +#: bundle.c:382 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." @@ -427,16 +427,16 @@ msgstr "%s %s n'est pas un commit !" msgid "memory exhausted" msgstr "plus de mémoire" -#: connected.c:60 +#: connected.c:70 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:80 +#: connected.c:90 #, c-format msgid "failed write to rev-list: %s" msgstr "impossible d'écrire dans la rev-list : %s" -#: connected.c:88 +#: connected.c:98 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "impossible de fermer l'entrée standard du rev-list : %s" @@ -508,24 +508,29 @@ msgid_plural "%lu years ago" msgstr[0] "il y a %lu an" msgstr[1] "il y a %lu ans" -#: diff.c:112 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "impossible de lire le fichier de commande '%s'" + +#: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" -#: diff.c:117 +#: diff.c:118 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" -#: diff.c:210 +#: diff.c:213 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:260 +#: diff.c:263 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -534,7 +539,7 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:3490 +#: diff.c:3509 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -543,7 +548,7 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3504 +#: diff.c:3523 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" @@ -655,7 +660,7 @@ msgid "failed to read the cache" msgstr "impossible de lire le cache" #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 -#: builtin/clone.c:655 +#: builtin/clone.c:661 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -704,7 +709,7 @@ msgstr "impossible de lire l'objet %s '%s'" msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:774 builtin/clone.c:311 +#: merge-recursive.c:774 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" @@ -754,7 +759,7 @@ msgstr "" msgid "rename" msgstr "renommage" -#: merge-recursive.c:1082 +#: merge-recursive.c:1082 wt-status.c:283 msgid "renamed" msgstr "renommé" @@ -818,7 +823,7 @@ msgstr "l'objet %s n'est pas un blob" msgid "modify" msgstr "modification" -#: merge-recursive.c:1565 +#: merge-recursive.c:1565 wt-status.c:281 msgid "modified" msgstr "modifié" @@ -840,7 +845,7 @@ msgstr "%s sauté (fusion identique à l'existant)" msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1634 git-submodule.sh:1125 +#: merge-recursive.c:1634 git-submodule.sh:1148 msgid "submodule" msgstr "sous-module" @@ -911,7 +916,7 @@ msgstr "la fusion n'a pas retourné de commit" msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2010 builtin/merge.c:672 +#: merge-recursive.c:2010 builtin/merge.c:665 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -966,46 +971,50 @@ msgstr " %s" msgid "-NUM" msgstr "-NUM" -#: pathspec.c:118 +#: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont incompatibles" +msgstr "" +"les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont " +"incompatibles" -#: pathspec.c:128 +#: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" -msgstr "le réglage global de spécificateur de chemin 'literal' est incompatible avec tous les autres réglages globaux de spécificateur de chemin" +msgstr "" +"le réglage global de spécificateur de chemin 'literal' est incompatible avec " +"tous les autres réglages globaux de spécificateur de chemin" -#: pathspec.c:158 +#: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'" -#: pathspec.c:164 +#: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'" -#: pathspec.c:168 +#: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'" -#: pathspec.c:186 +#: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Spécificateur magique '%c' non implémenté dans '%s'" -#: pathspec.c:211 +#: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s : 'literal' et 'glob' sont incompatibles" -#: pathspec.c:222 +#: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s : '%s' est hors du dépôt" -#: pathspec.c:278 +#: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Le chemin '%s' est dans le sous-module '%.*s'" @@ -1015,42 +1024,76 @@ msgstr "Le chemin '%s' est dans le sous-module '%.*s'" #. * name. E.g. when add--interactive dies when running #. * "checkout -p" #. -#: pathspec.c:340 +#: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s : le spécificateur magique de chemin n'est pas supporté par cette commande : %s" +msgstr "" +"%s : le spécificateur magique de chemin n'est pas supporté par cette " +"commande : %s" -#: pathspec.c:415 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delà d'un lien symbolique" -#: remote.c:1833 +#: pathspec.c:442 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" +"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n" +"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?" + +#: remote.c:753 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Impossible de récupérer à la fois %s et %s pour %s" + +#: remote.c:757 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s suit habituellement %s, pas %s" + +#: remote.c:761 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s suit à la fois %s et %s" + +#. +#. * This last possibility doesn't occur because +#. * FETCH_HEAD_IGNORE entries always appear at +#. * the end of the list. +#. +#: remote.c:769 +msgid "Internal error" +msgstr "Erreur interne" + +#: remote.c:1871 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" -#: remote.c:1837 +#: remote.c:1875 msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " (utilisez \"git branch -unset-upstream\" pour corriger)\n" +msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:1840 +#: remote.c:1878 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:1844 +#: remote.c:1882 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:1850 +#: remote.c:1888 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:1853 +#: remote.c:1891 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1062,11 +1105,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:1861 +#: remote.c:1899 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:1864 +#: remote.c:1902 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1081,7 +1124,7 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:1874 +#: remote.c:1912 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" @@ -1095,14 +1138,14 @@ msgstr "échec de l'ouverture de /dev/null" msgid "dup2(%d,%d) failed" msgstr "échec de dup2(%d,%d)" -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 -#: builtin/merge.c:1013 builtin/merge.c:1023 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 +#: builtin/merge.c:1006 builtin/merge.c:1016 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 -#: builtin/merge.c:1015 builtin/merge.c:1028 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 +#: builtin/merge.c:1008 builtin/merge.c:1021 #, c-format msgid "Could not write to '%s'" msgstr "Impossible d'écrire dans '%s'" @@ -1344,7 +1387,7 @@ msgstr "Impossible d'annuler en tant que commit initial" msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" -#: sha1_name.c:440 +#: sha1_name.c:439 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1369,28 +1412,30 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1112 +#: sha1_name.c:1070 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: sha1_name.c:1115 +#: sha1_name.c:1073 #, c-format msgid "No such branch: '%s'" msgstr "Branche inconnue : '%s'" -#: sha1_name.c:1117 +#: sha1_name.c:1075 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Aucune branche amont configurée pour la branche '%s'" -#: sha1_name.c:1121 +#: sha1_name.c:1079 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "La branche amont '%s' n'est pas stockée comme branche de suivi" #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" -msgstr "Modification impossible de .gitmodules non fusionné, résolvez les conflits d'abord" +msgstr "" +"Modification impossible de .gitmodules non fusionné, résolvez les conflits " +"d'abord" #: submodule.c:68 submodule.c:102 #, c-format @@ -1494,229 +1539,221 @@ msgstr "" msgid "no such user" msgstr "utilisateur inconnu" -#: wt-status.c:146 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" -#: wt-status.c:173 wt-status.c:200 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)" -#: wt-status.c:175 wt-status.c:202 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)" -#: wt-status.c:179 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:181 wt-status.c:185 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme " "résolu)" -#: wt-status.c:183 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:194 +#: wt-status.c:198 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:212 +#: wt-status.c:216 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" -#: wt-status.c:216 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" -#: wt-status.c:218 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera " "validé)" -#: wt-status.c:219 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications " "dans la copie de travail)" -#: wt-status.c:221 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" -#: wt-status.c:233 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" -#: wt-status.c:250 +#: wt-status.c:254 msgid "bug" msgstr "bogue" -#: wt-status.c:255 +#: wt-status.c:259 msgid "both deleted:" msgstr "supprimé des deux côtés :" -#: wt-status.c:256 +#: wt-status.c:260 msgid "added by us:" msgstr "ajouté par nous :" -#: wt-status.c:257 +#: wt-status.c:261 msgid "deleted by them:" msgstr "supprimé par eux :" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "ajouté par eux :" -#: wt-status.c:259 +#: wt-status.c:263 msgid "deleted by us:" msgstr "supprimé par nous :" -#: wt-status.c:260 +#: wt-status.c:264 msgid "both added:" msgstr "ajouté de deux côtés :" -#: wt-status.c:261 +#: wt-status.c:265 msgid "both modified:" msgstr "modifié des deux côtés :" -#: wt-status.c:291 -msgid "new commits, " -msgstr "nouveaux commits, " +#: wt-status.c:275 +msgid "new file" +msgstr "nouveau fichier" -#: wt-status.c:293 -msgid "modified content, " -msgstr "contenu modifié, " +#: wt-status.c:277 +msgid "copied" +msgstr "copié" -#: wt-status.c:295 -msgid "untracked content, " -msgstr "contenu non suivi, " +#: wt-status.c:279 +msgid "deleted" +msgstr "supprimé" -#: wt-status.c:312 -#, c-format -msgid "new file: %s" -msgstr "nouveau : %s" +#: wt-status.c:285 +msgid "typechange" +msgstr "modif. type" -#: wt-status.c:315 -#, c-format -msgid "copied: %s -> %s" -msgstr "copié : %s -> %s" +#: wt-status.c:287 +msgid "unknown" +msgstr "inconnu" -#: wt-status.c:318 -#, c-format -msgid "deleted: %s" -msgstr "supprimé : %s" +#: wt-status.c:289 +msgid "unmerged" +msgstr "non fusionné" -#: wt-status.c:321 -#, c-format -msgid "modified: %s" -msgstr "modifié : %s" - -#: wt-status.c:324 -#, c-format -msgid "renamed: %s -> %s" -msgstr "renommé : %s -> %s" - -#: wt-status.c:327 -#, c-format -msgid "typechange: %s" -msgstr "nv type : %s" +#: wt-status.c:336 +msgid "new commits, " +msgstr "nouveaux commits, " -#: wt-status.c:330 -#, c-format -msgid "unknown: %s" -msgstr "inconnu : %s" +#: wt-status.c:338 +msgid "modified content, " +msgstr "contenu modifié, " -#: wt-status.c:333 -#, c-format -msgid "unmerged: %s" -msgstr "non fus. : %s" +#: wt-status.c:340 +msgid "untracked content, " +msgstr "contenu non suivi, " -#: wt-status.c:336 +#: wt-status.c:357 #, c-format msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" -#: wt-status.c:703 +#: wt-status.c:732 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:705 +#: wt-status.c:734 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:848 +#: wt-status.c:836 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" +"Ne touchez pas à la ligne ci-dessus\n" +"Tout se qui suit sera éliminé." + +#: wt-status.c:899 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:851 +#: wt-status.c:902 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:854 +#: wt-status.c:905 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:857 +#: wt-status.c:908 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:867 +#: wt-status.c:918 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:870 +#: wt-status.c:921 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:874 +#: wt-status.c:925 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:876 +#: wt-status.c:927 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:878 +#: wt-status.c:929 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:938 wt-status.c:955 +#: wt-status.c:989 wt-status.c:1006 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:943 wt-status.c:960 +#: wt-status.c:994 wt-status.c:1011 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:946 +#: wt-status.c:997 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:948 +#: wt-status.c:999 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:950 +#: wt-status.c:1001 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:963 +#: wt-status.c:1014 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:967 +#: wt-status.c:1018 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1724,120 +1761,120 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:972 +#: wt-status.c:1023 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:975 +#: wt-status.c:1026 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:979 +#: wt-status.c:1030 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:984 +#: wt-status.c:1035 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:987 +#: wt-status.c:1038 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:989 +#: wt-status.c:1040 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos " "modifications)" -#: wt-status.c:999 +#: wt-status.c:1050 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1004 +#: wt-status.c:1055 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1007 +#: wt-status.c:1058 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1009 +#: wt-status.c:1060 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1018 +#: wt-status.c:1069 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1023 +#: wt-status.c:1074 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1026 +#: wt-status.c:1077 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1028 +#: wt-status.c:1079 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1039 +#: wt-status.c:1090 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1043 +#: wt-status.c:1094 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1046 +#: wt-status.c:1097 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1221 +#: wt-status.c:1272 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1228 +#: wt-status.c:1279 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1235 +#: wt-status.c:1286 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1237 +#: wt-status.c:1288 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1240 +#: wt-status.c:1291 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1257 +#: wt-status.c:1308 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1271 +#: wt-status.c:1322 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1273 +#: wt-status.c:1324 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1277 +#: wt-status.c:1328 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1849,32 +1886,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1283 +#: wt-status.c:1334 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1285 +#: wt-status.c:1336 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1291 +#: wt-status.c:1342 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1296 +#: wt-status.c:1347 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1299 +#: wt-status.c:1350 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1302 +#: wt-status.c:1353 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1883,61 +1920,61 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1305 +#: wt-status.c:1356 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1308 +#: wt-status.c:1359 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1311 wt-status.c:1316 +#: wt-status.c:1362 wt-status.c:1367 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1314 +#: wt-status.c:1365 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1318 +#: wt-status.c:1369 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1427 +#: wt-status.c:1478 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1433 +#: wt-status.c:1484 msgid "Initial commit on " msgstr "Validation initiale sur " # à priori on parle d'une branche ici -#: wt-status.c:1463 +#: wt-status.c:1514 msgid "gone" msgstr "disparue" -#: wt-status.c:1465 +#: wt-status.c:1516 msgid "behind " msgstr "derrière " -#: wt-status.c:1468 wt-status.c:1471 +#: wt-status.c:1519 wt-status.c:1522 msgid "ahead " msgstr "devant " -#: wt-status.c:1473 +#: wt-status.c:1524 msgid ", behind " msgstr ", derrière " -#: compat/precompose_utf8.c:55 builtin/clone.c:350 +#: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" @@ -2071,15 +2108,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 #: builtin/rm.c:269 msgid "dry run" msgstr "simuler l'action" #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "mode verbeux" @@ -2164,11 +2201,11 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" @@ -2513,7 +2550,7 @@ msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 -#: builtin/fetch.c:77 +#: builtin/fetch.c:78 msgid "path" msgstr "chemin" @@ -2717,100 +2754,100 @@ msgstr "git blame [options] [options-de-révision] [rev] [--] fichier" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[options-de-révision] sont documentés dans git-rev-list(1)" -#: builtin/blame.c:2248 +#: builtin/blame.c:2249 msgid "Show blame entries as we find them, incrementally" msgstr "" "Montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" -#: builtin/blame.c:2249 +#: builtin/blame.c:2250 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:2250 +#: builtin/blame.c:2251 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:2251 +#: builtin/blame.c:2252 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2252 +#: builtin/blame.c:2253 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2253 +#: builtin/blame.c:2254 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2254 +#: builtin/blame.c:2255 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2255 +#: builtin/blame.c:2256 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2256 +#: builtin/blame.c:2257 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2257 +#: builtin/blame.c:2258 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" -#: builtin/blame.c:2258 +#: builtin/blame.c:2259 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2259 +#: builtin/blame.c:2260 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2260 +#: builtin/blame.c:2261 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" -#: builtin/blame.c:2261 +#: builtin/blame.c:2262 msgid "Show author email instead of name (Default: off)" msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:2262 +#: builtin/blame.c:2263 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2263 +#: builtin/blame.c:2264 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2264 +#: builtin/blame.c:2265 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:2265 +#: builtin/blame.c:2266 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2266 builtin/blame.c:2267 +#: builtin/blame.c:2267 builtin/blame.c:2268 msgid "score" msgstr "score" -#: builtin/blame.c:2266 +#: builtin/blame.c:2267 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2267 +#: builtin/blame.c:2268 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "Process only line range n,m, counting from 1" msgstr "" "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" @@ -2916,250 +2953,250 @@ msgid "branch '%s' does not point at a commit" msgstr "la branche '%s' ne pointe pas sur un commit" # féminin pour une branche -#: builtin/branch.c:453 +#: builtin/branch.c:454 #, c-format msgid "[%s: gone]" msgstr "[%s: disparue]" -#: builtin/branch.c:456 +#: builtin/branch.c:459 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s: behind %d]" msgstr "[%s: en retard de %d]" -#: builtin/branch.c:461 +#: builtin/branch.c:466 #, c-format msgid "[behind %d]" msgstr "[en retard de %d]" -#: builtin/branch.c:465 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d]" msgstr "[%s : en avance de %d]" -#: builtin/branch.c:467 +#: builtin/branch.c:472 #, c-format msgid "[ahead %d]" msgstr "[en avance de %d]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s : en avance de %d, en retard de %d]" -#: builtin/branch.c:473 +#: builtin/branch.c:478 #, c-format msgid "[ahead %d, behind %d]" msgstr "[en avance de %d, en retard de %d]" -#: builtin/branch.c:496 +#: builtin/branch.c:502 msgid " **** invalid ref ****" msgstr " **** référence invalide ****" -#: builtin/branch.c:588 +#: builtin/branch.c:594 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: builtin/branch.c:591 +#: builtin/branch.c:597 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: builtin/branch.c:594 +#: builtin/branch.c:600 #, c-format msgid "(detached from %s)" msgstr "(détaché de %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:643 +#: builtin/branch.c:649 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objet '%s' ne pointe pas sur un commit" -#: builtin/branch.c:675 +#: builtin/branch.c:681 msgid "some refs could not be read" msgstr "des références n'ont pas pu être lues" -#: builtin/branch.c:688 +#: builtin/branch.c:694 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:698 +#: builtin/branch.c:704 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:713 +#: builtin/branch.c:719 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:717 +#: builtin/branch.c:723 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:721 +#: builtin/branch.c:727 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:728 +#: builtin/branch.c:734 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:743 +#: builtin/branch.c:749 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: builtin/branch.c:767 +#: builtin/branch.c:773 #, c-format msgid "could not write branch description template: %s" msgstr "impossible d'écrire le modèle de description de branche : %s" -#: builtin/branch.c:797 +#: builtin/branch.c:803 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:799 +#: builtin/branch.c:805 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:800 +#: builtin/branch.c:806 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:801 +#: builtin/branch.c:807 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:803 +#: builtin/branch.c:809 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:808 +#: builtin/branch.c:814 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "commit" -#: builtin/branch.c:812 builtin/branch.c:818 +#: builtin/branch.c:818 builtin/branch.c:824 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:824 +#: builtin/branch.c:830 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:825 +#: builtin/branch.c:831 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:827 +#: builtin/branch.c:833 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:828 +#: builtin/branch.c:834 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:829 +#: builtin/branch.c:835 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:830 +#: builtin/branch.c:836 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:831 +#: builtin/branch.c:837 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:832 +#: builtin/branch.c:838 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:834 +#: builtin/branch.c:840 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:835 +#: builtin/branch.c:841 msgid "force creation (when already exists)" msgstr "forcer la création (même si la cible existe)" -#: builtin/branch.c:838 +#: builtin/branch.c:844 msgid "print only not merged branches" msgstr "afficher seulement les branches non fusionnées" -#: builtin/branch.c:844 +#: builtin/branch.c:850 msgid "print only merged branches" msgstr "afficher seulement les branches fusionnées" -#: builtin/branch.c:848 +#: builtin/branch.c:854 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:861 +#: builtin/branch.c:867 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:866 builtin/clone.c:629 +#: builtin/branch.c:872 builtin/clone.c:635 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:890 +#: builtin/branch.c:896 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:896 builtin/branch.c:935 +#: builtin/branch.c:902 builtin/branch.c:941 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:911 +#: builtin/branch.c:917 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:916 +#: builtin/branch.c:922 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:923 +#: builtin/branch.c:929 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:926 +#: builtin/branch.c:932 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:941 +#: builtin/branch.c:947 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:946 +#: builtin/branch.c:952 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:950 +#: builtin/branch.c:956 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3167,41 +3204,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:957 +#: builtin/branch.c:963 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:969 +#: builtin/branch.c:975 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:973 +#: builtin/branch.c:979 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:979 +#: builtin/branch.c:985 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:994 +#: builtin/branch.c:999 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:1000 +#: builtin/branch.c:1005 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" -#: builtin/branch.c:1003 +#: builtin/branch.c:1008 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3210,7 +3247,7 @@ msgstr "" "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --" "track ou --set-upstream-to\n" -#: builtin/branch.c:1020 +#: builtin/branch.c:1025 #, c-format msgid "" "\n" @@ -3221,15 +3258,15 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:1021 +#: builtin/branch.c:1026 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1022 +#: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" -msgstr " git branch -set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" #: builtin/bundle.c:47 #, c-format @@ -3244,44 +3281,44 @@ msgstr "La création d'un colis requiert un dépôt." msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:312 +#: builtin/cat-file.c:328 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<type>|--textconv) <objet>" -#: builtin/cat-file.c:313 +#: builtin/cat-file.c:329 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <liste_d_objets>" -#: builtin/cat-file.c:350 +#: builtin/cat-file.c:366 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:351 +#: builtin/cat-file.c:367 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:352 +#: builtin/cat-file.c:368 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:354 +#: builtin/cat-file.c:370 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:355 +#: builtin/cat-file.c:371 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:357 +#: builtin/cat-file.c:373 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:359 +#: builtin/cat-file.c:375 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:362 +#: builtin/cat-file.c:378 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" @@ -3308,9 +3345,10 @@ msgstr "lire les noms de fichier depuis l'entrée standard" #: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "terminate input and output records by a NUL character" -msgstr "terminer les enregistrements en entrée et en sortie par un caractère NUL" +msgstr "" +"terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -3606,7 +3644,7 @@ msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 -#: builtin/remote.c:169 builtin/remote.c:171 +#: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "branche" @@ -3654,11 +3692,11 @@ msgstr "forcer l'extraction (laisser tomber les modifications locales)" msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1106 builtin/merge.c:232 +#: builtin/checkout.c:1106 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 msgid "style" msgstr "style" @@ -3857,7 +3895,7 @@ msgid "remove whole directories" msgstr "supprimer les répertoires entiers" #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "motif" @@ -3897,8 +3935,8 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [options] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 -#: builtin/push.c:474 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 +#: builtin/push.c:521 msgid "force progress reporting" msgstr "forcer l'état d'avancement" @@ -3958,7 +3996,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 msgid "depth" msgstr "profondeur" @@ -3991,42 +4029,52 @@ msgstr "régler la configuration dans le nouveau dépôt" msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: builtin/clone.c:315 +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "le dépôt de référence '%s' est superficiel" + +#: builtin/clone.c:259 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "le dépôt de référence '%s' est greffé" + +#: builtin/clone.c:321 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/clone.c:317 builtin/diff.c:77 +#: builtin/clone.c:323 builtin/diff.c:83 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: builtin/clone.c:319 +#: builtin/clone.c:325 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:333 +#: builtin/clone.c:339 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:355 +#: builtin/clone.c:361 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:359 +#: builtin/clone.c:365 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:382 builtin/clone.c:559 +#: builtin/clone.c:388 builtin/clone.c:565 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:395 +#: builtin/clone.c:401 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4036,103 +4084,112 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer l'extraction avec 'git checkout -f HEAD'\n" -#: builtin/clone.c:474 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:554 +#: builtin/clone.c:560 #, c-format msgid "Checking connectivity... " msgstr "Vérification de la connectivité... " -#: builtin/clone.c:557 +#: builtin/clone.c:563 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:620 +#: builtin/clone.c:626 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:651 +#: builtin/clone.c:657 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:759 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:763 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:774 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:777 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:790 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:795 +#: builtin/clone.c:802 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:797 +#: builtin/clone.c:805 +msgid "source repository is shallow, ignoring --local" +msgstr "le dépôt source est superficiel, option --local ignorée" + +#: builtin/clone.c:810 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:807 +#: builtin/clone.c:814 builtin/fetch.c:1119 +#, c-format +msgid "depth %s is not a positive number" +msgstr "la profondeur %s n'est pas un entier positif" + +#: builtin/clone.c:824 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:817 +#: builtin/clone.c:834 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:830 builtin/clone.c:842 +#: builtin/clone.c:847 builtin/clone.c:859 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:833 +#: builtin/clone.c:850 #, c-format msgid "could not create work tree dir '%s'." msgstr "impossible de créer le répertoire de la copie de travail '%s'." -#: builtin/clone.c:852 +#: builtin/clone.c:869 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:854 +#: builtin/clone.c:871 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:888 +#: builtin/clone.c:906 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:939 builtin/clone.c:947 +#: builtin/clone.c:957 builtin/clone.c:965 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:950 +#: builtin/clone.c:968 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -4489,7 +4546,7 @@ msgstr "afficher le statut avec concision" msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 msgid "machine-readable output" msgstr "sortie pour traitement automatique" @@ -4572,7 +4629,7 @@ msgstr "auteur" msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1458 builtin/gc.c:260 +#: builtin/commit.c:1458 builtin/gc.c:261 msgid "date" msgstr "date" @@ -4580,7 +4637,7 @@ msgstr "date" msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 #: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "message" @@ -4636,11 +4693,11 @@ msgstr "comment éliminer les espaces et les commentaires # du message" msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 msgid "key id" msgstr "identifiant de clé" -#: builtin/commit.c:1471 builtin/merge.c:231 +#: builtin/commit.c:1471 builtin/merge.c:224 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -4697,7 +4754,7 @@ msgstr "accepter d'enregistrer une modification avec un message vide" msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1567 builtin/merge.c:525 +#: builtin/commit.c:1567 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" @@ -4716,29 +4773,29 @@ msgstr "impossible de lire MERGE_MODE" msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1614 +#: builtin/commit.c:1611 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation du à un message de validation vide\n" -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/commit.c:1655 +#: builtin/commit.c:1652 msgid "cannot lock HEAD ref" msgstr "impossible de verrouiller la référence HEAD" -#: builtin/commit.c:1659 +#: builtin/commit.c:1656 msgid "cannot update HEAD ref" msgstr "impossible de mettre à jour la référence HEAD" -#: builtin/commit.c:1670 +#: builtin/commit.c:1667 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -5003,7 +5060,7 @@ msgstr "" msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:423 builtin/name-rev.c:322 +#: builtin/describe.c:423 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" @@ -5027,31 +5084,31 @@ msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/diff.c:79 +#: builtin/diff.c:85 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" -#: builtin/diff.c:230 +#: builtin/diff.c:236 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:307 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:350 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:359 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:366 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." @@ -5113,146 +5170,156 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:74 +#: builtin/fetch.c:75 msgid "fetch from all remotes" msgstr "récupérer depuis tous le dépôts distants" -#: builtin/fetch.c:76 +#: builtin/fetch.c:77 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:78 +#: builtin/fetch.c:79 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:79 +#: builtin/fetch.c:80 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:81 +#: builtin/fetch.c:82 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:83 +#: builtin/fetch.c:84 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:85 +#: builtin/fetch.c:86 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:87 +#: builtin/fetch.c:88 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:88 +#: builtin/fetch.c:89 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:89 +#: builtin/fetch.c:90 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:93 +#: builtin/fetch.c:94 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:95 +#: builtin/fetch.c:96 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:98 +#: builtin/fetch.c:99 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:100 +#: builtin/fetch.c:101 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:102 builtin/log.c:1197 +#: builtin/fetch.c:103 builtin/log.c:1197 msgid "dir" msgstr "dir" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:106 +#: builtin/fetch.c:107 msgid "default mode for recursion" msgstr "mode par défaut pour la récursion" -#: builtin/fetch.c:236 +#: builtin/fetch.c:109 +msgid "accept refs that update .git/shallow" +msgstr "accepter les références qui mettent à jour .git/shallow" + +#: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:290 +#: builtin/fetch.c:411 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:295 +#: builtin/fetch.c:416 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:309 +#: builtin/fetch.c:430 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)" -#: builtin/fetch.c:310 builtin/fetch.c:396 +#: builtin/fetch.c:431 builtin/fetch.c:517 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:321 +#: builtin/fetch.c:442 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 msgid " (unable to update local ref)" msgstr " (impossible de mettre à jour la référence locale)" -#: builtin/fetch.c:341 +#: builtin/fetch.c:462 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:344 +#: builtin/fetch.c:465 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:347 +#: builtin/fetch.c:468 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:398 +#: builtin/fetch.c:519 msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:429 builtin/fetch.c:735 +#: builtin/fetch.c:552 builtin/fetch.c:785 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s : %s\n" -#: builtin/fetch.c:438 +#: builtin/fetch.c:561 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:537 +#: builtin/fetch.c:579 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "" +"%s rejeté parce que les racines superficielles ne sont pas mises à jour" + +#: builtin/fetch.c:667 builtin/fetch.c:750 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:548 +#: builtin/fetch.c:678 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5261,55 +5328,55 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:598 +#: builtin/fetch.c:730 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:599 +#: builtin/fetch.c:731 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:606 +#: builtin/fetch.c:755 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:607 builtin/remote.c:1055 +#: builtin/fetch.c:756 builtin/remote.c:1050 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:725 +#: builtin/fetch.c:775 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:744 +#: builtin/fetch.c:794 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:747 +#: builtin/fetch.c:797 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:801 +#: builtin/fetch.c:853 #, c-format msgid "Don't know how to fetch from %s" msgstr "Je ne sais pas récupérer depuis %s" -#: builtin/fetch.c:976 +#: builtin/fetch.c:1015 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:978 builtin/remote.c:100 +#: builtin/fetch.c:1017 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1036 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5317,32 +5384,32 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1020 +#: builtin/fetch.c:1059 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1068 +#: builtin/fetch.c:1107 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1109 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1089 +#: builtin/fetch.c:1132 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1091 +#: builtin/fetch.c:1134 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1145 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1110 +#: builtin/fetch.c:1153 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " @@ -5354,8 +5421,9 @@ msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 +#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446 +#: parse-options.h:135 parse-options.h:242 msgid "n" msgstr "n" @@ -5379,43 +5447,43 @@ msgstr "utiliser <texte> comme début de message" msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:995 +#: builtin/for-each-ref.c:1063 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [options] [<motif>]" -#: builtin/for-each-ref.c:1010 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:1012 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:1014 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:1016 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for tcl" msgstr "échapper les champs réservés pour tcl" -#: builtin/for-each-ref.c:1019 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/for-each-ref.c:1021 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "clé" -#: builtin/for-each-ref.c:1022 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "nom du champ servant à trier" @@ -5460,41 +5528,43 @@ msgstr "activer une vérification plus strict" msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:623 builtin/prune.c:134 +#: builtin/fsck.c:623 builtin/prune.c:144 msgid "show progress" msgstr "afficher la progression" -#: builtin/gc.c:23 +#: builtin/gc.c:24 msgid "git gc [options]" msgstr "git gc [options]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: builtin/gc.c:106 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "objet répertoire démentiellement long %.*s" -#: builtin/gc.c:261 +#: builtin/gc.c:262 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:263 +#: builtin/gc.c:264 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:264 +#: builtin/gc.c:265 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:265 +#: builtin/gc.c:266 msgid "force running gc even if there may be another gc running" -msgstr "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes tourne déjà" +msgstr "" +"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " +"tourne déjà" -#: builtin/gc.c:305 +#: builtin/gc.c:306 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -5506,13 +5576,15 @@ msgstr "" "d'information.\n" #. be quiet on --auto -#: builtin/gc.c:315 +#: builtin/gc.c:316 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" -msgstr "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> (utilisez --force si ce n'est pas le cas)" +msgstr "" +"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " +"(utilisez --force si ce n'est pas le cas)" -#: builtin/gc.c:340 +#: builtin/gc.c:341 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5859,58 +5931,58 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:349 +#: builtin/help.c:353 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:366 +#: builtin/help.c:370 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:374 +#: builtin/help.c:378 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:420 +#: builtin/help.c:424 msgid "Defining attributes per path" msgstr "Définition des attributs par chemin" -#: builtin/help.c:421 +#: builtin/help.c:425 msgid "A Git glossary" msgstr "Un glossaire Git" -#: builtin/help.c:422 +#: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" -#: builtin/help.c:423 +#: builtin/help.c:427 msgid "Defining submodule properties" msgstr "Définition des propriétés de sous-module" -#: builtin/help.c:424 +#: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" msgstr "Spécification des révisions et portées pour Git" -#: builtin/help.c:425 +#: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" "Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "An overview of recommended workflows with Git" msgstr "Un aperçu des flux de travail recommandés avec Git" -#: builtin/help.c:438 +#: builtin/help.c:442 msgid "The common Git guides are:\n" msgstr "Les guides Git populaires sont : \n" -#: builtin/help.c:460 builtin/help.c:476 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "usage : %s%s" -#: builtin/help.c:492 +#: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s\" est un alias de `%s'" @@ -6321,21 +6393,21 @@ msgstr "permissions" msgid "specify that the git repository is to be shared amongst several users" msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" -#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 msgid "be quiet" msgstr "être silencieux" -#: builtin/init-db.c:522 builtin/init-db.c:529 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:533 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:555 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6344,11 +6416,11 @@ msgstr "" "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" "git-dir=<répertoire>)" -#: builtin/init-db.c:579 +#: builtin/init-db.c:580 msgid "Cannot access current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: builtin/init-db.c:586 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" @@ -6521,7 +6593,8 @@ msgstr "ident" #: builtin/log.c:1217 msgid "set From address to <ident> (or committer ident if absent)" -msgstr "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" +msgstr "" +"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" #: builtin/log.c:1219 msgid "message-id" @@ -6779,153 +6852,153 @@ msgstr "Les stratégies disponibles sont :" msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:198 +#: builtin/merge.c:191 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:201 +#: builtin/merge.c:194 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:202 +#: builtin/merge.c:195 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:204 +#: builtin/merge.c:197 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:207 +#: builtin/merge.c:200 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:209 +#: builtin/merge.c:202 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:211 +#: builtin/merge.c:204 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:212 +#: builtin/merge.c:205 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:214 +#: builtin/merge.c:207 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:218 +#: builtin/merge.c:211 msgid "Verify that the named commit has a valid GPG signature" msgstr "Vérifier que la validation a une signature GPG valide" -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:220 +#: builtin/merge.c:213 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:221 +#: builtin/merge.c:214 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:222 +#: builtin/merge.c:215 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:224 +#: builtin/merge.c:217 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" -#: builtin/merge.c:228 +#: builtin/merge.c:221 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:257 +#: builtin/merge.c:250 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:262 +#: builtin/merge.c:255 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:267 +#: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:286 builtin/merge.c:303 +#: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:333 +#: builtin/merge.c:326 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:346 +#: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:378 +#: builtin/merge.c:371 msgid "Writing SQUASH_MSG" msgstr "Écriture de SQUASH_MSG" -#: builtin/merge.c:380 +#: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" msgstr "Finition de SQUASH_MSG" -#: builtin/merge.c:403 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" -#: builtin/merge.c:453 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:565 +#: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:657 +#: builtin/merge.c:650 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: builtin/merge.c:685 +#: builtin/merge.c:678 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:699 +#: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:713 +#: builtin/merge.c:706 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:802 +#: builtin/merge.c:795 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:811 +#: builtin/merge.c:804 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:817 +#: builtin/merge.c:810 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6942,49 +7015,49 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:841 +#: builtin/merge.c:834 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:853 +#: builtin/merge.c:846 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:918 +#: builtin/merge.c:911 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a échoué ; réglez les conflits et validez le " "résultat.\n" -#: builtin/merge.c:934 +#: builtin/merge.c:927 #, c-format msgid "'%s' is not a commit" msgstr "'%s' n'est pas une validation" -#: builtin/merge.c:975 +#: builtin/merge.c:968 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:977 +#: builtin/merge.c:970 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:979 +#: builtin/merge.c:972 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:984 +#: builtin/merge.c:977 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1140 +#: builtin/merge.c:1133 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1156 git-pull.sh:31 +#: builtin/merge.c:1149 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6992,11 +7065,11 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos changements avant de pouvoir fusionner." -#: builtin/merge.c:1159 git-pull.sh:34 +#: builtin/merge.c:1152 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: builtin/merge.c:1163 +#: builtin/merge.c:1156 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -7004,140 +7077,148 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos changements avant de pouvoir fusionner." -#: builtin/merge.c:1166 +#: builtin/merge.c:1159 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1175 +#: builtin/merge.c:1168 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1184 +#: builtin/merge.c:1177 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1216 +#: builtin/merge.c:1209 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1219 +#: builtin/merge.c:1212 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1221 +#: builtin/merge.c:1214 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1226 +#: builtin/merge.c:1219 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1277 +#: builtin/merge.c:1270 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: builtin/merge.c:1280 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." #. 'N' -#: builtin/merge.c:1283 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1286 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: builtin/merge.c:1370 +#: builtin/merge.c:1363 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1409 +#: builtin/merge.c:1402 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1416 +#: builtin/merge.c:1409 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1448 +#: builtin/merge.c:1441 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1471 builtin/merge.c:1550 +#: builtin/merge.c:1464 builtin/merge.c:1543 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1468 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1534 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1543 +#: builtin/merge.c:1536 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1545 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1557 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" -#: builtin/merge-base.c:26 +#: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." msgstr "git merge-base [-a|--all] <validation> <validation>..." -#: builtin/merge-base.c:27 +#: builtin/merge-base.c:30 msgid "git merge-base [-a|--all] --octopus <commit>..." msgstr "git merge-base [-a|--all] --octopus <validation>..." -#: builtin/merge-base.c:28 +#: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <validation>..." -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <validation> <validation>" -#: builtin/merge-base.c:98 +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <référence> [<validation>]" + +#: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "afficher tous les ancêtres communs" -#: builtin/merge-base.c:99 +#: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "trouver les ancêtres pour une fusion simple à n points" -#: builtin/merge-base.c:100 +#: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "afficher les révisions inaccessibles depuis les autres" -#: builtin/merge-base.c:102 +#: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "est le premier ancêtre de l'autre ?" +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "trouver où <validation> a divergé du reflog de <référence>" + #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " @@ -7198,123 +7279,130 @@ msgstr "autoriser la création de plus d'un arbre" msgid "git mv [options] <source>... <destination>" msgstr "git mv [options] <source>... <destination>" -#: builtin/mv.c:67 +#: builtin/mv.c:71 msgid "force move/rename even if target exists" msgstr "forcer le déplacement/renommage même si la cible existe" -#: builtin/mv.c:68 +#: builtin/mv.c:72 msgid "skip move/rename errors" msgstr "sauter les erreurs de déplacement/renommage" -#: builtin/mv.c:113 +#: builtin/mv.c:122 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Vérification du renommage de '%s' en '%s'\n" -#: builtin/mv.c:117 +#: builtin/mv.c:126 msgid "bad source" msgstr "mauvaise source" -#: builtin/mv.c:120 +#: builtin/mv.c:129 msgid "can not move directory into itself" msgstr "impossible de déplacer un répertoire dans lui-même" -#: builtin/mv.c:123 +#: builtin/mv.c:132 msgid "cannot move directory over file" msgstr "impossible de déplacer un répertoire sur un fichier" -#: builtin/mv.c:129 +#: builtin/mv.c:138 #, c-format msgid "Huh? Directory %s is in index and no submodule?" -msgstr "Hein ? Le répertoire %s est dans l'index et pourtant aucun sous-module ?" +msgstr "" +"Hein ? Le répertoire %s est dans l'index et pourtant aucun sous-module ?" -#: builtin/mv.c:131 builtin/rm.c:318 +#: builtin/mv.c:140 builtin/rm.c:318 msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour continuer" +msgstr "" +"Veuillez indexer vos modifications de .gitmodules ou remisez-les pour " +"continuer" -#: builtin/mv.c:147 +#: builtin/mv.c:156 #, c-format msgid "Huh? %.*s is in index?" msgstr "Hein ? %.*s est dans l'index ?" -#: builtin/mv.c:159 +#: builtin/mv.c:168 msgid "source directory is empty" msgstr "le répertoire source est vide" -#: builtin/mv.c:191 +#: builtin/mv.c:200 msgid "not under version control" msgstr "pas sous le contrôle de version" -#: builtin/mv.c:193 +#: builtin/mv.c:202 msgid "destination exists" msgstr "la destination existe" -#: builtin/mv.c:201 +#: builtin/mv.c:210 #, c-format msgid "overwriting '%s'" msgstr "écrasement de '%s'" -#: builtin/mv.c:204 +#: builtin/mv.c:213 msgid "Cannot overwrite" msgstr "Impossible d'écraser" -#: builtin/mv.c:207 +#: builtin/mv.c:216 msgid "multiple sources for the same target" msgstr "multiples sources pour la même destination" -#: builtin/mv.c:222 +#: builtin/mv.c:218 +msgid "destination directory does not exist" +msgstr "le répertoire de destination n'existe pas" + +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" -#: builtin/mv.c:232 +#: builtin/mv.c:243 #, c-format msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [options] <commit>..." msgstr "git name-rev [options] <validation>..." -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [options] --all" msgstr "git name-rev [options] --all" -#: builtin/name-rev.c:261 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --stdin" msgstr "git name-rev [options] --stdin" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:320 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:326 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" @@ -7640,7 +7728,7 @@ msgstr "références_notes" msgid "use notes from <notes_ref>" msgstr "utiliser les notes depuis <références_notes>" -#: builtin/notes.c:974 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" @@ -7660,149 +7748,149 @@ msgstr "" msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2396 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2400 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2423 #, c-format msgid "option %s does not accept negative form" msgstr "l'option %s n'accepte pas de valeur négative" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2427 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "impossible d'analyser la valeur '%s' pour l'option %s" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2446 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2448 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2450 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2453 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2454 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2455 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2458 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2460 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2462 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2464 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2466 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2468 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2470 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2472 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2474 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2476 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleurs correspondance des " "deltas" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2478 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2480 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2482 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2485 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2488 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2491 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2493 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2495 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2498 parse-options.h:143 +#: builtin/pack-objects.c:2496 parse-options.h:143 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2497 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2500 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2502 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2504 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2508 +#: builtin/pack-objects.c:2506 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" @@ -7826,15 +7914,15 @@ msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]" -#: builtin/prune.c:132 +#: builtin/prune.c:142 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" -#: builtin/prune.c:133 +#: builtin/prune.c:143 msgid "report pruned objects" msgstr "afficher les objets éliminés" -#: builtin/prune.c:136 +#: builtin/prune.c:146 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" @@ -7842,15 +7930,15 @@ msgstr "faire expirer les objets plus vieux que <heure>" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/push.c:47 +#: builtin/push.c:86 msgid "tag shorthand without <tag>" msgstr "raccourci d'étiquette sans <étiquette>" -#: builtin/push.c:66 +#: builtin/push.c:96 msgid "--delete only accepts plain target ref names" msgstr "--delete accepte seulement des noms entiers de références cibles" -#: builtin/push.c:101 +#: builtin/push.c:141 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -7859,7 +7947,7 @@ msgstr "" "Pour choisir l'option de manière permanente, voir push.default dans 'git " "help config'." -#: builtin/push.c:104 +#: builtin/push.c:144 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7884,7 +7972,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:119 +#: builtin/push.c:159 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7899,7 +7987,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:133 +#: builtin/push.c:173 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7913,13 +8001,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:141 +#: builtin/push.c:181 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branche courante %s a de multiples branches amont, impossible de pousser." -#: builtin/push.c:144 +#: builtin/push.c:184 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7930,7 +8018,7 @@ msgstr "" "pas une branche amont de votre branche courante '%s', sans me dire\n" "quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:167 +#: builtin/push.c:207 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7942,6 +8030,13 @@ msgid "" "\n" " git config --global push.default simple\n" "\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"In Git 2.0, Git will default to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" @@ -7949,7 +8044,8 @@ msgid "" msgstr "" "push.default n'est pas défini ; sa valeur implicite change dans Git 2.0\n" "de 'matching' vers 'simple'. Pour supprimer ce message et maintenir\n" -"le comportement actuel après les changements par défaut, utilisez :\n" +"le comportement actuel après la modification de la valeur de défaut, " +"utilisez :\n" "\n" " git config --global push.default matching\n" "\n" @@ -7958,20 +8054,29 @@ msgstr "" "\n" " git config --global push.default simple\n" "\n" +"Quand push.default vaudra 'matching', git poussera les branches locales\n" +"sur les branches distantes qui existent déjà avec le même nom.\n" +"\n" +"Dans Git 2.0 Git utilisera par défaut le comportement plus conservatif " +"'simple'\n" +"qui ne pousse la branche courante vers la branche distante que 'git pull' " +"utilise\n" +"pour mettre à jour la branche courante.\n" +" \n" "Voir 'git help config' et chercher 'push.default' pour plus d'information.\n" "(le mode 'simple' a été introduit dans Git 1.7.11. Utilisez le mode " "similaire\n" "'current' au lieu de 'simple' si vous utilisez de temps en temps d'anciennes " "versions de Git)" -#: builtin/push.c:227 +#: builtin/push.c:274 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Vous n'avez pas spécifié de spécifications de référence à pousser, et push." "default est \"nothing\"." -#: builtin/push.c:234 +#: builtin/push.c:281 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7986,7 +8091,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:240 +#: builtin/push.c:287 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -8002,7 +8107,7 @@ msgstr "" "'push.default' à 'simple', 'current' ou 'upstream' pour pousser seulement la " "branche courante." -#: builtin/push.c:246 +#: builtin/push.c:293 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -8017,7 +8122,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:252 +#: builtin/push.c:299 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -8035,13 +8140,13 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:259 +#: builtin/push.c:306 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la " "branche distante." -#: builtin/push.c:262 +#: builtin/push.c:309 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -8053,22 +8158,22 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:328 +#: builtin/push.c:375 #, c-format msgid "Pushing to %s\n" msgstr "Poussage vers %s\n" -#: builtin/push.c:332 +#: builtin/push.c:379 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:365 +#: builtin/push.c:412 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:366 +#: builtin/push.c:413 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -8090,96 +8195,96 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:381 +#: builtin/push.c:428 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:382 +#: builtin/push.c:429 msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:387 +#: builtin/push.c:434 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:388 +#: builtin/push.c:435 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:393 +#: builtin/push.c:440 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:453 +#: builtin/push.c:500 msgid "repository" msgstr "dépôt" -#: builtin/push.c:454 +#: builtin/push.c:501 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:455 +#: builtin/push.c:502 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:457 +#: builtin/push.c:504 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:458 +#: builtin/push.c:505 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:461 +#: builtin/push.c:508 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:463 +#: builtin/push.c:510 msgid "refname>:<expect" msgstr "nom de référence>:<attendu" -#: builtin/push.c:464 +#: builtin/push.c:511 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:466 +#: builtin/push.c:513 msgid "check" msgstr "check" -#: builtin/push.c:467 +#: builtin/push.c:514 msgid "control recursive pushing of submodules" msgstr "contrôler le poussage récursif des sous-modules" -#: builtin/push.c:469 +#: builtin/push.c:516 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:470 builtin/push.c:471 +#: builtin/push.c:517 builtin/push.c:518 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:472 +#: builtin/push.c:519 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:475 +#: builtin/push.c:522 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:477 +#: builtin/push.c:524 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:478 +#: builtin/push.c:525 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:488 +#: builtin/push.c:535 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:490 +#: builtin/push.c:537 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" @@ -8268,11 +8373,11 @@ msgstr "%s' pour '%s' n'est pas un horodatage valide" msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" -#: builtin/remote.c:11 +#: builtin/remote.c:12 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -8280,83 +8385,83 @@ msgstr "" "git remote add [-t <branche>] [-m <maîtresse>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <nom> <URL>" -#: builtin/remote.c:13 builtin/remote.c:32 +#: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "git remote rename <ancienne> <nouvelle>" -#: builtin/remote.c:14 builtin/remote.c:37 +#: builtin/remote.c:15 builtin/remote.c:38 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:15 +#: builtin/remote.c:16 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | " "<distante>)...]" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branche>..." -#: builtin/remote.c:20 builtin/remote.c:68 +#: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <nouvelle-URL>" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <URL>" -#: builtin/remote.c:27 +#: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: builtin/remote.c:42 +#: builtin/remote.c:43 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)" -#: builtin/remote.c:47 +#: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branche>..." -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "git remote show [<options>] <nom>" -#: builtin/remote.c:58 +#: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<options>] <nom>" -#: builtin/remote.c:63 +#: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<options>] [<groupe> | <distante>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "Mise à jour de %s" -#: builtin/remote.c:130 +#: builtin/remote.c:120 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -8364,107 +8469,107 @@ msgstr "" "--mirror est dangereux et obsolète ; merci\n" "\t d'utiliser --mirror=fetch ou --mirror=push à la place" -#: builtin/remote.c:147 +#: builtin/remote.c:137 #, c-format msgid "unknown mirror argument: %s" msgstr "argument miroir inconnu : %s" -#: builtin/remote.c:163 +#: builtin/remote.c:153 msgid "fetch the remote branches" msgstr "rapatrier les branches distantes" -#: builtin/remote.c:165 +#: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" msgstr "" "importer toutes les étiquettes et les objets associés lors du rapatriement" -#: builtin/remote.c:168 +#: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ou ne rapatrier aucune étiquette (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:160 msgid "branch(es) to track" msgstr "branche(s) à suivre" -#: builtin/remote.c:171 +#: builtin/remote.c:161 msgid "master branch" msgstr "branche maîtresse" -#: builtin/remote.c:172 +#: builtin/remote.c:162 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:173 +#: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis" -#: builtin/remote.c:185 +#: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "spécifier les branches à suivre n'a de sens qu'avec des miroirs de " "rapatriement" -#: builtin/remote.c:195 builtin/remote.c:646 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà." -#: builtin/remote.c:199 builtin/remote.c:650 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" -#: builtin/remote.c:243 +#: builtin/remote.c:233 #, c-format msgid "Could not setup master '%s'" msgstr "Impossible de paramétrer la maîtresse '%s'" -#: builtin/remote.c:299 +#: builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: builtin/remote.c:339 +#: builtin/remote.c:334 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "Impossible d'obtenir une correspondance distante pour la spécification de " "référence %s" -#: builtin/remote.c:440 builtin/remote.c:448 +#: builtin/remote.c:435 builtin/remote.c:443 msgid "(matching)" msgstr "(correspond)" -#: builtin/remote.c:452 +#: builtin/remote.c:447 msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Impossible d'ajouter '%s' à '%s'" -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 #, c-format msgid "No such remote: %s" msgstr "Distante inconnue : %s" -#: builtin/remote.c:656 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Impossible de renommer la section de configuration '%s' en '%s'" -#: builtin/remote.c:662 builtin/remote.c:799 +#: builtin/remote.c:657 builtin/remote.c:794 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:677 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8475,32 +8580,32 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:683 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Impossible d'ajouter '%s'" -#: builtin/remote.c:694 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Impossible de définir '%s'" -#: builtin/remote.c:716 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:750 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:764 +#: builtin/remote.c:759 #, c-format msgid "Could not remove branch %s" msgstr "Impossible de supprimer la branche %s" -#: builtin/remote.c:834 +#: builtin/remote.c:829 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8515,120 +8620,120 @@ msgstr[1] "" "supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:943 +#: builtin/remote.c:938 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:946 +#: builtin/remote.c:941 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:948 +#: builtin/remote.c:943 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:950 +#: builtin/remote.c:945 msgid " ???" msgstr " ???" -#: builtin/remote.c:991 +#: builtin/remote.c:986 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche" -#: builtin/remote.c:998 +#: builtin/remote.c:993 #, c-format msgid "rebases onto remote %s" msgstr "rebase sur la distante %s" -#: builtin/remote.c:1001 +#: builtin/remote.c:996 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:1002 +#: builtin/remote.c:997 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1004 +#: builtin/remote.c:999 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1000 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 msgid "create" msgstr "créer" -#: builtin/remote.c:1054 +#: builtin/remote.c:1049 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1058 +#: builtin/remote.c:1053 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1061 +#: builtin/remote.c:1056 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1064 +#: builtin/remote.c:1059 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1071 +#: builtin/remote.c:1066 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1074 +#: builtin/remote.c:1069 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1081 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1091 +#: builtin/remote.c:1144 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1118 +#: builtin/remote.c:1171 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1172 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1120 builtin/remote.c:1285 +#: builtin/remote.c:1173 builtin/remote.c:1318 msgid "(no URL)" msgstr "(pas d'URL)" -#: builtin/remote.c:1129 builtin/remote.c:1131 +#: builtin/remote.c:1182 builtin/remote.c:1184 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1192 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -8636,145 +8741,145 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1151 +#: builtin/remote.c:1204 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1154 builtin/remote.c:1181 +#: builtin/remote.c:1207 builtin/remote.c:1234 msgid " (status not queried)" msgstr " (statut non demandé)" -#: builtin/remote.c:1163 +#: builtin/remote.c:1216 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branche locale configurée pour 'git pull' :" msgstr[1] " Branches locales configurées pour 'git pull' :" -#: builtin/remote.c:1171 +#: builtin/remote.c:1224 msgid " Local refs will be mirrored by 'git push'" msgstr " Les références locales seront reflétées par 'git push'" -#: builtin/remote.c:1178 +#: builtin/remote.c:1231 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Référence locale configurée pour 'git push'%s :" msgstr[1] " Références locales configurées pour 'git push'%s :" -#: builtin/remote.c:1199 +#: builtin/remote.c:1252 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1201 +#: builtin/remote.c:1254 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1216 +#: builtin/remote.c:1269 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1218 +#: builtin/remote.c:1271 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Il y a de multiples branches HEAD distantes. Veuillez en choisir une " "explicitement avec :" -#: builtin/remote.c:1228 +#: builtin/remote.c:1281 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1236 +#: builtin/remote.c:1289 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1238 +#: builtin/remote.c:1291 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1274 +#: builtin/remote.c:1307 #, c-format msgid " %s will become dangling!" msgstr " %s deviendra en suspens !" -#: builtin/remote.c:1275 +#: builtin/remote.c:1308 #, c-format msgid " %s has become dangling!" msgstr " %s est devenu en suspens !" -#: builtin/remote.c:1281 +#: builtin/remote.c:1314 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1315 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1295 +#: builtin/remote.c:1328 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1331 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1321 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1387 builtin/remote.c:1461 +#: builtin/remote.c:1440 builtin/remote.c:1514 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1407 +#: builtin/remote.c:1460 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1414 +#: builtin/remote.c:1467 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1436 +#: builtin/remote.c:1489 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1438 +#: builtin/remote.c:1491 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1440 +#: builtin/remote.c:1493 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1447 +#: builtin/remote.c:1500 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1487 +#: builtin/remote.c:1540 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1495 +#: builtin/remote.c:1548 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1497 +#: builtin/remote.c:1550 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1569 +#: builtin/remote.c:1564 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" @@ -8822,9 +8927,14 @@ msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" msgid "size of the window used for delta compression" msgstr "taille de la fenêtre utilisée pour la compression des deltas" +#: builtin/repack.c:162 builtin/repack.c:166 +msgid "bytes" +msgstr "octets" + #: builtin/repack.c:163 msgid "same as the above, but limit memory size instead of entries count" -msgstr "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" +msgstr "" +"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" #: builtin/repack.c:165 msgid "limits the maximum delta depth" @@ -8834,7 +8944,7 @@ msgstr "limite la profondeur maximale des deltas" msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:345 +#: builtin/repack.c:343 #, c-format msgid "removing '%s' failed" msgstr "la suppression de '%s' a échoué" @@ -8848,21 +8958,25 @@ msgid "git replace -d <object>..." msgstr "git replace -d <objet>..." #: builtin/replace.c:19 -msgid "git replace -l [<pattern>]" -msgstr "git replace -l [<motif>]" +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<format>] [-l [<motif>]]" -#: builtin/replace.c:131 +#: builtin/replace.c:174 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:132 +#: builtin/replace.c:175 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:133 +#: builtin/replace.c:176 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" +#: builtin/replace.c:177 +msgid "use this format" +msgstr "utiliser ce format" + #: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget chemin... | status | remaining | diff | gc]" @@ -8996,19 +9110,23 @@ msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-parse.c:345 +#: builtin/rev-parse.c:359 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [options] -- [<arguments>...]" -#: builtin/rev-parse.c:350 +#: builtin/rev-parse.c:364 msgid "keep the `--` passed as an arg" msgstr "garder le `--` passé en argument" -#: builtin/rev-parse.c:352 +#: builtin/rev-parse.c:366 msgid "stop parsing after the first non-option argument" msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option" -#: builtin/rev-parse.c:470 +#: builtin/rev-parse.c:369 +msgid "output in stuck long form" +msgstr "sortie en forme longue fixée" + +#: builtin/rev-parse.c:486 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9258,68 +9376,68 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<référence>]" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" msgstr "afficher les branches de suivi distantes et les branches locales" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show remote-tracking branches" msgstr "afficher les branches de suivi distantes" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" msgstr "couleur '*!+-' correspondant à la branche" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" msgstr "afficher <n> validations de plus après l'ancêtre commun" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "synonym to more=-1" msgstr "synonyme de more=-1" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "suppress naming strings" msgstr "supprimer les chaînes de nommage" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "include the current branch" msgstr "inclure la branche courante" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "name commits with their object names" msgstr "nommer les validations avec leurs noms d'objet" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show possible merge bases" msgstr "afficher les bases possibles de fusion" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" msgstr "afficher les références inaccessibles depuis toute autre référence" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show commits in topological order" msgstr "afficher les validations dans l'ordre topologique" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "" "afficher seulement les validations qui ne sont pas sur la première branche" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "afficher les fusions accessibles depuis une seule pointe" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "topologically sort, maintaining date order where possible" msgstr "tri topologique, maintenant l'ordre par date si possible" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:678 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:680 +#: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" msgstr "" "afficher les <n> plus récents éléments de ref-log en commençant à la base" @@ -9821,15 +9939,15 @@ msgstr "date d'expiration" msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" -#: parse-options.h:238 +#: parse-options.h:235 msgid "be more verbose" msgstr "être plus verbeux" -#: parse-options.h:240 +#: parse-options.h:237 msgid "be more quiet" msgstr "être plus silencieux" -#: parse-options.h:246 +#: parse-options.h:243 msgid "use <n> digits to display SHA-1s" msgstr "utiliser <n> chiffres pour afficher les SHA-1s" @@ -10139,8 +10257,8 @@ msgstr "" "<branchevalide>'." #: git-bisect.sh:140 -msgid "won't bisect on seeked tree" -msgstr "refus de bissecter sur un arbre 'seeked'" +msgid "won't bisect on cg-seek'ed tree" +msgstr "refus de bissecter sur un arbre 'cg-seeked'" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" @@ -10287,7 +10405,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:255 +#: git-pull.sh:247 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10298,15 +10416,15 @@ msgstr "" "Attention : mise à jour en avance rapide de votre copie de travail\n" "Attention : depuis la validation $orig_head." -#: git-pull.sh:280 +#: git-pull.sh:272 msgid "Cannot merge multiple branches into empty head" msgstr "Impossible de fusionner de multiples branches sur une tête vide" -#: git-pull.sh:284 +#: git-pull.sh:276 msgid "Cannot rebase onto multiple branches" msgstr "Impossible de rebaser sur de multiples branches" -#: git-rebase.sh:54 +#: git-rebase.sh:55 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -10318,16 +10436,16 @@ msgstr "" "Pour extraire la branche d'origine et stopper le rebasage, lancez \"git " "rebase --abort\"." -#: git-rebase.sh:156 +#: git-rebase.sh:158 msgid "Applied autostash." msgstr "Autoremisage appliqué." -#: git-rebase.sh:159 +#: git-rebase.sh:161 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" -#: git-rebase.sh:160 +#: git-rebase.sh:162 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -10337,33 +10455,33 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: git-rebase.sh:199 +#: git-rebase.sh:201 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: git-rebase.sh:204 +#: git-rebase.sh:206 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Il semble que git-am soit en cours. Impossible de rebaser." -#: git-rebase.sh:338 +#: git-rebase.sh:346 msgid "The --exec option must be used with the --interactive option" msgstr "L'option --exec doit être utilisée avec l'option --interactive" -#: git-rebase.sh:343 +#: git-rebase.sh:351 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:354 +#: git-rebase.sh:362 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: git-rebase.sh:361 +#: git-rebase.sh:369 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:364 +#: git-rebase.sh:372 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -10371,12 +10489,12 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: git-rebase.sh:382 +#: git-rebase.sh:390 #, sh-format msgid "Could not move back to $head_name" msgstr "Impossible de revenir à $head_name" -#: git-rebase.sh:401 +#: git-rebase.sh:409 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10398,66 +10516,66 @@ msgstr "" "chose\n" "d'important ici." -#: git-rebase.sh:446 +#: git-rebase.sh:456 #, sh-format msgid "invalid upstream $upstream_name" msgstr "invalide $upstream_name en amont" -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name : il y a plus d'une base de fusion" -#: git-rebase.sh:473 git-rebase.sh:477 +#: git-rebase.sh:483 git-rebase.sh:487 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name : il n'y a pas de base de fusion" -#: git-rebase.sh:482 +#: git-rebase.sh:492 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Ne pointe pas sur une validation valide : $onto_name" -#: git-rebase.sh:505 +#: git-rebase.sh:515 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal : pas de branche : $branch_name" -#: git-rebase.sh:528 +#: git-rebase.sh:548 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:533 +#: git-rebase.sh:553 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:537 +#: git-rebase.sh:557 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:557 +#: git-rebase.sh:577 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:561 +#: git-rebase.sh:581 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branche courante $branch_name est à jour, rebasage forcé." -#: git-rebase.sh:572 +#: git-rebase.sh:592 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" #. Detach HEAD and reset the tree -#: git-rebase.sh:581 +#: git-rebase.sh:601 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Premièrement, rembobinons head pour rejouer votre travail par-dessus..." -#: git-rebase.sh:591 +#: git-rebase.sh:611 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." @@ -10714,49 +10832,49 @@ msgstr "Échec d'enregistrement du sous-module '$sm_path'" msgid "Entering '$prefix$displaypath'" msgstr "Entrée dans '$prefix$displaypath'" -#: git-submodule.sh:554 +#: git-submodule.sh:559 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" "Arrêt sur '$prefix$displaypath' ; le script a retourné un statut non nul." -#: git-submodule.sh:600 +#: git-submodule.sh:605 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" "URL non trouvé pour le chemin de sous-module '$displaypath' dans .gitmodules" -#: git-submodule.sh:609 +#: git-submodule.sh:614 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "" "Échec d'enregistrement de l'URL pour le chemin de sous-module '$displaypath'" -#: git-submodule.sh:611 +#: git-submodule.sh:616 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "Sous-module '$name' ($url) enregistré pour le chemin '$displaypath'" -#: git-submodule.sh:619 +#: git-submodule.sh:633 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:656 +#: git-submodule.sh:671 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "" "Utilisez '.' si vous voulez vraiment réinitialiser tous les sous-modules" -#: git-submodule.sh:673 +#: git-submodule.sh:688 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "La copie de travail du sous-module '$displaypath' contient un répertoire .git" -#: git-submodule.sh:674 +#: git-submodule.sh:689 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -10764,7 +10882,7 @@ msgstr "" "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: git-submodule.sh:680 +#: git-submodule.sh:695 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -10773,30 +10891,30 @@ msgstr "" "La copie de travail du sous-module '$displaypath' contient des modifications " "locales ; utilisez '-f' pour les annuler" -#: git-submodule.sh:683 +#: git-submodule.sh:698 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Répertoire '$displaypath' nettoyé" -#: git-submodule.sh:684 +#: git-submodule.sh:699 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Impossible de supprimer la copie de travail du sous-module '$displaypath'" -#: git-submodule.sh:687 +#: git-submodule.sh:702 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'" -#: git-submodule.sh:696 +#: git-submodule.sh:711 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin " "'$displaypath'" -#: git-submodule.sh:811 +#: git-submodule.sh:834 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" @@ -10805,46 +10923,46 @@ msgstr "" "Chemin de sous-module '$displaypath' non initialisé\n" "Peut-être souhaitez-vous utiliser 'update --init' ?" -#: git-submodule.sh:824 +#: git-submodule.sh:847 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossible de trouver la révision courante dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:833 +#: git-submodule.sh:856 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:857 +#: git-submodule.sh:880 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:871 +#: git-submodule.sh:894 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:872 +#: git-submodule.sh:895 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:877 +#: git-submodule.sh:900 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:878 +#: git-submodule.sh:901 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:883 +#: git-submodule.sh:906 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" @@ -10852,68 +10970,83 @@ msgstr "" "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " "'$prefix$sm_path'" -#: git-submodule.sh:884 +#: git-submodule.sh:907 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "Chemin de sous-module '$prefix$sm_path' : '$command $sha1'" -#: git-submodule.sh:889 +#: git-submodule.sh:912 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:890 +#: git-submodule.sh:913 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:917 +#: git-submodule.sh:940 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:1025 +#: git-submodule.sh:1048 msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" #. unexpected type -#: git-submodule.sh:1073 +#: git-submodule.sh:1096 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:1093 +#: git-submodule.sh:1116 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:1096 +#: git-submodule.sh:1119 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:1099 +#: git-submodule.sh:1122 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Attention : $display_name ne contient pas les validations $sha1_src et " "$sha1_dst" -#: git-submodule.sh:1124 +#: git-submodule.sh:1147 msgid "blob" msgstr "blob" -#: git-submodule.sh:1238 +#: git-submodule.sh:1261 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" -#: git-submodule.sh:1302 +#: git-submodule.sh:1325 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" +#~ msgid "copied: %s -> %s" +#~ msgstr "" + +#~ msgid "deleted: %s" +#~ msgstr "supprimé : %s" + +#~ msgid "modified: %s" +#~ msgstr "modifié : %s" + +#~ msgid "renamed: %s -> %s" +#~ msgstr "renommé : %s -> %s" + +#~ msgid "unmerged: %s" +#~ msgstr "non fus. : %s" + #~ msgid "input paths are terminated by a null character" #~ msgstr "les chemins en entrée sont terminés par le caractère nul" diff --git a/po/git.pot b/po/git.pot index 58af01a219..33cc31d51b 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-11-02 08:06+0800\n" +"POT-Creation-Date: 2014-02-01 08:06+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -52,7 +52,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -73,8 +73,8 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 @@ -245,64 +245,64 @@ msgstr "" msgid "Failed to write ref" msgstr "" -#: bundle.c:36 +#: bundle.c:37 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:63 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:706 +#: bundle.c:90 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:140 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "" -#: bundle.c:186 +#: bundle.c:187 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:193 +#: bundle.c:194 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:195 +#: bundle.c:196 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:294 +#: bundle.c:296 msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:335 +#: bundle.c:337 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:380 +#: bundle.c:382 msgid "Refusing to create empty bundle." msgstr "" @@ -337,16 +337,16 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: connected.c:60 +#: connected.c:70 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:80 +#: connected.c:90 #, c-format msgid "failed write to rev-list: %s" msgstr "" -#: connected.c:88 +#: connected.c:98 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" @@ -418,36 +418,41 @@ msgid_plural "%lu years ago" msgstr[0] "" msgstr[1] "" -#: diff.c:112 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "" + +#: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:117 +#: diff.c:118 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:210 +#: diff.c:213 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:260 +#: diff.c:263 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3490 +#: diff.c:3509 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3504 +#: diff.c:3523 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" @@ -550,7 +555,7 @@ msgid "failed to read the cache" msgstr "" #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 -#: builtin/clone.c:655 +#: builtin/clone.c:661 msgid "unable to write new index file" msgstr "" @@ -599,7 +604,7 @@ msgstr "" msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:774 builtin/clone.c:311 +#: merge-recursive.c:774 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "" @@ -645,7 +650,7 @@ msgstr "" msgid "rename" msgstr "" -#: merge-recursive.c:1082 +#: merge-recursive.c:1082 wt-status.c:283 msgid "renamed" msgstr "" @@ -704,7 +709,7 @@ msgstr "" msgid "modify" msgstr "" -#: merge-recursive.c:1565 +#: merge-recursive.c:1565 wt-status.c:281 msgid "modified" msgstr "" @@ -726,7 +731,7 @@ msgstr "" msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1634 git-submodule.sh:1125 +#: merge-recursive.c:1634 git-submodule.sh:1148 msgid "submodule" msgstr "" @@ -796,7 +801,7 @@ msgstr "" msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2010 builtin/merge.c:672 +#: merge-recursive.c:2010 builtin/merge.c:665 msgid "Unable to write index." msgstr "" @@ -851,46 +856,46 @@ msgstr "" msgid "-NUM" msgstr "" -#: pathspec.c:118 +#: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:128 +#: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:158 +#: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:164 +#: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:168 +#: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:186 +#: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:211 +#: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:222 +#: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "" -#: pathspec.c:278 +#: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" @@ -900,42 +905,72 @@ msgstr "" #. * name. E.g. when add--interactive dies when running #. * "checkout -p" #. -#: pathspec.c:340 +#: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:415 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: remote.c:1833 +#: pathspec.c:442 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" + +#: remote.c:753 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "" + +#: remote.c:757 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "" + +#: remote.c:761 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "" + +#. +#. * This last possibility doesn't occur because +#. * FETCH_HEAD_IGNORE entries always appear at +#. * the end of the list. +#. +#: remote.c:769 +msgid "Internal error" +msgstr "" + +#: remote.c:1871 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:1837 +#: remote.c:1875 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:1840 +#: remote.c:1878 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:1844 +#: remote.c:1882 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:1850 +#: remote.c:1888 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:1853 +#: remote.c:1891 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -943,11 +978,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1861 +#: remote.c:1899 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:1864 +#: remote.c:1902 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -958,7 +993,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1874 +#: remote.c:1912 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" @@ -971,14 +1006,14 @@ msgstr "" msgid "dup2(%d,%d) failed" msgstr "" -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 -#: builtin/merge.c:1013 builtin/merge.c:1023 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 +#: builtin/merge.c:1006 builtin/merge.c:1016 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 -#: builtin/merge.c:1015 builtin/merge.c:1028 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 +#: builtin/merge.c:1008 builtin/merge.c:1021 #, c-format msgid "Could not write to '%s'" msgstr "" @@ -1213,7 +1248,7 @@ msgstr "" msgid "Can't cherry-pick into empty head" msgstr "" -#: sha1_name.c:440 +#: sha1_name.c:439 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1226,21 +1261,21 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: sha1_name.c:1112 +#: sha1_name.c:1070 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:1115 +#: sha1_name.c:1073 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:1117 +#: sha1_name.c:1075 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:1121 +#: sha1_name.c:1079 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -1348,331 +1383,321 @@ msgstr "" msgid "no such user" msgstr "" -#: wt-status.c:146 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:173 wt-status.c:200 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:175 wt-status.c:202 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:179 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:181 wt-status.c:185 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:183 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:194 +#: wt-status.c:198 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:212 +#: wt-status.c:216 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:216 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:218 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:219 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:221 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:233 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:250 +#: wt-status.c:254 msgid "bug" msgstr "" -#: wt-status.c:255 +#: wt-status.c:259 msgid "both deleted:" msgstr "" -#: wt-status.c:256 +#: wt-status.c:260 msgid "added by us:" msgstr "" -#: wt-status.c:257 +#: wt-status.c:261 msgid "deleted by them:" msgstr "" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "" -#: wt-status.c:259 +#: wt-status.c:263 msgid "deleted by us:" msgstr "" -#: wt-status.c:260 +#: wt-status.c:264 msgid "both added:" msgstr "" -#: wt-status.c:261 +#: wt-status.c:265 msgid "both modified:" msgstr "" -#: wt-status.c:291 -msgid "new commits, " +#: wt-status.c:275 +msgid "new file" msgstr "" -#: wt-status.c:293 -msgid "modified content, " +#: wt-status.c:277 +msgid "copied" msgstr "" -#: wt-status.c:295 -msgid "untracked content, " +#: wt-status.c:279 +msgid "deleted" msgstr "" -#: wt-status.c:312 -#, c-format -msgid "new file: %s" +#: wt-status.c:285 +msgid "typechange" msgstr "" -#: wt-status.c:315 -#, c-format -msgid "copied: %s -> %s" +#: wt-status.c:287 +msgid "unknown" msgstr "" -#: wt-status.c:318 -#, c-format -msgid "deleted: %s" +#: wt-status.c:289 +msgid "unmerged" msgstr "" -#: wt-status.c:321 -#, c-format -msgid "modified: %s" -msgstr "" - -#: wt-status.c:324 -#, c-format -msgid "renamed: %s -> %s" -msgstr "" - -#: wt-status.c:327 -#, c-format -msgid "typechange: %s" +#: wt-status.c:336 +msgid "new commits, " msgstr "" -#: wt-status.c:330 -#, c-format -msgid "unknown: %s" +#: wt-status.c:338 +msgid "modified content, " msgstr "" -#: wt-status.c:333 -#, c-format -msgid "unmerged: %s" +#: wt-status.c:340 +msgid "untracked content, " msgstr "" -#: wt-status.c:336 +#: wt-status.c:357 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:703 +#: wt-status.c:732 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:705 +#: wt-status.c:734 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:848 +#: wt-status.c:836 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" + +#: wt-status.c:899 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:851 +#: wt-status.c:902 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:854 +#: wt-status.c:905 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:857 +#: wt-status.c:908 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:867 +#: wt-status.c:918 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:870 +#: wt-status.c:921 msgid "The current patch is empty." msgstr "" -#: wt-status.c:874 +#: wt-status.c:925 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:876 +#: wt-status.c:927 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:878 +#: wt-status.c:929 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:938 wt-status.c:955 +#: wt-status.c:989 wt-status.c:1006 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:943 wt-status.c:960 +#: wt-status.c:994 wt-status.c:1011 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:946 +#: wt-status.c:997 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:948 +#: wt-status.c:999 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:950 +#: wt-status.c:1001 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:963 +#: wt-status.c:1014 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:967 +#: wt-status.c:1018 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:972 +#: wt-status.c:1023 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:975 +#: wt-status.c:1026 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:979 +#: wt-status.c:1030 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:984 +#: wt-status.c:1035 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:987 +#: wt-status.c:1038 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:989 +#: wt-status.c:1040 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:999 +#: wt-status.c:1050 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1004 +#: wt-status.c:1055 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1007 +#: wt-status.c:1058 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1009 +#: wt-status.c:1060 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1018 +#: wt-status.c:1069 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1023 +#: wt-status.c:1074 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1026 +#: wt-status.c:1077 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1028 +#: wt-status.c:1079 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1039 +#: wt-status.c:1090 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1043 +#: wt-status.c:1094 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1046 +#: wt-status.c:1097 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1221 +#: wt-status.c:1272 msgid "On branch " msgstr "" -#: wt-status.c:1228 +#: wt-status.c:1279 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1235 +#: wt-status.c:1286 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1237 +#: wt-status.c:1288 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1240 +#: wt-status.c:1291 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1257 +#: wt-status.c:1308 msgid "Initial commit" msgstr "" -#: wt-status.c:1271 +#: wt-status.c:1322 msgid "Untracked files" msgstr "" -#: wt-status.c:1273 +#: wt-status.c:1324 msgid "Ignored files" msgstr "" -#: wt-status.c:1277 +#: wt-status.c:1328 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1680,86 +1705,86 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1283 +#: wt-status.c:1334 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1285 +#: wt-status.c:1336 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1291 +#: wt-status.c:1342 msgid "No changes" msgstr "" -#: wt-status.c:1296 +#: wt-status.c:1347 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1299 +#: wt-status.c:1350 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1302 +#: wt-status.c:1353 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1305 +#: wt-status.c:1356 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1308 +#: wt-status.c:1359 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1311 wt-status.c:1316 +#: wt-status.c:1362 wt-status.c:1367 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1314 +#: wt-status.c:1365 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1318 +#: wt-status.c:1369 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1427 +#: wt-status.c:1478 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1433 +#: wt-status.c:1484 msgid "Initial commit on " msgstr "" -#: wt-status.c:1463 +#: wt-status.c:1514 msgid "gone" msgstr "" -#: wt-status.c:1465 +#: wt-status.c:1516 msgid "behind " msgstr "" -#: wt-status.c:1468 wt-status.c:1471 +#: wt-status.c:1519 wt-status.c:1522 msgid "ahead " msgstr "" -#: wt-status.c:1473 +#: wt-status.c:1524 msgid ", behind " msgstr "" -#: compat/precompose_utf8.c:55 builtin/clone.c:350 +#: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -1863,15 +1888,15 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 #: builtin/rm.c:269 msgid "dry run" msgstr "" #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "" @@ -1952,11 +1977,11 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "" -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "" @@ -2283,7 +2308,7 @@ msgid "unable to read index file" msgstr "" #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 -#: builtin/fetch.c:77 +#: builtin/fetch.c:78 msgid "path" msgstr "" @@ -2481,95 +2506,95 @@ msgstr "" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2248 +#: builtin/blame.c:2249 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2249 +#: builtin/blame.c:2250 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2250 +#: builtin/blame.c:2251 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2251 +#: builtin/blame.c:2252 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2252 +#: builtin/blame.c:2253 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2253 +#: builtin/blame.c:2254 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2254 +#: builtin/blame.c:2255 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2255 +#: builtin/blame.c:2256 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2256 +#: builtin/blame.c:2257 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2257 +#: builtin/blame.c:2258 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2258 +#: builtin/blame.c:2259 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2259 +#: builtin/blame.c:2260 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2260 +#: builtin/blame.c:2261 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2261 +#: builtin/blame.c:2262 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2262 +#: builtin/blame.c:2263 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2263 +#: builtin/blame.c:2264 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2264 +#: builtin/blame.c:2265 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2265 +#: builtin/blame.c:2266 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2266 builtin/blame.c:2267 +#: builtin/blame.c:2267 builtin/blame.c:2268 msgid "score" msgstr "" -#: builtin/blame.c:2266 +#: builtin/blame.c:2267 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2267 +#: builtin/blame.c:2268 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "n,m" msgstr "" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -2667,292 +2692,292 @@ msgstr "" msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:453 +#: builtin/branch.c:454 #, c-format msgid "[%s: gone]" msgstr "" -#: builtin/branch.c:456 +#: builtin/branch.c:459 #, c-format msgid "[%s]" msgstr "" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:461 +#: builtin/branch.c:466 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:465 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:467 +#: builtin/branch.c:472 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:473 +#: builtin/branch.c:478 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:496 +#: builtin/branch.c:502 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:594 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: builtin/branch.c:591 +#: builtin/branch.c:597 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:594 +#: builtin/branch.c:600 #, c-format msgid "(detached from %s)" msgstr "" -#: builtin/branch.c:597 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:649 #, c-format msgid "object '%s' does not point to a commit" msgstr "" -#: builtin/branch.c:675 +#: builtin/branch.c:681 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:688 +#: builtin/branch.c:694 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:698 +#: builtin/branch.c:704 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:713 +#: builtin/branch.c:719 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:717 +#: builtin/branch.c:723 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:721 +#: builtin/branch.c:727 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:728 +#: builtin/branch.c:734 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:743 +#: builtin/branch.c:749 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:767 +#: builtin/branch.c:773 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:797 +#: builtin/branch.c:803 msgid "Generic options" msgstr "" -#: builtin/branch.c:799 +#: builtin/branch.c:805 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:800 +#: builtin/branch.c:806 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:801 +#: builtin/branch.c:807 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:803 +#: builtin/branch.c:809 msgid "change upstream info" msgstr "" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "use colored output" msgstr "" -#: builtin/branch.c:808 +#: builtin/branch.c:814 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "" -#: builtin/branch.c:812 builtin/branch.c:818 +#: builtin/branch.c:818 builtin/branch.c:824 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:824 +#: builtin/branch.c:830 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:825 +#: builtin/branch.c:831 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:827 +#: builtin/branch.c:833 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:828 +#: builtin/branch.c:834 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:829 +#: builtin/branch.c:835 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:830 +#: builtin/branch.c:836 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:837 msgid "list branch names" msgstr "" -#: builtin/branch.c:832 +#: builtin/branch.c:838 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:834 +#: builtin/branch.c:840 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:835 +#: builtin/branch.c:841 msgid "force creation (when already exists)" msgstr "" -#: builtin/branch.c:838 +#: builtin/branch.c:844 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:844 +#: builtin/branch.c:850 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:848 +#: builtin/branch.c:854 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:861 +#: builtin/branch.c:867 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:866 builtin/clone.c:629 +#: builtin/branch.c:872 builtin/clone.c:635 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:890 +#: builtin/branch.c:896 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:896 builtin/branch.c:935 +#: builtin/branch.c:902 builtin/branch.c:941 msgid "branch name required" msgstr "" -#: builtin/branch.c:911 +#: builtin/branch.c:917 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:916 +#: builtin/branch.c:922 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:923 +#: builtin/branch.c:929 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:926 +#: builtin/branch.c:932 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:941 +#: builtin/branch.c:947 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:946 +#: builtin/branch.c:952 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:950 +#: builtin/branch.c:956 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:957 +#: builtin/branch.c:963 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:969 +#: builtin/branch.c:975 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:973 +#: builtin/branch.c:979 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:979 +#: builtin/branch.c:985 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:994 +#: builtin/branch.c:999 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:1000 +#: builtin/branch.c:1005 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:1003 +#: builtin/branch.c:1008 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:1020 +#: builtin/branch.c:1025 #, c-format msgid "" "\n" @@ -2960,12 +2985,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:1021 +#: builtin/branch.c:1026 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:1022 +#: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -2983,43 +3008,43 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:312 +#: builtin/cat-file.c:328 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "" -#: builtin/cat-file.c:313 +#: builtin/cat-file.c:329 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "" -#: builtin/cat-file.c:350 +#: builtin/cat-file.c:366 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:351 +#: builtin/cat-file.c:367 msgid "show object type" msgstr "" -#: builtin/cat-file.c:352 +#: builtin/cat-file.c:368 msgid "show object size" msgstr "" -#: builtin/cat-file.c:354 +#: builtin/cat-file.c:370 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:355 +#: builtin/cat-file.c:371 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:357 +#: builtin/cat-file.c:373 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:359 +#: builtin/cat-file.c:375 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:362 +#: builtin/cat-file.c:378 msgid "show info about objects fed from the standard input" msgstr "" @@ -3047,7 +3072,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 msgid "suppress progress reporting" msgstr "" @@ -3325,7 +3350,7 @@ msgid "Cannot switch branch to a non-commit '%s'" msgstr "" #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 -#: builtin/remote.c:169 builtin/remote.c:171 +#: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "" @@ -3373,11 +3398,11 @@ msgstr "" msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1106 builtin/merge.c:232 +#: builtin/checkout.c:1106 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 msgid "style" msgstr "" @@ -3551,7 +3576,7 @@ msgid "remove whole directories" msgstr "" #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "" @@ -3587,8 +3612,8 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 -#: builtin/push.c:474 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 +#: builtin/push.c:521 msgid "force progress reporting" msgstr "" @@ -3648,7 +3673,7 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 msgid "depth" msgstr "" @@ -3681,141 +3706,160 @@ msgstr "" msgid "reference repository '%s' is not a local repository." msgstr "" -#: builtin/clone.c:315 +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "" + +#: builtin/clone.c:259 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "" + +#: builtin/clone.c:321 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:317 builtin/diff.c:77 +#: builtin/clone.c:323 builtin/diff.c:83 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:319 +#: builtin/clone.c:325 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:333 +#: builtin/clone.c:339 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:355 +#: builtin/clone.c:361 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:359 +#: builtin/clone.c:365 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:382 builtin/clone.c:559 +#: builtin/clone.c:388 builtin/clone.c:565 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:395 +#: builtin/clone.c:401 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:474 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:554 +#: builtin/clone.c:560 #, c-format msgid "Checking connectivity... " msgstr "" -#: builtin/clone.c:557 +#: builtin/clone.c:563 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:620 +#: builtin/clone.c:626 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:651 +#: builtin/clone.c:657 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:759 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:763 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:774 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:777 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:790 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:795 +#: builtin/clone.c:802 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:797 +#: builtin/clone.c:805 +msgid "source repository is shallow, ignoring --local" +msgstr "" + +#: builtin/clone.c:810 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:807 +#: builtin/clone.c:814 builtin/fetch.c:1119 +#, c-format +msgid "depth %s is not a positive number" +msgstr "" + +#: builtin/clone.c:824 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:817 +#: builtin/clone.c:834 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:830 builtin/clone.c:842 +#: builtin/clone.c:847 builtin/clone.c:859 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:833 +#: builtin/clone.c:850 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:852 +#: builtin/clone.c:869 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:854 +#: builtin/clone.c:871 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:888 +#: builtin/clone.c:906 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:939 builtin/clone.c:947 +#: builtin/clone.c:957 builtin/clone.c:965 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:950 +#: builtin/clone.c:968 msgid "You appear to have cloned an empty repository." msgstr "" @@ -4126,7 +4170,7 @@ msgstr "" msgid "show branch information" msgstr "" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 msgid "machine-readable output" msgstr "" @@ -4205,7 +4249,7 @@ msgstr "" msgid "override author for commit" msgstr "" -#: builtin/commit.c:1458 builtin/gc.c:260 +#: builtin/commit.c:1458 builtin/gc.c:261 msgid "date" msgstr "" @@ -4213,7 +4257,7 @@ msgstr "" msgid "override date for commit" msgstr "" -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 #: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "" @@ -4266,11 +4310,11 @@ msgstr "" msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 msgid "key id" msgstr "" -#: builtin/commit.c:1471 builtin/merge.c:231 +#: builtin/commit.c:1471 builtin/merge.c:224 msgid "GPG sign commit" msgstr "" @@ -4327,7 +4371,7 @@ msgstr "" msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1567 builtin/merge.c:525 +#: builtin/commit.c:1567 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -4346,29 +4390,29 @@ msgstr "" msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1614 +#: builtin/commit.c:1611 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1655 +#: builtin/commit.c:1652 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1659 +#: builtin/commit.c:1656 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1670 +#: builtin/commit.c:1667 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4621,7 +4665,7 @@ msgstr "" msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:423 builtin/name-rev.c:322 +#: builtin/describe.c:423 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "" @@ -4645,31 +4689,31 @@ msgstr "" msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/diff.c:79 +#: builtin/diff.c:85 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:230 +#: builtin/diff.c:236 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:307 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:350 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:359 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:366 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -4730,230 +4774,239 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:74 +#: builtin/fetch.c:75 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:76 +#: builtin/fetch.c:77 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:78 +#: builtin/fetch.c:79 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:79 +#: builtin/fetch.c:80 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:81 +#: builtin/fetch.c:82 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:83 +#: builtin/fetch.c:84 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:85 +#: builtin/fetch.c:86 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:87 +#: builtin/fetch.c:88 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:88 +#: builtin/fetch.c:89 msgid "on-demand" msgstr "" -#: builtin/fetch.c:89 +#: builtin/fetch.c:90 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:93 +#: builtin/fetch.c:94 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:95 +#: builtin/fetch.c:96 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:98 +#: builtin/fetch.c:99 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:100 +#: builtin/fetch.c:101 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:102 builtin/log.c:1197 +#: builtin/fetch.c:103 builtin/log.c:1197 msgid "dir" msgstr "" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:106 +#: builtin/fetch.c:107 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:236 +#: builtin/fetch.c:109 +msgid "accept refs that update .git/shallow" +msgstr "" + +#: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:290 +#: builtin/fetch.c:411 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:295 +#: builtin/fetch.c:416 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:309 +#: builtin/fetch.c:430 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:310 builtin/fetch.c:396 +#: builtin/fetch.c:431 builtin/fetch.c:517 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:321 +#: builtin/fetch.c:442 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:341 +#: builtin/fetch.c:462 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:344 +#: builtin/fetch.c:465 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:347 +#: builtin/fetch.c:468 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "forced update" msgstr "" -#: builtin/fetch.c:398 +#: builtin/fetch.c:519 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:429 builtin/fetch.c:735 +#: builtin/fetch.c:552 builtin/fetch.c:785 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:438 +#: builtin/fetch.c:561 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:537 +#: builtin/fetch.c:579 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "" + +#: builtin/fetch.c:667 builtin/fetch.c:750 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:548 +#: builtin/fetch.c:678 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:598 +#: builtin/fetch.c:730 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:599 +#: builtin/fetch.c:731 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:606 +#: builtin/fetch.c:755 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:607 builtin/remote.c:1055 +#: builtin/fetch.c:756 builtin/remote.c:1050 msgid "(none)" msgstr "" -#: builtin/fetch.c:725 +#: builtin/fetch.c:775 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:744 +#: builtin/fetch.c:794 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:747 +#: builtin/fetch.c:797 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:801 +#: builtin/fetch.c:853 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:976 +#: builtin/fetch.c:1015 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:978 builtin/remote.c:100 +#: builtin/fetch.c:1017 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1036 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:1020 +#: builtin/fetch.c:1059 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1068 +#: builtin/fetch.c:1107 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1109 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1089 +#: builtin/fetch.c:1132 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1091 +#: builtin/fetch.c:1134 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1145 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1110 +#: builtin/fetch.c:1153 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -4962,8 +5015,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 +#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446 +#: parse-options.h:135 parse-options.h:242 msgid "n" msgstr "" @@ -4987,43 +5041,43 @@ msgstr "" msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:995 +#: builtin/for-each-ref.c:1063 msgid "git for-each-ref [options] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:1010 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:1012 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:1014 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1016 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for tcl" msgstr "" -#: builtin/for-each-ref.c:1019 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177 msgid "format" msgstr "" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:1021 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1022 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "" @@ -5067,41 +5121,41 @@ msgstr "" msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:623 builtin/prune.c:134 +#: builtin/fsck.c:623 builtin/prune.c:144 msgid "show progress" msgstr "" -#: builtin/gc.c:23 +#: builtin/gc.c:24 msgid "git gc [options]" msgstr "" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: builtin/gc.c:106 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:261 +#: builtin/gc.c:262 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:263 +#: builtin/gc.c:264 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:264 +#: builtin/gc.c:265 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:265 +#: builtin/gc.c:266 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:305 +#: builtin/gc.c:306 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -5109,13 +5163,13 @@ msgid "" msgstr "" #. be quiet on --auto -#: builtin/gc.c:315 +#: builtin/gc.c:316 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:340 +#: builtin/gc.c:341 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5445,57 +5499,57 @@ msgid "" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:349 +#: builtin/help.c:353 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:366 +#: builtin/help.c:370 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:374 +#: builtin/help.c:378 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:420 +#: builtin/help.c:424 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:421 +#: builtin/help.c:425 msgid "A Git glossary" msgstr "" -#: builtin/help.c:422 +#: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: builtin/help.c:423 +#: builtin/help.c:427 msgid "Defining submodule properties" msgstr "" -#: builtin/help.c:424 +#: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:425 +#: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:438 +#: builtin/help.c:442 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:460 builtin/help.c:476 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:492 +#: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" @@ -5902,32 +5956,32 @@ msgstr "" msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 msgid "be quiet" msgstr "" -#: builtin/init-db.c:522 builtin/init-db.c:529 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:533 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:555 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:579 +#: builtin/init-db.c:580 msgid "Cannot access current working directory" msgstr "" -#: builtin/init-db.c:586 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -6349,148 +6403,148 @@ msgstr "" msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:198 +#: builtin/merge.c:191 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:201 +#: builtin/merge.c:194 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:202 +#: builtin/merge.c:195 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:204 +#: builtin/merge.c:197 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:200 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:209 +#: builtin/merge.c:202 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:211 +#: builtin/merge.c:204 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:212 +#: builtin/merge.c:205 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:214 +#: builtin/merge.c:207 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:218 +#: builtin/merge.c:211 msgid "Verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:220 +#: builtin/merge.c:213 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:221 +#: builtin/merge.c:214 msgid "option=value" msgstr "" -#: builtin/merge.c:222 +#: builtin/merge.c:215 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:224 +#: builtin/merge.c:217 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:228 +#: builtin/merge.c:221 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:257 +#: builtin/merge.c:250 msgid "could not run stash." msgstr "" -#: builtin/merge.c:262 +#: builtin/merge.c:255 msgid "stash failed" msgstr "" -#: builtin/merge.c:267 +#: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:286 builtin/merge.c:303 +#: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:333 +#: builtin/merge.c:326 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:346 +#: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:378 +#: builtin/merge.c:371 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:380 +#: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:403 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:453 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:565 +#: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:657 +#: builtin/merge.c:650 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:685 +#: builtin/merge.c:678 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:699 +#: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:713 +#: builtin/merge.c:706 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:802 +#: builtin/merge.c:795 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:811 +#: builtin/merge.c:804 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:817 +#: builtin/merge.c:810 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6500,193 +6554,201 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:841 +#: builtin/merge.c:834 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:853 +#: builtin/merge.c:846 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:918 +#: builtin/merge.c:911 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:934 +#: builtin/merge.c:927 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:975 +#: builtin/merge.c:968 msgid "No current branch." msgstr "" -#: builtin/merge.c:977 +#: builtin/merge.c:970 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:979 +#: builtin/merge.c:972 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:984 +#: builtin/merge.c:977 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1140 +#: builtin/merge.c:1133 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1156 git-pull.sh:31 +#: builtin/merge.c:1149 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:1159 git-pull.sh:34 +#: builtin/merge.c:1152 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1163 +#: builtin/merge.c:1156 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:1166 +#: builtin/merge.c:1159 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1175 +#: builtin/merge.c:1168 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1184 +#: builtin/merge.c:1177 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1216 +#: builtin/merge.c:1209 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1219 +#: builtin/merge.c:1212 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1221 +#: builtin/merge.c:1214 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1226 +#: builtin/merge.c:1219 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1277 +#: builtin/merge.c:1270 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1280 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" #. 'N' -#: builtin/merge.c:1283 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1286 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1370 +#: builtin/merge.c:1363 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1409 +#: builtin/merge.c:1402 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1416 +#: builtin/merge.c:1409 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1448 +#: builtin/merge.c:1441 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1471 builtin/merge.c:1550 +#: builtin/merge.c:1464 builtin/merge.c:1543 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1475 +#: builtin/merge.c:1468 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1541 +#: builtin/merge.c:1534 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1543 +#: builtin/merge.c:1536 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1552 +#: builtin/merge.c:1545 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1564 +#: builtin/merge.c:1557 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -#: builtin/merge-base.c:26 +#: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." msgstr "" -#: builtin/merge-base.c:27 +#: builtin/merge-base.c:30 msgid "git merge-base [-a|--all] --octopus <commit>..." msgstr "" -#: builtin/merge-base.c:28 +#: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." msgstr "" -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "" -#: builtin/merge-base.c:98 +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "" + +#: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:99 +#: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:100 +#: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:102 +#: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "" +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "" + #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " @@ -6745,122 +6807,126 @@ msgstr "" msgid "git mv [options] <source>... <destination>" msgstr "" -#: builtin/mv.c:67 +#: builtin/mv.c:71 msgid "force move/rename even if target exists" msgstr "" -#: builtin/mv.c:68 +#: builtin/mv.c:72 msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:113 +#: builtin/mv.c:122 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:117 +#: builtin/mv.c:126 msgid "bad source" msgstr "" -#: builtin/mv.c:120 +#: builtin/mv.c:129 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:123 +#: builtin/mv.c:132 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:129 +#: builtin/mv.c:138 #, c-format msgid "Huh? Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:131 builtin/rm.c:318 +#: builtin/mv.c:140 builtin/rm.c:318 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/mv.c:147 +#: builtin/mv.c:156 #, c-format msgid "Huh? %.*s is in index?" msgstr "" -#: builtin/mv.c:159 +#: builtin/mv.c:168 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:191 +#: builtin/mv.c:200 msgid "not under version control" msgstr "" -#: builtin/mv.c:193 +#: builtin/mv.c:202 msgid "destination exists" msgstr "" -#: builtin/mv.c:201 +#: builtin/mv.c:210 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:204 +#: builtin/mv.c:213 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:207 +#: builtin/mv.c:216 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:222 +#: builtin/mv.c:218 +msgid "destination directory does not exist" +msgstr "" + +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:232 +#: builtin/mv.c:243 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [options] <commit>..." msgstr "" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [options] --all" msgstr "" -#: builtin/name-rev.c:261 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --stdin" msgstr "" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:320 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:326 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "" @@ -7169,7 +7235,7 @@ msgstr "" msgid "use notes from <notes_ref>" msgstr "" -#: builtin/notes.c:974 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -7187,143 +7253,143 @@ msgstr "" msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2396 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2400 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2423 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2427 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2446 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2448 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2450 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2453 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2454 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2455 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2458 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2460 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2462 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2464 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2466 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2468 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2470 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2472 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2474 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2476 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2478 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2480 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2482 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2485 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2488 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2491 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2493 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2495 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2498 parse-options.h:143 +#: builtin/pack-objects.c:2496 parse-options.h:143 msgid "time" msgstr "" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2497 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2500 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2502 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2504 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2508 +#: builtin/pack-objects.c:2506 msgid "do not hide commits by grafts" msgstr "" @@ -7347,15 +7413,15 @@ msgstr "" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:132 +#: builtin/prune.c:142 msgid "do not remove, show only" msgstr "" -#: builtin/prune.c:133 +#: builtin/prune.c:143 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:136 +#: builtin/prune.c:146 msgid "expire objects older than <time>" msgstr "" @@ -7363,21 +7429,21 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:47 +#: builtin/push.c:86 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:66 +#: builtin/push.c:96 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:101 +#: builtin/push.c:141 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:104 +#: builtin/push.c:144 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7392,7 +7458,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:119 +#: builtin/push.c:159 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7402,7 +7468,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:133 +#: builtin/push.c:173 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7411,12 +7477,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:141 +#: builtin/push.c:181 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:144 +#: builtin/push.c:184 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7424,7 +7490,7 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:167 +#: builtin/push.c:207 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7436,18 +7502,25 @@ msgid "" "\n" " git config --global push.default simple\n" "\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"In Git 2.0, Git will default to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -#: builtin/push.c:227 +#: builtin/push.c:274 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:234 +#: builtin/push.c:281 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7455,7 +7528,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:240 +#: builtin/push.c:287 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7463,7 +7536,7 @@ msgid "" "to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" -#: builtin/push.c:246 +#: builtin/push.c:293 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -7471,7 +7544,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:252 +#: builtin/push.c:299 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -7480,33 +7553,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:259 +#: builtin/push.c:306 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:262 +#: builtin/push.c:309 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:328 +#: builtin/push.c:375 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:332 +#: builtin/push.c:379 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:365 +#: builtin/push.c:412 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:366 +#: builtin/push.c:413 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7519,95 +7592,95 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:381 +#: builtin/push.c:428 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:382 +#: builtin/push.c:429 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:387 +#: builtin/push.c:434 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:388 +#: builtin/push.c:435 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:393 +#: builtin/push.c:440 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:453 +#: builtin/push.c:500 msgid "repository" msgstr "" -#: builtin/push.c:454 +#: builtin/push.c:501 msgid "push all refs" msgstr "" -#: builtin/push.c:455 +#: builtin/push.c:502 msgid "mirror all refs" msgstr "" -#: builtin/push.c:457 +#: builtin/push.c:504 msgid "delete refs" msgstr "" -#: builtin/push.c:458 +#: builtin/push.c:505 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:461 +#: builtin/push.c:508 msgid "force updates" msgstr "" -#: builtin/push.c:463 +#: builtin/push.c:510 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:464 +#: builtin/push.c:511 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:466 +#: builtin/push.c:513 msgid "check" msgstr "" -#: builtin/push.c:467 +#: builtin/push.c:514 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:469 +#: builtin/push.c:516 msgid "use thin pack" msgstr "" -#: builtin/push.c:470 builtin/push.c:471 +#: builtin/push.c:517 builtin/push.c:518 msgid "receive pack program" msgstr "" -#: builtin/push.c:472 +#: builtin/push.c:519 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:475 +#: builtin/push.c:522 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:477 +#: builtin/push.c:524 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:478 +#: builtin/push.c:525 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:488 +#: builtin/push.c:535 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:490 +#: builtin/push.c:537 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -7692,191 +7765,191 @@ msgstr "" msgid "'%s' is not a valid timestamp" msgstr "" -#: builtin/remote.c:11 +#: builtin/remote.c:12 msgid "git remote [-v | --verbose]" msgstr "" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:13 builtin/remote.c:32 +#: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:14 builtin/remote.c:37 +#: builtin/remote.c:15 builtin/remote.c:38 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:15 +#: builtin/remote.c:16 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" msgstr "" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" -#: builtin/remote.c:20 builtin/remote.c:68 +#: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:27 +#: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:42 +#: builtin/remote.c:43 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" -#: builtin/remote.c:47 +#: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:58 +#: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:63 +#: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:98 +#: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:130 +#: builtin/remote.c:120 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:147 +#: builtin/remote.c:137 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:163 +#: builtin/remote.c:153 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:165 +#: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:168 +#: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:170 +#: builtin/remote.c:160 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:171 +#: builtin/remote.c:161 msgid "master branch" msgstr "" -#: builtin/remote.c:172 +#: builtin/remote.c:162 msgid "push|fetch" msgstr "" -#: builtin/remote.c:173 +#: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:185 +#: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:187 +#: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:195 builtin/remote.c:646 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:199 builtin/remote.c:650 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:243 +#: builtin/remote.c:233 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:299 +#: builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "" -#: builtin/remote.c:339 +#: builtin/remote.c:334 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:440 builtin/remote.c:448 +#: builtin/remote.c:435 builtin/remote.c:443 msgid "(matching)" msgstr "" -#: builtin/remote.c:452 +#: builtin/remote.c:447 msgid "(delete)" msgstr "" -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "" -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:656 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:662 builtin/remote.c:799 +#: builtin/remote.c:657 builtin/remote.c:794 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:677 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -7884,32 +7957,32 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:683 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "" -#: builtin/remote.c:694 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "" -#: builtin/remote.c:716 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:750 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:764 +#: builtin/remote.c:759 #, c-format msgid "Could not remove branch %s" msgstr "" -#: builtin/remote.c:834 +#: builtin/remote.c:829 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -7919,262 +7992,262 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:943 +#: builtin/remote.c:938 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:946 +#: builtin/remote.c:941 msgid " tracked" msgstr "" -#: builtin/remote.c:948 +#: builtin/remote.c:943 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:950 +#: builtin/remote.c:945 msgid " ???" msgstr "" -#: builtin/remote.c:991 +#: builtin/remote.c:986 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:998 +#: builtin/remote.c:993 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:1001 +#: builtin/remote.c:996 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:1002 +#: builtin/remote.c:997 msgid " and with remote" msgstr "" -#: builtin/remote.c:1004 +#: builtin/remote.c:999 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1005 +#: builtin/remote.c:1000 msgid " and with remote" msgstr "" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 msgid "create" msgstr "" -#: builtin/remote.c:1054 +#: builtin/remote.c:1049 msgid "delete" msgstr "" -#: builtin/remote.c:1058 +#: builtin/remote.c:1053 msgid "up to date" msgstr "" -#: builtin/remote.c:1061 +#: builtin/remote.c:1056 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1064 +#: builtin/remote.c:1059 msgid "local out of date" msgstr "" -#: builtin/remote.c:1071 +#: builtin/remote.c:1066 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1074 +#: builtin/remote.c:1069 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1078 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1081 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1091 +#: builtin/remote.c:1144 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1118 +#: builtin/remote.c:1171 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1119 +#: builtin/remote.c:1172 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1120 builtin/remote.c:1285 +#: builtin/remote.c:1173 builtin/remote.c:1318 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1129 builtin/remote.c:1131 +#: builtin/remote.c:1182 builtin/remote.c:1184 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1139 +#: builtin/remote.c:1192 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1151 +#: builtin/remote.c:1204 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1154 builtin/remote.c:1181 +#: builtin/remote.c:1207 builtin/remote.c:1234 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1163 +#: builtin/remote.c:1216 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1171 +#: builtin/remote.c:1224 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1178 +#: builtin/remote.c:1231 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1199 +#: builtin/remote.c:1252 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1201 +#: builtin/remote.c:1254 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1216 +#: builtin/remote.c:1269 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1218 +#: builtin/remote.c:1271 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1228 +#: builtin/remote.c:1281 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1236 +#: builtin/remote.c:1289 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1238 +#: builtin/remote.c:1291 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1274 +#: builtin/remote.c:1307 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1275 +#: builtin/remote.c:1308 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1281 +#: builtin/remote.c:1314 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1282 +#: builtin/remote.c:1315 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1295 +#: builtin/remote.c:1328 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1298 +#: builtin/remote.c:1331 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1321 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1387 builtin/remote.c:1461 +#: builtin/remote.c:1440 builtin/remote.c:1514 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1407 +#: builtin/remote.c:1460 msgid "add branch" msgstr "" -#: builtin/remote.c:1414 +#: builtin/remote.c:1467 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1436 +#: builtin/remote.c:1489 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1438 +#: builtin/remote.c:1491 msgid "add URL" msgstr "" -#: builtin/remote.c:1440 +#: builtin/remote.c:1493 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1447 +#: builtin/remote.c:1500 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1487 +#: builtin/remote.c:1540 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1495 +#: builtin/remote.c:1548 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1497 +#: builtin/remote.c:1550 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1569 +#: builtin/remote.c:1564 msgid "be verbose; must be placed before a subcommand" msgstr "" @@ -8222,6 +8295,10 @@ msgstr "" msgid "size of the window used for delta compression" msgstr "" +#: builtin/repack.c:162 builtin/repack.c:166 +msgid "bytes" +msgstr "" + #: builtin/repack.c:163 msgid "same as the above, but limit memory size instead of entries count" msgstr "" @@ -8234,7 +8311,7 @@ msgstr "" msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:345 +#: builtin/repack.c:343 #, c-format msgid "removing '%s' failed" msgstr "" @@ -8248,21 +8325,25 @@ msgid "git replace -d <object>..." msgstr "" #: builtin/replace.c:19 -msgid "git replace -l [<pattern>]" +msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "" -#: builtin/replace.c:131 +#: builtin/replace.c:174 msgid "list replace refs" msgstr "" -#: builtin/replace.c:132 +#: builtin/replace.c:175 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:133 +#: builtin/replace.c:176 msgid "replace the ref if it exists" msgstr "" +#: builtin/replace.c:177 +msgid "use this format" +msgstr "" + #: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "" @@ -8393,19 +8474,23 @@ msgstr "" msgid "Could not write new index file." msgstr "" -#: builtin/rev-parse.c:345 +#: builtin/rev-parse.c:359 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:350 +#: builtin/rev-parse.c:364 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:352 +#: builtin/rev-parse.c:366 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:470 +#: builtin/rev-parse.c:369 +msgid "output in stuck long form" +msgstr "" + +#: builtin/rev-parse.c:486 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8628,67 +8713,67 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" msgstr "" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show remote-tracking branches" msgstr "" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" msgstr "" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" msgstr "" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "synonym to more=-1" msgstr "" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "suppress naming strings" msgstr "" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "include the current branch" msgstr "" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "name commits with their object names" msgstr "" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show possible merge bases" msgstr "" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" msgstr "" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "topologically sort, maintaining date order where possible" msgstr "" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:678 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:680 +#: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" msgstr "" @@ -9161,15 +9246,15 @@ msgstr "" msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:238 +#: parse-options.h:235 msgid "be more verbose" msgstr "" -#: parse-options.h:240 +#: parse-options.h:237 msgid "be more quiet" msgstr "" -#: parse-options.h:246 +#: parse-options.h:243 msgid "use <n> digits to display SHA-1s" msgstr "" @@ -9442,7 +9527,7 @@ msgid "" msgstr "" #: git-bisect.sh:140 -msgid "won't bisect on seeked tree" +msgid "won't bisect on cg-seek'ed tree" msgstr "" #: git-bisect.sh:144 @@ -9573,7 +9658,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:255 +#: git-pull.sh:247 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -9581,15 +9666,15 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:280 +#: git-pull.sh:272 msgid "Cannot merge multiple branches into empty head" msgstr "" -#: git-pull.sh:284 +#: git-pull.sh:276 msgid "Cannot rebase onto multiple branches" msgstr "" -#: git-rebase.sh:54 +#: git-rebase.sh:55 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -9597,58 +9682,58 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:156 +#: git-rebase.sh:158 msgid "Applied autostash." msgstr "" -#: git-rebase.sh:159 +#: git-rebase.sh:161 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:160 +#: git-rebase.sh:162 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: git-rebase.sh:199 +#: git-rebase.sh:201 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:204 +#: git-rebase.sh:206 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:338 +#: git-rebase.sh:346 msgid "The --exec option must be used with the --interactive option" msgstr "" -#: git-rebase.sh:343 +#: git-rebase.sh:351 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:354 +#: git-rebase.sh:362 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:361 +#: git-rebase.sh:369 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:364 +#: git-rebase.sh:372 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:382 +#: git-rebase.sh:390 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:401 +#: git-rebase.sh:409 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -9661,65 +9746,65 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:446 +#: git-rebase.sh:456 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:473 git-rebase.sh:477 +#: git-rebase.sh:483 git-rebase.sh:487 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:482 +#: git-rebase.sh:492 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:505 +#: git-rebase.sh:515 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:528 +#: git-rebase.sh:548 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:533 +#: git-rebase.sh:553 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:537 +#: git-rebase.sh:557 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:557 +#: git-rebase.sh:577 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:561 +#: git-rebase.sh:581 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:572 +#: git-rebase.sh:592 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" #. Detach HEAD and reset the tree -#: git-rebase.sh:581 +#: git-rebase.sh:601 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:591 +#: git-rebase.sh:611 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -9957,177 +10042,177 @@ msgstr "" msgid "Entering '$prefix$displaypath'" msgstr "" -#: git-submodule.sh:554 +#: git-submodule.sh:559 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:600 +#: git-submodule.sh:605 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" -#: git-submodule.sh:609 +#: git-submodule.sh:614 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:611 +#: git-submodule.sh:616 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" -#: git-submodule.sh:619 +#: git-submodule.sh:633 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:656 +#: git-submodule.sh:671 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:673 +#: git-submodule.sh:688 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -#: git-submodule.sh:674 +#: git-submodule.sh:689 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: git-submodule.sh:680 +#: git-submodule.sh:695 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:683 +#: git-submodule.sh:698 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:684 +#: git-submodule.sh:699 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:687 +#: git-submodule.sh:702 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:696 +#: git-submodule.sh:711 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:811 +#: git-submodule.sh:834 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:824 +#: git-submodule.sh:847 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:833 +#: git-submodule.sh:856 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:857 +#: git-submodule.sh:880 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:871 +#: git-submodule.sh:894 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:872 +#: git-submodule.sh:895 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:877 +#: git-submodule.sh:900 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:878 +#: git-submodule.sh:901 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:883 +#: git-submodule.sh:906 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:884 +#: git-submodule.sh:907 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "" -#: git-submodule.sh:889 +#: git-submodule.sh:912 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:890 +#: git-submodule.sh:913 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:917 +#: git-submodule.sh:940 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:1025 +#: git-submodule.sh:1048 msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:1073 +#: git-submodule.sh:1096 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:1093 +#: git-submodule.sh:1116 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:1096 +#: git-submodule.sh:1119 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:1099 +#: git-submodule.sh:1122 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1124 +#: git-submodule.sh:1147 msgid "blob" msgstr "" -#: git-submodule.sh:1238 +#: git-submodule.sh:1261 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1302 +#: git-submodule.sh:1325 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" diff --git a/po/nl.po b/po/nl.po deleted file mode 100644 index ad31c66cdf..0000000000 --- a/po/nl.po +++ /dev/null @@ -1,3493 +0,0 @@ -# Dutch translations for Git. -# Copyright (C) 2012 Vincent van Ravesteijn <vfr@lyx.org> -# This file is distributed under the same license as the Git package. -# Vincent van Ravesteijn <vfr@lyx.org>, 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: Git\n" -"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-02-28 09:17+0800\n" -"PO-Revision-Date: 2012-03-07 12:02+0100\n" -"Last-Translator: Vincent van Ravesteijn <vfr@lyx.org>\n" -"Language-Team: Dutch\n" -"Language: nl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: advice.c:34 -#, c-format -msgid "hint: %.*s\n" -msgstr "" - -#. -#. * Message used both when 'git commit' fails and when -#. * other commands doing a merge do. -#. -#: advice.c:64 -msgid "" -"Fix them up in the work tree,\n" -"and then use 'git add/rm <file>' as\n" -"appropriate to mark resolution and make a commit,\n" -"or use 'git commit -a'." -msgstr "" - -#: commit.c:47 -#, c-format -msgid "could not parse %s" -msgstr "" - -#: commit.c:49 -#, c-format -msgid "%s %s is not a commit!" -msgstr "" - -#: compat/obstack.c:406 compat/obstack.c:408 -msgid "memory exhausted" -msgstr "" - -#: connected.c:39 -msgid "Could not run 'git rev-list'" -msgstr "" - -#: connected.c:48 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "" - -#: connected.c:56 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "" - -#: diff.c:104 -#, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr "" - -#: diff.c:109 -#, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr "" - -#: diff.c:205 -#, c-format -msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" -msgstr "" - -#: diff.c:1331 -msgid " 0 files changed\n" -msgstr "" - -#: diff.c:1335 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] "" -msgstr[1] "" - -#: diff.c:1352 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] "" -msgstr[1] "" - -#: diff.c:1363 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] "" -msgstr[1] "" - -#: diff.c:3364 -#, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" - -#: gpg-interface.c:59 -msgid "could not run gpg." -msgstr "" - -#: gpg-interface.c:71 -msgid "gpg did not accept the data" -msgstr "" - -#: gpg-interface.c:82 -msgid "gpg failed to sign the data" -msgstr "" - -#: grep.c:1285 -#, c-format -msgid "'%s': unable to read %s" -msgstr "" - -#: grep.c:1302 -#, c-format -msgid "'%s': %s" -msgstr "" - -#: grep.c:1313 -#, c-format -msgid "'%s': short read %s" -msgstr "" - -#: help.c:287 -#, c-format -msgid "" -"'%s' appears to be a git command, but we were not\n" -"able to execute it. Maybe git-%s is broken?" -msgstr "" - -#: remote.c:1607 -#, c-format -msgid "Your branch is ahead of '%s' by %d commit.\n" -msgid_plural "Your branch is ahead of '%s' by %d commits.\n" -msgstr[0] "" -msgstr[1] "" - -#: remote.c:1613 -#, c-format -msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "" -"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "" -msgstr[1] "" - -#: remote.c:1621 -#, c-format -msgid "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commit each, respectively.\n" -msgid_plural "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commits each, respectively.\n" -msgstr[0] "" -msgstr[1] "" - -#: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983 -#: builtin/merge.c:1093 builtin/merge.c:1103 -#, c-format -msgid "Could not open '%s' for writing" -msgstr "" - -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865 -#: builtin/merge.c:1095 builtin/merge.c:1108 -#, c-format -msgid "Could not write to '%s'" -msgstr "" - -#: sequencer.c:142 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'\n" -"and commit the result with 'git commit'" -msgstr "" - -#: sequencer.c:154 sequencer.c:680 sequencer.c:763 -#, c-format -msgid "Could not write to %s" -msgstr "" - -#: sequencer.c:157 -#, c-format -msgid "Error wrapping up %s" -msgstr "" - -#: sequencer.c:172 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "" - -#: sequencer.c:174 -msgid "Your local changes would be overwritten by revert." -msgstr "" - -#: sequencer.c:177 -msgid "Commit your changes or stash them to proceed." -msgstr "" - -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:227 -#, c-format -msgid "%s: Unable to write new index file" -msgstr "" - -#: sequencer.c:293 -msgid "Your index file is unmerged." -msgstr "" - -#: sequencer.c:296 -msgid "You do not have a valid HEAD" -msgstr "" - -#: sequencer.c:311 -#, c-format -msgid "Commit %s is a merge but no -m option was given." -msgstr "" - -#: sequencer.c:319 -#, c-format -msgid "Commit %s does not have parent %d" -msgstr "" - -#: sequencer.c:323 -#, 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:334 -#, c-format -msgid "%s: cannot parse parent commit %s" -msgstr "" - -#: sequencer.c:338 -#, c-format -msgid "Cannot get commit message for %s" -msgstr "" - -#: sequencer.c:422 -#, c-format -msgid "could not revert %s... %s" -msgstr "" - -#: sequencer.c:423 -#, c-format -msgid "could not apply %s... %s" -msgstr "" - -#: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709 -#: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348 -#: builtin/shortlog.c:181 -msgid "revision walk setup failed" -msgstr "" - -#: sequencer.c:448 -msgid "empty commit set passed" -msgstr "" - -#: sequencer.c:456 -#, c-format -msgid "git %s: failed to read the index" -msgstr "" - -#: sequencer.c:461 -#, c-format -msgid "git %s: failed to refresh the index" -msgstr "" - -#: sequencer.c:546 -#, c-format -msgid "Cannot %s during a %s" -msgstr "" - -#: sequencer.c:568 -#, c-format -msgid "Could not parse line %d." -msgstr "" - -#: sequencer.c:573 -msgid "No commits parsed." -msgstr "" - -#: sequencer.c:586 -#, c-format -msgid "Could not open %s" -msgstr "" - -#: sequencer.c:590 -#, c-format -msgid "Could not read %s." -msgstr "" - -#: sequencer.c:597 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "" - -#: sequencer.c:625 -#, c-format -msgid "Invalid key: %s" -msgstr "" - -#: sequencer.c:628 -#, c-format -msgid "Invalid value for %s: %s" -msgstr "" - -#: sequencer.c:640 -#, c-format -msgid "Malformed options sheet: %s" -msgstr "" - -#: sequencer.c:661 -msgid "a cherry-pick or revert is already in progress" -msgstr "" - -#: sequencer.c:662 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "" - -#: sequencer.c:666 -#, c-format -msgid "Could not create sequencer directory %s" -msgstr "" - -#: sequencer.c:682 sequencer.c:767 -#, c-format -msgid "Error wrapping up %s." -msgstr "" - -#: sequencer.c:701 sequencer.c:835 -msgid "no cherry-pick or revert in progress" -msgstr "" - -#: sequencer.c:703 -msgid "cannot resolve HEAD" -msgstr "" - -#: sequencer.c:705 -msgid "cannot abort from a branch yet to be born" -msgstr "" - -#: sequencer.c:727 -#, c-format -msgid "cannot open %s: %s" -msgstr "" - -#: sequencer.c:730 -#, c-format -msgid "cannot read %s: %s" -msgstr "" - -#: sequencer.c:731 -msgid "unexpected end of file" -msgstr "" - -#: sequencer.c:737 -#, c-format -msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "" - -#: sequencer.c:760 -#, c-format -msgid "Could not format %s." -msgstr "" - -#: sequencer.c:922 -msgid "Can't revert as initial commit" -msgstr "" - -#: sequencer.c:923 -msgid "Can't cherry-pick into empty head" -msgstr "" - -#: wt-status.c:134 -msgid "Unmerged paths:" -msgstr "" - -#: wt-status.c:140 wt-status.c:157 -#, c-format -msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr "" - -#: wt-status.c:142 wt-status.c:159 -msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr "" - -#: wt-status.c:143 -msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" -msgstr "" - -#: wt-status.c:151 -msgid "Changes to be committed:" -msgstr "" - -#: wt-status.c:169 -msgid "Changes not staged for commit:" -msgstr "" - -#: wt-status.c:173 -msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr "" - -#: wt-status.c:175 -msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr "" - -#: wt-status.c:176 -msgid "" -" (use \"git checkout -- <file>...\" to discard changes in working directory)" -msgstr "" - -#: wt-status.c:178 -msgid " (commit or discard the untracked or modified content in submodules)" -msgstr "" - -#: wt-status.c:187 -#, c-format -msgid "%s files:" -msgstr "" - -#: wt-status.c:190 -#, c-format -msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr "" - -#: wt-status.c:207 -msgid "bug" -msgstr "" - -#: wt-status.c:212 -msgid "both deleted:" -msgstr "" - -#: wt-status.c:213 -msgid "added by us:" -msgstr "" - -#: wt-status.c:214 -msgid "deleted by them:" -msgstr "" - -#: wt-status.c:215 -msgid "added by them:" -msgstr "" - -#: wt-status.c:216 -msgid "deleted by us:" -msgstr "" - -#: wt-status.c:217 -msgid "both added:" -msgstr "" - -#: wt-status.c:218 -msgid "both modified:" -msgstr "" - -#: wt-status.c:248 -msgid "new commits, " -msgstr "" - -#: wt-status.c:250 -msgid "modified content, " -msgstr "" - -#: wt-status.c:252 -msgid "untracked content, " -msgstr "" - -#: wt-status.c:266 -#, c-format -msgid "new file: %s" -msgstr "" - -#: wt-status.c:269 -#, c-format -msgid "copied: %s -> %s" -msgstr "" - -#: wt-status.c:272 -#, c-format -msgid "deleted: %s" -msgstr "" - -#: wt-status.c:275 -#, c-format -msgid "modified: %s" -msgstr "" - -#: wt-status.c:278 -#, c-format -msgid "renamed: %s -> %s" -msgstr "" - -#: wt-status.c:281 -#, c-format -msgid "typechange: %s" -msgstr "" - -#: wt-status.c:284 -#, c-format -msgid "unknown: %s" -msgstr "" - -#: wt-status.c:287 -#, c-format -msgid "unmerged: %s" -msgstr "" - -#: wt-status.c:290 -#, c-format -msgid "bug: unhandled diff status %c" -msgstr "" - -#: wt-status.c:713 -msgid "On branch " -msgstr "" - -#: wt-status.c:720 -msgid "Not currently on any branch." -msgstr "" - -#: wt-status.c:731 -msgid "Initial commit" -msgstr "" - -#: wt-status.c:745 -msgid "Untracked" -msgstr "" - -#: wt-status.c:747 -msgid "Ignored" -msgstr "" - -#: wt-status.c:749 -#, c-format -msgid "Untracked files not listed%s" -msgstr "" - -#: wt-status.c:751 -msgid " (use -u option to show untracked files)" -msgstr "" - -#: wt-status.c:757 -msgid "No changes" -msgstr "" - -#: wt-status.c:761 -#, c-format -msgid "no changes added to commit%s\n" -msgstr "" - -#: wt-status.c:763 -msgid " (use \"git add\" and/or \"git commit -a\")" -msgstr "" - -#: wt-status.c:765 -#, c-format -msgid "nothing added to commit but untracked files present%s\n" -msgstr "" - -#: wt-status.c:767 -msgid " (use \"git add\" to track)" -msgstr "" - -#: wt-status.c:769 wt-status.c:772 wt-status.c:775 -#, c-format -msgid "nothing to commit%s\n" -msgstr "" - -#: wt-status.c:770 -msgid " (create/copy files and use \"git add\" to track)" -msgstr "" - -#: wt-status.c:773 -msgid " (use -u to show untracked files)" -msgstr "" - -#: wt-status.c:776 -msgid " (working directory clean)" -msgstr "" - -#: wt-status.c:884 -msgid "HEAD (no branch)" -msgstr "" - -#: wt-status.c:890 -msgid "Initial commit on " -msgstr "" - -#: wt-status.c:905 -msgid "behind " -msgstr "" - -#: wt-status.c:908 wt-status.c:911 -msgid "ahead " -msgstr "" - -#: wt-status.c:913 -msgid ", behind " -msgstr "" - -#: builtin/add.c:62 -#, c-format -msgid "unexpected diff status %c" -msgstr "" - -#: builtin/add.c:67 builtin/commit.c:298 -msgid "updating files failed" -msgstr "" - -#: builtin/add.c:77 -#, c-format -msgid "remove '%s'\n" -msgstr "" - -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "" - -#: builtin/add.c:192 -msgid "Unstaged changes after refreshing the index:" -msgstr "" - -#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 -#, c-format -msgid "pathspec '%s' did not match any files" -msgstr "" - -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "" - -#: builtin/add.c:276 -msgid "Could not read the index" -msgstr "" - -#: builtin/add.c:286 -#, c-format -msgid "Could not open '%s' for writing." -msgstr "" - -#: builtin/add.c:290 -msgid "Could not write patch" -msgstr "" - -#: builtin/add.c:295 -#, c-format -msgid "Could not stat '%s'" -msgstr "" - -#: builtin/add.c:297 -msgid "Empty patch. Aborted." -msgstr "" - -#: builtin/add.c:303 -#, c-format -msgid "Could not apply '%s'" -msgstr "" - -#: builtin/add.c:312 -msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "" - -#: builtin/add.c:352 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "" - -#: builtin/add.c:353 -msgid "no files added" -msgstr "" - -#: builtin/add.c:359 -msgid "adding files failed" -msgstr "" - -#: builtin/add.c:391 -msgid "-A and -u are mutually incompatible" -msgstr "" - -#: builtin/add.c:393 -msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "" - -#: builtin/add.c:413 -#, c-format -msgid "Nothing specified, nothing added.\n" -msgstr "" - -#: builtin/add.c:414 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "" - -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 -#: builtin/rm.c:162 -msgid "index file corrupt" -msgstr "" - -#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 -msgid "Unable to write new index file" -msgstr "" - -#: builtin/archive.c:17 -#, c-format -msgid "could not create archive file '%s'" -msgstr "" - -#: builtin/archive.c:20 -msgid "could not redirect output" -msgstr "" - -#: builtin/archive.c:37 -msgid "git archive: Remote with no URL" -msgstr "" - -#: builtin/archive.c:58 -msgid "git archive: expected ACK/NAK, got EOF" -msgstr "" - -#: builtin/archive.c:63 -#, c-format -msgid "git archive: NACK %s" -msgstr "" - -#: builtin/archive.c:65 -#, c-format -msgid "remote error: %s" -msgstr "" - -#: builtin/archive.c:66 -msgid "git archive: protocol error" -msgstr "" - -#: builtin/archive.c:71 -msgid "git archive: expected a flush" -msgstr "" - -#: builtin/branch.c:137 -#, c-format -msgid "" -"deleting branch '%s' that has been merged to\n" -" '%s', but not yet merged to HEAD." -msgstr "" - -#: builtin/branch.c:141 -#, c-format -msgid "" -"not deleting branch '%s' that is not yet merged to\n" -" '%s', even though it is merged to HEAD." -msgstr "" - -#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" -#: builtin/branch.c:163 -msgid "remote " -msgstr "" - -#: builtin/branch.c:171 -msgid "cannot use -a with -d" -msgstr "" - -#: builtin/branch.c:177 -msgid "Couldn't look up commit object for HEAD" -msgstr "" - -#: builtin/branch.c:182 -#, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "" - -#: builtin/branch.c:192 -#, c-format -msgid "%sbranch '%s' not found." -msgstr "" - -#: builtin/branch.c:200 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "" - -#: builtin/branch.c:206 -#, 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:214 -#, c-format -msgid "Error deleting %sbranch '%s'" -msgstr "" - -#: builtin/branch.c:219 -#, c-format -msgid "Deleted %sbranch %s (was %s).\n" -msgstr "" - -#: builtin/branch.c:224 -msgid "Update of config-file failed" -msgstr "" - -#: builtin/branch.c:322 -#, c-format -msgid "branch '%s' does not point at a commit" -msgstr "" - -#: builtin/branch.c:394 -#, c-format -msgid "behind %d] " -msgstr "" - -#: builtin/branch.c:396 -#, c-format -msgid "ahead %d] " -msgstr "" - -#: builtin/branch.c:398 -#, c-format -msgid "ahead %d, behind %d] " -msgstr "" - -#: builtin/branch.c:501 -msgid "(no branch)" -msgstr "" - -#: builtin/branch.c:562 -msgid "some refs could not be read" -msgstr "" - -#: builtin/branch.c:575 -msgid "cannot rename the current branch while not on any." -msgstr "" - -#: builtin/branch.c:585 -#, c-format -msgid "Invalid branch name: '%s'" -msgstr "" - -#: builtin/branch.c:600 -msgid "Branch rename failed" -msgstr "" - -#: builtin/branch.c:604 -#, c-format -msgid "Renamed a misnamed branch '%s' away" -msgstr "" - -#: builtin/branch.c:608 -#, c-format -msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "" - -#: builtin/branch.c:615 -msgid "Branch is renamed, but update of config-file failed" -msgstr "" - -#: builtin/branch.c:630 -#, c-format -msgid "malformed object name %s" -msgstr "" - -#: builtin/branch.c:654 -#, c-format -msgid "could not write branch description template: %s\n" -msgstr "" - -#: builtin/branch.c:742 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "" - -#: builtin/branch.c:747 builtin/clone.c:558 -msgid "HEAD not found below refs/heads!" -msgstr "" - -#: builtin/branch.c:805 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" -msgstr "" - -#: builtin/bundle.c:47 -#, c-format -msgid "%s is okay\n" -msgstr "" - -#: builtin/bundle.c:56 -msgid "Need a repository to create a bundle." -msgstr "" - -#: builtin/bundle.c:60 -msgid "Need a repository to unbundle." -msgstr "" - -#: builtin/checkout.c:113 builtin/checkout.c:146 -#, c-format -msgid "path '%s' does not have our version" -msgstr "" - -#: builtin/checkout.c:115 builtin/checkout.c:148 -#, c-format -msgid "path '%s' does not have their version" -msgstr "" - -#: builtin/checkout.c:131 -#, c-format -msgid "path '%s' does not have all necessary versions" -msgstr "" - -#: builtin/checkout.c:175 -#, c-format -msgid "path '%s' does not have necessary versions" -msgstr "" - -#: builtin/checkout.c:192 -#, c-format -msgid "path '%s': cannot merge" -msgstr "" - -#: builtin/checkout.c:209 -#, c-format -msgid "Unable to add merge result for '%s'" -msgstr "" - -#: builtin/checkout.c:212 builtin/reset.c:158 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "" - -#: builtin/checkout.c:234 builtin/checkout.c:392 -msgid "corrupt index file" -msgstr "" - -#: builtin/checkout.c:264 builtin/checkout.c:271 -#, c-format -msgid "path '%s' is unmerged" -msgstr "" - -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 -#: builtin/merge.c:809 -msgid "unable to write new index file" -msgstr "" - -#: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406 -msgid "diff_setup_done failed" -msgstr "" - -#: builtin/checkout.c:414 -msgid "you need to resolve your current index first" -msgstr "" - -#: builtin/checkout.c:533 -#, c-format -msgid "Can not do reflog for '%s'\n" -msgstr "" - -#: builtin/checkout.c:565 -msgid "HEAD is now at" -msgstr "" - -#: builtin/checkout.c:572 -#, c-format -msgid "Reset branch '%s'\n" -msgstr "" - -#: builtin/checkout.c:575 -#, c-format -msgid "Already on '%s'\n" -msgstr "" - -#: builtin/checkout.c:579 -#, c-format -msgid "Switched to and reset branch '%s'\n" -msgstr "" - -#: builtin/checkout.c:581 -#, c-format -msgid "Switched to a new branch '%s'\n" -msgstr "" - -#: builtin/checkout.c:583 -#, c-format -msgid "Switched to branch '%s'\n" -msgstr "" - -#: builtin/checkout.c:639 -#, c-format -msgid " ... and %d more.\n" -msgstr "" - -#. The singular version -#: builtin/checkout.c:645 -#, 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" -"\n" -"%s\n" -msgstr[0] "" -msgstr[1] "" - -#: builtin/checkout.c:663 -#, 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" -msgstr "" - -#: builtin/checkout.c:692 -msgid "internal error in revision walk" -msgstr "" - -#: builtin/checkout.c:696 -msgid "Previous HEAD position was" -msgstr "" - -#: builtin/checkout.c:722 -msgid "You are on a branch yet to be born" -msgstr "" - -#. case (1) -#: builtin/checkout.c:853 -#, c-format -msgid "invalid reference: %s" -msgstr "" - -#. case (1): want a tree -#: builtin/checkout.c:892 -#, c-format -msgid "reference is not a tree: %s" -msgstr "" - -#: builtin/checkout.c:972 -msgid "-B cannot be used with -b" -msgstr "" - -#: builtin/checkout.c:981 -msgid "--patch is incompatible with all other options" -msgstr "" - -#: builtin/checkout.c:984 -msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "" - -#: builtin/checkout.c:986 -msgid "--detach cannot be used with -t" -msgstr "" - -#: builtin/checkout.c:992 -msgid "--track needs a branch name" -msgstr "" - -#: builtin/checkout.c:999 -msgid "Missing branch name; try -b" -msgstr "" - -#: builtin/checkout.c:1005 -msgid "--orphan and -b|-B are mutually exclusive" -msgstr "" - -#: builtin/checkout.c:1007 -msgid "--orphan cannot be used with -t" -msgstr "" - -#: builtin/checkout.c:1017 -msgid "git checkout: -f and -m are incompatible" -msgstr "" - -#: builtin/checkout.c:1051 -msgid "invalid path specification" -msgstr "" - -#: builtin/checkout.c:1059 -#, 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?" -msgstr "" - -#: builtin/checkout.c:1061 -msgid "git checkout: updating paths is incompatible with switching branches." -msgstr "" - -#: builtin/checkout.c:1066 -msgid "git checkout: --detach does not take a path argument" -msgstr "" - -#: builtin/checkout.c:1069 -msgid "" -"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" -"checking out of the index." -msgstr "" - -#: builtin/checkout.c:1088 -msgid "Cannot switch branch to a non-commit." -msgstr "" - -#: builtin/checkout.c:1091 -msgid "--ours/--theirs is incompatible with switching branches." -msgstr "" - -#: builtin/clean.c:78 -msgid "-x and -X cannot be used together" -msgstr "" - -#: builtin/clean.c:82 -msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" -msgstr "" - -#: builtin/clean.c:85 -msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" -msgstr "" - -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "" - -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "" - -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "" - -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "" - -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "" - -#: builtin/clone.c:243 -#, c-format -msgid "reference repository '%s' is not a local directory." -msgstr "" - -#: builtin/clone.c:302 -#, c-format -msgid "failed to open '%s'" -msgstr "" - -#: builtin/clone.c:306 -#, c-format -msgid "failed to create directory '%s'" -msgstr "" - -#: builtin/clone.c:308 builtin/diff.c:75 -#, c-format -msgid "failed to stat '%s'" -msgstr "" - -#: builtin/clone.c:310 -#, c-format -msgid "%s exists and is not a directory" -msgstr "" - -#: builtin/clone.c:324 -#, c-format -msgid "failed to stat %s\n" -msgstr "" - -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "" - -#: builtin/clone.c:346 -#, c-format -msgid "failed to create link '%s'" -msgstr "" - -#: builtin/clone.c:350 -#, c-format -msgid "failed to copy file to '%s'" -msgstr "" - -#: builtin/clone.c:373 -#, c-format -msgid "done.\n" -msgstr "" - -#: builtin/clone.c:440 -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "" - -#: builtin/clone.c:549 -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "" - -#: builtin/clone.c:639 -msgid "Too many arguments." -msgstr "" - -#: builtin/clone.c:643 -msgid "You must specify a repository to clone." -msgstr "" - -#: builtin/clone.c:654 -#, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "" - -#: builtin/clone.c:668 -#, c-format -msgid "repository '%s' does not exist" -msgstr "" - -#: builtin/clone.c:673 -msgid "--depth is ignored in local clones; use file:// instead." -msgstr "" - -#: builtin/clone.c:683 -#, c-format -msgid "destination path '%s' already exists and is not an empty directory." -msgstr "" - -#: builtin/clone.c:693 -#, c-format -msgid "working tree '%s' already exists." -msgstr "" - -#: builtin/clone.c:706 builtin/clone.c:720 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "" - -#: builtin/clone.c:709 -#, c-format -msgid "could not create work tree dir '%s'." -msgstr "" - -#: builtin/clone.c:728 -#, c-format -msgid "Cloning into bare repository '%s'...\n" -msgstr "" - -#: builtin/clone.c:730 -#, c-format -msgid "Cloning into '%s'...\n" -msgstr "" - -#: builtin/clone.c:786 -#, c-format -msgid "Don't know how to clone %s" -msgstr "" - -#: builtin/clone.c:835 -#, c-format -msgid "Remote branch %s not found in upstream %s" -msgstr "" - -#: builtin/clone.c:842 -msgid "You appear to have cloned an empty repository." -msgstr "" - -#: builtin/commit.c:42 -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/commit.c:54 -msgid "" -"You asked to amend the most recent commit, but doing so would make\n" -"it empty. You can repeat your command with --allow-empty, or you can\n" -"remove the commit entirely with \"git reset HEAD^\".\n" -msgstr "" - -#: builtin/commit.c:59 -msgid "" -"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/commit.c:205 builtin/reset.c:33 -msgid "merge" -msgstr "" - -#: builtin/commit.c:208 -msgid "cherry-pick" -msgstr "" - -#: builtin/commit.c:325 -msgid "failed to unpack HEAD tree object" -msgstr "" - -#: builtin/commit.c:367 -msgid "unable to create temporary index" -msgstr "" - -#: builtin/commit.c:373 -msgid "interactive add failed" -msgstr "" - -#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 -msgid "unable to write new_index file" -msgstr "" - -#: builtin/commit.c:457 -#, c-format -msgid "cannot do a partial commit during a %s." -msgstr "" - -#: builtin/commit.c:466 -msgid "cannot read the index" -msgstr "" - -#: builtin/commit.c:486 -msgid "unable to write temporary index file" -msgstr "" - -#: builtin/commit.c:550 builtin/commit.c:556 -#, c-format -msgid "invalid commit: %s" -msgstr "" - -#: builtin/commit.c:579 -msgid "malformed --author parameter" -msgstr "" - -#: builtin/commit.c:635 -#, c-format -msgid "Malformed ident string: '%s'" -msgstr "" - -#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 -#, c-format -msgid "could not lookup commit %s" -msgstr "" - -#: builtin/commit.c:682 builtin/shortlog.c:296 -#, c-format -msgid "(reading log message from standard input)\n" -msgstr "" - -#: builtin/commit.c:684 -msgid "could not read log from standard input" -msgstr "" - -#: builtin/commit.c:688 -#, c-format -msgid "could not read log file '%s'" -msgstr "" - -#: builtin/commit.c:694 -msgid "commit has empty message" -msgstr "" - -#: builtin/commit.c:710 -msgid "could not read MERGE_MSG" -msgstr "" - -#: builtin/commit.c:714 -msgid "could not read SQUASH_MSG" -msgstr "" - -#: builtin/commit.c:718 -#, c-format -msgid "could not read '%s'" -msgstr "" - -#: builtin/commit.c:746 -#, c-format -msgid "could not open '%s'" -msgstr "" - -#: builtin/commit.c:770 -msgid "could not write commit template" -msgstr "" - -#: builtin/commit.c:783 -#, c-format -msgid "" -"\n" -"It looks like you may be committing a %s.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" -"and try again.\n" -msgstr "" - -#: builtin/commit.c:796 -msgid "Please enter the commit message for your changes." -msgstr "" - -#: builtin/commit.c:799 -msgid "" -" Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" -msgstr "" - -#: builtin/commit.c:804 -msgid "" -" 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:816 -#, c-format -msgid "%sAuthor: %s" -msgstr "" - -#: builtin/commit.c:823 -#, c-format -msgid "%sCommitter: %s" -msgstr "" - -#: builtin/commit.c:843 -msgid "Cannot read index" -msgstr "" - -#: builtin/commit.c:880 -msgid "Error building trees" -msgstr "" - -#: builtin/commit.c:895 builtin/tag.c:357 -#, c-format -msgid "Please supply the message using either -m or -F option.\n" -msgstr "" - -#: builtin/commit.c:975 -#, c-format -msgid "No existing author found with '%s'" -msgstr "" - -#: builtin/commit.c:990 builtin/commit.c:1182 -#, c-format -msgid "Invalid untracked files mode '%s'" -msgstr "" - -#: builtin/commit.c:1030 -msgid "Using both --reset-author and --author does not make sense" -msgstr "" - -#: builtin/commit.c:1041 -msgid "You have nothing to amend." -msgstr "" - -#: builtin/commit.c:1043 -#, c-format -msgid "You are in the middle of a %s -- cannot amend." -msgstr "" - -#: builtin/commit.c:1045 -msgid "Options --squash and --fixup cannot be used together" -msgstr "" - -#: builtin/commit.c:1055 -msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "" - -#: builtin/commit.c:1057 -msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "" - -#: builtin/commit.c:1063 -msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "" - -#: builtin/commit.c:1080 -msgid "Only one of --include/--only/--all/--interactive/--patch can be used." -msgstr "" - -#: builtin/commit.c:1082 -msgid "No paths with --include/--only does not make sense." -msgstr "" - -#: builtin/commit.c:1084 -msgid "Clever... amending the last one with dirty index." -msgstr "" - -#: builtin/commit.c:1086 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." -msgstr "" - -#: builtin/commit.c:1096 builtin/tag.c:556 -#, c-format -msgid "Invalid cleanup mode %s" -msgstr "" - -#: builtin/commit.c:1101 -msgid "Paths with -a does not make sense." -msgstr "" - -#: builtin/commit.c:1280 -msgid "couldn't look up newly created commit" -msgstr "" - -#: builtin/commit.c:1282 -msgid "could not parse newly created commit" -msgstr "" - -#: builtin/commit.c:1323 -msgid "detached HEAD" -msgstr "" - -#: builtin/commit.c:1325 -msgid " (root-commit)" -msgstr "" - -#: builtin/commit.c:1415 -msgid "could not parse HEAD commit" -msgstr "" - -#: builtin/commit.c:1452 builtin/merge.c:507 -#, c-format -msgid "could not open '%s' for reading" -msgstr "" - -#: builtin/commit.c:1459 -#, c-format -msgid "Corrupt MERGE_HEAD file (%s)" -msgstr "" - -#: builtin/commit.c:1466 -msgid "could not read MERGE_MODE" -msgstr "" - -#: builtin/commit.c:1485 -#, c-format -msgid "could not read commit message: %s" -msgstr "" - -#: builtin/commit.c:1499 -#, c-format -msgid "Aborting commit due to empty commit message.\n" -msgstr "" - -#: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966 -msgid "failed to write commit object" -msgstr "" - -#: builtin/commit.c:1535 -msgid "cannot lock HEAD ref" -msgstr "" - -#: builtin/commit.c:1539 -msgid "cannot update HEAD ref" -msgstr "" - -#: builtin/commit.c:1550 -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." -msgstr "" - -#: builtin/describe.c:234 -#, c-format -msgid "annotated tag %s not available" -msgstr "" - -#: builtin/describe.c:238 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "" - -#: builtin/describe.c:240 -#, c-format -msgid "tag '%s' is really '%s' here" -msgstr "" - -#: builtin/describe.c:267 -#, c-format -msgid "Not a valid object name %s" -msgstr "" - -#: builtin/describe.c:270 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "" - -#: builtin/describe.c:287 -#, c-format -msgid "no tag exactly matches '%s'" -msgstr "" - -#: builtin/describe.c:289 -#, c-format -msgid "searching to describe %s\n" -msgstr "" - -#: builtin/describe.c:329 -#, c-format -msgid "finished search at %s\n" -msgstr "" - -#: builtin/describe.c:353 -#, c-format -msgid "" -"No annotated tags can describe '%s'.\n" -"However, there were unannotated tags: try --tags." -msgstr "" - -#: builtin/describe.c:357 -#, c-format -msgid "" -"No tags can describe '%s'.\n" -"Try --always, or create some tags." -msgstr "" - -#: builtin/describe.c:378 -#, c-format -msgid "traversed %lu commits\n" -msgstr "" - -#: builtin/describe.c:381 -#, c-format -msgid "" -"more than %i tags found; listed %i most recent\n" -"gave up search at %s\n" -msgstr "" - -#: 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 commit-ishes" -msgstr "" - -#: builtin/diff.c:77 -#, c-format -msgid "'%s': not a regular file or symlink" -msgstr "" - -#: builtin/diff.c:220 -#, c-format -msgid "invalid option: %s" -msgstr "" - -#: builtin/diff.c:293 -msgid "Not a git repository" -msgstr "" - -#: builtin/diff.c:343 -#, c-format -msgid "invalid object '%s' given." -msgstr "" - -#: builtin/diff.c:348 -#, c-format -msgid "more than %d trees given: '%s'" -msgstr "" - -#: builtin/diff.c:358 -#, c-format -msgid "more than two blobs given: '%s'" -msgstr "" - -#: builtin/diff.c:366 -#, c-format -msgid "unhandled object '%s' given." -msgstr "" - -#: builtin/fetch.c:200 -msgid "Couldn't find remote ref HEAD" -msgstr "" - -#: builtin/fetch.c:252 -#, c-format -msgid "object %s not found" -msgstr "" - -#: builtin/fetch.c:258 -msgid "[up to date]" -msgstr "" - -#: builtin/fetch.c:272 -#, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "" - -#: builtin/fetch.c:273 builtin/fetch.c:351 -msgid "[rejected]" -msgstr "" - -#: builtin/fetch.c:284 -msgid "[tag update]" -msgstr "" - -#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 -msgid " (unable to update local ref)" -msgstr "" - -#: builtin/fetch.c:298 -msgid "[new tag]" -msgstr "" - -#: builtin/fetch.c:302 -msgid "[new branch]" -msgstr "" - -#: builtin/fetch.c:347 -msgid "unable to update local ref" -msgstr "" - -#: builtin/fetch.c:347 -msgid "forced update" -msgstr "" - -#: builtin/fetch.c:353 -msgid "(non-fast-forward)" -msgstr "" - -#: builtin/fetch.c:384 builtin/fetch.c:676 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "" - -#: builtin/fetch.c:393 -#, c-format -msgid "%s did not send all necessary objects\n" -msgstr "" - -#: builtin/fetch.c:479 -#, c-format -msgid "From %.*s\n" -msgstr "" - -#: builtin/fetch.c:490 -#, c-format -msgid "" -"some local refs could not be updated; try running\n" -" 'git remote prune %s' to remove any old, conflicting branches" -msgstr "" - -#: builtin/fetch.c:540 -#, c-format -msgid " (%s will become dangling)\n" -msgstr "" - -#: builtin/fetch.c:541 -#, c-format -msgid " (%s has become dangling)\n" -msgstr "" - -#: builtin/fetch.c:548 -msgid "[deleted]" -msgstr "" - -#: builtin/fetch.c:549 -msgid "(none)" -msgstr "" - -#: builtin/fetch.c:666 -#, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "" - -#: builtin/fetch.c:700 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "" - -#: builtin/fetch.c:777 -#, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "" - -#: builtin/fetch.c:780 -#, c-format -msgid "Option \"%s\" is ignored for %s\n" -msgstr "" - -#: builtin/fetch.c:879 -#, c-format -msgid "Fetching %s\n" -msgstr "" - -#: builtin/fetch.c:881 -#, c-format -msgid "Could not fetch %s" -msgstr "" - -#: builtin/fetch.c:898 -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:918 -msgid "You need to specify a tag name." -msgstr "" - -#: builtin/fetch.c:970 -msgid "fetch --all does not take a repository argument" -msgstr "" - -#: builtin/fetch.c:972 -msgid "fetch --all does not make sense with refspecs" -msgstr "" - -#: builtin/fetch.c:983 -#, c-format -msgid "No such remote or remote group: %s" -msgstr "" - -#: builtin/fetch.c:991 -msgid "Fetching a group and specifying refspecs does not make sense" -msgstr "" - -#: builtin/gc.c:63 -#, c-format -msgid "Invalid %s: '%s'" -msgstr "" - -#: builtin/gc.c:78 -msgid "Too many options specified" -msgstr "" - -#: builtin/gc.c:103 -#, c-format -msgid "insanely long object directory %.*s" -msgstr "" - -#: builtin/gc.c:223 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "" - -#: builtin/gc.c:226 -#, 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:256 -msgid "" -"There are too many unreachable loose objects; run 'git prune' to remove them." -msgstr "" - -#: builtin/grep.c:216 -#, c-format -msgid "grep: failed to create thread: %s" -msgstr "" - -#: builtin/grep.c:402 -#, c-format -msgid "Failed to chdir: %s" -msgstr "" - -#: builtin/grep.c:478 builtin/grep.c:512 -#, c-format -msgid "unable to read tree (%s)" -msgstr "" - -#: builtin/grep.c:526 -#, c-format -msgid "unable to grep from object of type %s" -msgstr "" - -#: builtin/grep.c:584 -#, c-format -msgid "switch `%c' expects a numerical value" -msgstr "" - -#: builtin/grep.c:601 -#, c-format -msgid "cannot open '%s'" -msgstr "" - -#: builtin/grep.c:889 -msgid "no pattern given." -msgstr "" - -#: builtin/grep.c:903 -#, c-format -msgid "bad object %s" -msgstr "" - -#: builtin/grep.c:944 -msgid "--open-files-in-pager only works on the worktree" -msgstr "" - -#: builtin/grep.c:967 -msgid "--cached or --untracked cannot be used with --no-index." -msgstr "" - -#: builtin/grep.c:972 -msgid "--no-index or --untracked cannot be used with revs." -msgstr "" - -#: builtin/grep.c:975 -msgid "--[no-]exclude-standard cannot be used for tracked contents." -msgstr "" - -#: builtin/grep.c:983 -msgid "both --cached and trees are 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:322 builtin/init-db.c:325 -#, c-format -msgid "%s already exists" -msgstr "" - -#: builtin/init-db.c:354 -#, c-format -msgid "unable to handle file type %d" -msgstr "" - -#: builtin/init-db.c:357 -#, c-format -msgid "unable to move %s to %s" -msgstr "" - -#: builtin/init-db.c:362 -#, 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:419 -#, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "" - -#: builtin/init-db.c:420 -msgid "Reinitialized existing" -msgstr "" - -#: builtin/init-db.c:420 -msgid "Initialized empty" -msgstr "" - -#: builtin/init-db.c:421 -msgid " shared" -msgstr "" - -#: builtin/init-db.c:440 -msgid "cannot tell cwd" -msgstr "" - -#: builtin/init-db.c:521 builtin/init-db.c:528 -#, c-format -msgid "cannot mkdir %s" -msgstr "" - -#: builtin/init-db.c:532 -#, c-format -msgid "cannot chdir to %s" -msgstr "" - -#: builtin/init-db.c:554 -#, c-format -msgid "" -"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" -"dir=<directory>)" -msgstr "" - -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "" - -#: builtin/init-db.c:585 -#, c-format -msgid "Cannot access work tree '%s'" -msgstr "" - -#: builtin/log.c:185 -#, c-format -msgid "Final output: %d %s\n" -msgstr "" - -#: builtin/log.c:393 builtin/log.c:479 -#, c-format -msgid "Could not read object %s" -msgstr "" - -#: builtin/log.c:503 -#, c-format -msgid "Unknown type: %d" -msgstr "" - -#: builtin/log.c:592 -msgid "format.headers without value" -msgstr "" - -#: builtin/log.c:665 -msgid "name of output directory is too long" -msgstr "" - -#: builtin/log.c:676 -#, c-format -msgid "Cannot open patch file %s" -msgstr "" - -#: builtin/log.c:690 -msgid "Need exactly one range." -msgstr "" - -#: builtin/log.c:698 -msgid "Not a range." -msgstr "" - -#: builtin/log.c:735 -msgid "Could not extract email from committer identity." -msgstr "" - -#: builtin/log.c:781 -msgid "Cover letter needs email format" -msgstr "" - -#: builtin/log.c:875 -#, c-format -msgid "insane in-reply-to: %s" -msgstr "" - -#: builtin/log.c:948 -msgid "Two output directories?" -msgstr "" - -#: builtin/log.c:1169 -#, c-format -msgid "bogus committer info %s" -msgstr "" - -#: builtin/log.c:1214 -msgid "-n and -k are mutually exclusive." -msgstr "" - -#: builtin/log.c:1216 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "" - -#: builtin/log.c:1221 builtin/shortlog.c:284 -#, c-format -msgid "unrecognized argument: %s" -msgstr "" - -#: builtin/log.c:1224 -msgid "--name-only does not make sense" -msgstr "" - -#: builtin/log.c:1226 -msgid "--name-status does not make sense" -msgstr "" - -#: builtin/log.c:1228 -msgid "--check does not make sense" -msgstr "" - -#: builtin/log.c:1251 -msgid "standard output, or directory, which one?" -msgstr "" - -#: builtin/log.c:1253 -#, c-format -msgid "Could not create directory '%s'" -msgstr "" - -#: builtin/log.c:1406 -msgid "Failed to create output files" -msgstr "" - -#: builtin/log.c:1510 -#, c-format -msgid "" -"Could not find a tracked remote branch, please specify <upstream> manually.\n" -msgstr "" - -#: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540 -#, c-format -msgid "Unknown commit %s" -msgstr "" - -#: builtin/merge.c:91 -msgid "switch `m' requires a value" -msgstr "" - -#: builtin/merge.c:128 -#, c-format -msgid "Could not find merge strategy '%s'.\n" -msgstr "" - -#: builtin/merge.c:129 -#, c-format -msgid "Available strategies are:" -msgstr "" - -#: builtin/merge.c:134 -#, c-format -msgid "Available custom strategies are:" -msgstr "" - -#: builtin/merge.c:241 -msgid "could not run stash." -msgstr "" - -#: builtin/merge.c:246 -msgid "stash failed" -msgstr "" - -#: builtin/merge.c:251 -#, c-format -msgid "not a valid object: %s" -msgstr "" - -#: builtin/merge.c:270 builtin/merge.c:287 -msgid "read-tree failed" -msgstr "" - -#: builtin/merge.c:317 -msgid " (nothing to squash)" -msgstr "" - -#: builtin/merge.c:330 -#, c-format -msgid "Squash commit -- not updating HEAD\n" -msgstr "" - -#: builtin/merge.c:362 -msgid "Writing SQUASH_MSG" -msgstr "" - -#: builtin/merge.c:364 -msgid "Finishing SQUASH_MSG" -msgstr "" - -#: builtin/merge.c:386 -#, c-format -msgid "No merge message -- not updating HEAD\n" -msgstr "" - -#: builtin/merge.c:435 -#, c-format -msgid "'%s' does not point to a commit" -msgstr "" - -#: builtin/merge.c:534 -#, c-format -msgid "Bad branch.%s.mergeoptions string: %s" -msgstr "" - -#: builtin/merge.c:627 -msgid "git write-tree failed to write a tree" -msgstr "" - -#: builtin/merge.c:677 -msgid "failed to read the cache" -msgstr "" - -#: builtin/merge.c:694 -msgid "Unable to write index." -msgstr "" - -#: builtin/merge.c:707 -msgid "Not handling anything other than two heads merge." -msgstr "" - -#: builtin/merge.c:721 -#, c-format -msgid "Unknown option for merge-recursive: -X%s" -msgstr "" - -#: builtin/merge.c:735 -#, c-format -msgid "unable to write %s" -msgstr "" - -#: builtin/merge.c:874 -#, c-format -msgid "Could not read from '%s'" -msgstr "" - -#: builtin/merge.c:883 -#, c-format -msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "" - -#: builtin/merge.c:889 -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:913 -msgid "Empty commit message." -msgstr "" - -#: builtin/merge.c:925 -#, c-format -msgid "Wonderful.\n" -msgstr "" - -#: builtin/merge.c:998 -#, c-format -msgid "Automatic merge failed; fix conflicts and then commit the result.\n" -msgstr "" - -#: builtin/merge.c:1014 -#, c-format -msgid "'%s' is not a commit" -msgstr "" - -#: builtin/merge.c:1055 -msgid "No current branch." -msgstr "" - -#: builtin/merge.c:1057 -msgid "No remote for the current branch." -msgstr "" - -#: builtin/merge.c:1059 -msgid "No default upstream defined for the current branch." -msgstr "" - -#: builtin/merge.c:1064 -#, c-format -msgid "No remote tracking branch for %s from %s" -msgstr "" - -#: builtin/merge.c:1186 -msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "" - -#: builtin/merge.c:1202 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:1205 git-pull.sh:34 -msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "" - -#: builtin/merge.c:1209 -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:1212 -msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "" - -#: builtin/merge.c:1221 -msgid "You cannot combine --squash with --no-ff." -msgstr "" - -#: builtin/merge.c:1226 -msgid "You cannot combine --no-ff with --ff-only." -msgstr "" - -#: builtin/merge.c:1233 -msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "" - -#: builtin/merge.c:1264 -msgid "Can merge only exactly one commit into empty head" -msgstr "" - -#: builtin/merge.c:1267 -msgid "Squash commit into empty head not supported yet" -msgstr "" - -#: builtin/merge.c:1269 -msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "" - -#: builtin/merge.c:1273 builtin/merge.c:1317 -#, c-format -msgid "%s - not something we can merge" -msgstr "" - -#: builtin/merge.c:1383 -#, c-format -msgid "Updating %s..%s\n" -msgstr "" - -#: builtin/merge.c:1421 -#, c-format -msgid "Trying really trivial in-index merge...\n" -msgstr "" - -#: builtin/merge.c:1428 -#, c-format -msgid "Nope.\n" -msgstr "" - -#: builtin/merge.c:1460 -msgid "Not possible to fast-forward, aborting." -msgstr "" - -#: builtin/merge.c:1483 builtin/merge.c:1560 -#, c-format -msgid "Rewinding the tree to pristine...\n" -msgstr "" - -#: builtin/merge.c:1487 -#, c-format -msgid "Trying merge strategy %s...\n" -msgstr "" - -#: builtin/merge.c:1551 -#, c-format -msgid "No merge strategy handled the merge.\n" -msgstr "" - -#: builtin/merge.c:1553 -#, c-format -msgid "Merge with strategy %s failed.\n" -msgstr "" - -#: builtin/merge.c:1562 -#, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "" - -#: builtin/merge.c:1573 -#, c-format -msgid "Automatic merge went well; stopped before committing as requested\n" -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 -#, c-format -msgid "renaming '%s' failed" -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:343 -#, 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:521 -#, c-format -msgid "cannot read '%s'" -msgstr "" - -#: builtin/notes.c:253 builtin/tag.c:524 -#, 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:537 -#, 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" -msgstr "" - -#: builtin/notes.c:513 builtin/notes.c:772 -#, c-format -msgid "No note found for object %s." -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: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:971 -#, c-format -msgid "Object %s has no note\n" -msgstr "" - -#: builtin/notes.c:1103 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "" - -#: builtin/pack-objects.c:2310 -#, c-format -msgid "unsupported index version %s" -msgstr "" - -#: builtin/pack-objects.c:2314 -#, c-format -msgid "bad index version '%s'" -msgstr "" - -#: builtin/pack-objects.c:2322 -#, c-format -msgid "option %s does not accept negative form" -msgstr "" - -#: builtin/pack-objects.c:2326 -#, c-format -msgid "unable to parse value '%s' for option %s" -msgstr "" - -#: builtin/push.c:44 -msgid "tag shorthand without <tag>" -msgstr "" - -#: builtin/push.c:63 -msgid "--delete only accepts plain target ref names" -msgstr "" - -#: builtin/push.c:73 -#, c-format -msgid "" -"You are not currently on a branch.\n" -"To push the history leading to the current (detached HEAD)\n" -"state now, use\n" -"\n" -" git push %s HEAD:<name-of-remote-branch>\n" -msgstr "" - -#: builtin/push.c:80 -#, c-format -msgid "" -"The current branch %s has no upstream branch.\n" -"To push the current branch and set the remote as upstream, use\n" -"\n" -" git push --set-upstream %s %s\n" -msgstr "" - -#: builtin/push.c:88 -#, c-format -msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "" - -#: builtin/push.c:111 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "" - -#: builtin/push.c:131 -#, c-format -msgid "Pushing to %s\n" -msgstr "" - -#: builtin/push.c:135 -#, c-format -msgid "failed to push some refs to '%s'" -msgstr "" - -#: builtin/push.c:143 -#, c-format -msgid "" -"To prevent you from losing history, non-fast-forward updates were rejected\n" -"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" -"'Note about fast-forwards' section of 'git push --help' for details.\n" -msgstr "" - -#: builtin/push.c:160 -#, c-format -msgid "bad repository '%s'" -msgstr "" - -#: builtin/push.c:161 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" - -#: builtin/push.c:176 -msgid "--all and --tags are incompatible" -msgstr "" - -#: builtin/push.c:177 -msgid "--all can't be combined with refspecs" -msgstr "" - -#: builtin/push.c:182 -msgid "--mirror and --tags are incompatible" -msgstr "" - -#: builtin/push.c:183 -msgid "--mirror can't be combined with refspecs" -msgstr "" - -#: builtin/push.c:188 -msgid "--all and --mirror are incompatible" -msgstr "" - -#: builtin/push.c:274 -msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "" - -#: builtin/push.c:276 -msgid "--delete doesn't make sense without any refs" -msgstr "" - -#: builtin/reset.c:33 -msgid "mixed" -msgstr "" - -#: builtin/reset.c:33 -msgid "soft" -msgstr "" - -#: builtin/reset.c:33 -msgid "hard" -msgstr "" - -#: builtin/reset.c:33 -msgid "keep" -msgstr "" - -#: builtin/reset.c:77 -msgid "You do not have a valid HEAD." -msgstr "" - -#: builtin/reset.c:79 -msgid "Failed to find tree of HEAD." -msgstr "" - -#: builtin/reset.c:85 -#, c-format -msgid "Failed to find tree of %s." -msgstr "" - -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "" - -#: builtin/reset.c:106 -#, c-format -msgid "HEAD is now at %s" -msgstr "" - -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "" - -#: builtin/reset.c:223 -#, c-format -msgid "Cannot do a %s reset in the middle of a merge." -msgstr "" - -#: builtin/reset.c:297 -#, c-format -msgid "Could not parse object '%s'." -msgstr "" - -#: builtin/reset.c:302 -msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "" - -#: builtin/reset.c:311 -msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "" - -#: builtin/reset.c:313 -#, c-format -msgid "Cannot do %s reset with paths." -msgstr "" - -#: builtin/reset.c:325 -#, c-format -msgid "%s reset is not allowed in a bare repository" -msgstr "" - -#: builtin/reset.c:341 -#, c-format -msgid "Could not reset index file to revision '%s'." -msgstr "" - -#: builtin/revert.c:70 builtin/revert.c:91 -#, c-format -msgid "%s: %s cannot be used with %s" -msgstr "" - -#: builtin/revert.c:126 -msgid "program error" -msgstr "" - -#: builtin/revert.c:209 -msgid "revert failed" -msgstr "" - -#: builtin/revert.c:224 -msgid "cherry-pick failed" -msgstr "" - -#: builtin/rm.c:109 -#, c-format -msgid "" -"'%s' has staged content different from both the file and the HEAD\n" -"(use -f to force removal)" -msgstr "" - -#: builtin/rm.c:115 -#, c-format -msgid "" -"'%s' has changes staged in the index\n" -"(use --cached to keep the file, or -f to force removal)" -msgstr "" - -#: builtin/rm.c:119 -#, c-format -msgid "" -"'%s' has local modifications\n" -"(use --cached to keep the file, or -f to force removal)" -msgstr "" - -#: builtin/rm.c:194 -#, c-format -msgid "not removing '%s' recursively without -r" -msgstr "" - -#: builtin/rm.c:230 -#, c-format -msgid "git rm: unable to remove %s" -msgstr "" - -#: builtin/shortlog.c:157 -#, c-format -msgid "Missing author: %s" -msgstr "" - -#: builtin/tag.c:58 -#, c-format -msgid "malformed object at '%s'" -msgstr "" - -#: builtin/tag.c:205 -#, c-format -msgid "tag name too long: %.*s..." -msgstr "" - -#: builtin/tag.c:210 -#, c-format -msgid "tag '%s' not found." -msgstr "" - -#: builtin/tag.c:225 -#, c-format -msgid "Deleted tag '%s' (was %s)\n" -msgstr "" - -#: builtin/tag.c:237 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "" - -#: builtin/tag.c:247 -msgid "" -"\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" -msgstr "" - -#: builtin/tag.c:254 -msgid "" -"\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " -"want to.\n" -"#\n" -msgstr "" - -#: builtin/tag.c:294 -msgid "unable to sign the tag" -msgstr "" - -#: builtin/tag.c:296 -msgid "unable to write tag file" -msgstr "" - -#: builtin/tag.c:321 -msgid "bad object type." -msgstr "" - -#: builtin/tag.c:334 -msgid "tag header too big." -msgstr "" - -#: builtin/tag.c:366 -msgid "no tag message?" -msgstr "" - -#: builtin/tag.c:372 -#, c-format -msgid "The tag message has been left in %s\n" -msgstr "" - -#: builtin/tag.c:421 -msgid "switch 'points-at' requires an object" -msgstr "" - -#: builtin/tag.c:423 -#, c-format -msgid "malformed object name '%s'" -msgstr "" - -#: builtin/tag.c:502 -msgid "-n option is only allowed with -l." -msgstr "" - -#: builtin/tag.c:504 -msgid "--contains option is only allowed with -l." -msgstr "" - -#: builtin/tag.c:506 -msgid "--points-at option is only allowed with -l." -msgstr "" - -#: builtin/tag.c:514 -msgid "only one -F or -m option is allowed." -msgstr "" - -#: builtin/tag.c:534 -msgid "too many params" -msgstr "" - -#: builtin/tag.c:540 -#, c-format -msgid "'%s' is not a valid tag name." -msgstr "" - -#: builtin/tag.c:545 -#, c-format -msgid "tag '%s' already exists" -msgstr "" - -#: builtin/tag.c:563 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "" - -#: builtin/tag.c:565 -#, c-format -msgid "%s: cannot update the ref" -msgstr "" - -#: builtin/tag.c:567 -#, c-format -msgid "Updated tag '%s' (was %s)\n" -msgstr "" - -#: git-am.sh:49 -msgid "You need to set your committer info first" -msgstr "" - -#: git-am.sh:135 -msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "" - -#: git-am.sh:144 -msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." -msgstr "" - -#: git-am.sh:153 -msgid "Falling back to patching base and 3-way merge..." -msgstr "" - -#: git-am.sh:265 -msgid "Only one StGIT patch series can be applied at once" -msgstr "" - -#: git-am.sh:352 -#, sh-format -msgid "Patch format $patch_format is not supported." -msgstr "" - -#: git-am.sh:354 -msgid "Patch format detection failed." -msgstr "" - -#: git-am.sh:406 -msgid "-d option is no longer supported. Do not use." -msgstr "" - -#: git-am.sh:469 -#, sh-format -msgid "previous rebase directory $dotest still exists but mbox given." -msgstr "" - -#: git-am.sh:474 -msgid "Please make up your mind. --skip or --abort?" -msgstr "" - -#: git-am.sh:501 -msgid "Resolve operation not in progress, we are not resuming." -msgstr "" - -#: git-am.sh:567 -#, sh-format -msgid "Dirty index: cannot apply patches (dirty: $files)" -msgstr "" - -#: git-am.sh:743 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "" - -#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] -#. in your translation. The program will only accept English -#. input at this point. -#: git-am.sh:754 -msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -msgstr "" - -#: git-am.sh:790 -#, sh-format -msgid "Applying: $FIRSTLINE" -msgstr "" - -#: git-am.sh:835 -msgid "No changes -- Patch already applied." -msgstr "" - -#: git-am.sh:861 -msgid "applying to an empty history" -msgstr "" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:54 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "" - -#: git-bisect.sh:95 -#, sh-format -msgid "unrecognised option: '$arg'" -msgstr "" - -#: git-bisect.sh:99 -#, sh-format -msgid "'$arg' does not appear to be a valid revision" -msgstr "" - -#: git-bisect.sh:117 -msgid "Bad HEAD - I need a HEAD" -msgstr "" - -#: git-bisect.sh:130 -#, sh-format -msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." -msgstr "" - -#: git-bisect.sh:140 -msgid "won't bisect on seeked tree" -msgstr "" - -#: git-bisect.sh:144 -msgid "Bad HEAD - strange symbolic ref" -msgstr "" - -#: git-bisect.sh:189 -#, sh-format -msgid "Bad bisect_write argument: $state" -msgstr "" - -#: git-bisect.sh:218 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "" - -#: git-bisect.sh:232 -msgid "Please call 'bisect_state' with at least one argument." -msgstr "" - -#: git-bisect.sh:244 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "" - -#: git-bisect.sh:250 -msgid "'git bisect bad' can take only one argument." -msgstr "" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:279 -msgid "Are you sure [Y/n]? " -msgstr "" - -#: git-bisect.sh:354 -#, sh-format -msgid "'$invalid' is not a valid commit" -msgstr "" - -#: git-bisect.sh:363 -#, sh-format -msgid "" -"Could not check out original HEAD '$branch'.\n" -"Try 'git bisect reset <commit>'." -msgstr "" - -#: git-bisect.sh:390 -msgid "No logfile given" -msgstr "" - -#: git-bisect.sh:391 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "" - -#: git-bisect.sh:408 -msgid "?? what are you talking about?" -msgstr "" - -#: git-bisect.sh:474 -msgid "We are not bisecting." -msgstr "" - -#: git-pull.sh:21 -msgid "" -"Pull is not possible because you have unmerged files.\n" -"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" -"as appropriate to mark resolution, or use 'git commit -a'." -msgstr "" - -#: git-pull.sh:25 -msgid "Pull is not possible because you have unmerged files." -msgstr "" - -#: git-pull.sh:197 -msgid "updating an unborn branch with changes added to the index" -msgstr "" - -#: git-pull.sh:253 -msgid "Cannot merge multiple branches into empty head" -msgstr "" - -#: git-pull.sh:257 -msgid "Cannot rebase onto multiple branches" -msgstr "" - -#: git-stash.sh:51 -msgid "git stash clear with parameters is unimplemented" -msgstr "" - -#: git-stash.sh:74 -msgid "You do not have the initial commit yet" -msgstr "" - -#: git-stash.sh:89 -msgid "Cannot save the current index state" -msgstr "" - -#: git-stash.sh:123 git-stash.sh:136 -msgid "Cannot save the current worktree state" -msgstr "" - -#: git-stash.sh:140 -msgid "No changes selected" -msgstr "" - -#: git-stash.sh:143 -msgid "Cannot remove temporary index (can't happen)" -msgstr "" - -#: git-stash.sh:156 -msgid "Cannot record working tree state" -msgstr "" - -#: git-stash.sh:223 -msgid "No local changes to save" -msgstr "" - -#: git-stash.sh:227 -msgid "Cannot initialize stash" -msgstr "" - -#: git-stash.sh:235 -msgid "Cannot save the current status" -msgstr "" - -#: git-stash.sh:253 -msgid "Cannot remove worktree changes" -msgstr "" - -#: git-stash.sh:352 -msgid "No stash found." -msgstr "" - -#: git-stash.sh:359 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "" - -#: git-stash.sh:365 -#, sh-format -msgid "$reference is not valid reference" -msgstr "" - -#: git-stash.sh:393 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "" - -#: git-stash.sh:404 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "" - -#: git-stash.sh:412 -msgid "unable to refresh index" -msgstr "" - -#: git-stash.sh:416 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "" - -#: git-stash.sh:424 -msgid "Conflicts in index. Try without --index." -msgstr "" - -#: git-stash.sh:426 -msgid "Could not save index tree" -msgstr "" - -#: git-stash.sh:460 -msgid "Cannot unstage modified files" -msgstr "" - -#: git-stash.sh:491 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "" - -#: git-stash.sh:492 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "" - -#: git-stash.sh:499 -msgid "No branch name specified" -msgstr "" - -#: git-stash.sh:570 -msgid "(To restore them type \"git stash apply\")" -msgstr "" - -#: git-submodule.sh:56 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "" - -#: git-submodule.sh:108 -#, sh-format -msgid "No submodule mapping found in .gitmodules for path '$path'" -msgstr "" - -#: git-submodule.sh:173 -#, sh-format -msgid "Clone of '$url' into submodule path '$path' failed" -msgstr "" - -#: git-submodule.sh:247 -#, sh-format -msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "" - -#: git-submodule.sh:264 -#, sh-format -msgid "'$path' already exists in the index" -msgstr "" - -#: git-submodule.sh:281 -#, sh-format -msgid "'$path' already exists and is not a valid git repo" -msgstr "" - -#: git-submodule.sh:295 -#, sh-format -msgid "Unable to checkout submodule '$path'" -msgstr "" - -#: git-submodule.sh:300 -#, sh-format -msgid "Failed to add submodule '$path'" -msgstr "" - -#: git-submodule.sh:305 -#, sh-format -msgid "Failed to register submodule '$path'" -msgstr "" - -#: git-submodule.sh:347 -#, sh-format -msgid "Entering '$prefix$path'" -msgstr "" - -#: git-submodule.sh:359 -#, sh-format -msgid "Stopping at '$path'; script returned non-zero status." -msgstr "" - -#: git-submodule.sh:401 -#, sh-format -msgid "No url found for submodule path '$path' in .gitmodules" -msgstr "" - -#: git-submodule.sh:410 -#, sh-format -msgid "Failed to register url for submodule path '$path'" -msgstr "" - -#: git-submodule.sh:418 -#, sh-format -msgid "Failed to register update mode for submodule path '$path'" -msgstr "" - -#: git-submodule.sh:420 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$path'" -msgstr "" - -#: git-submodule.sh:519 -#, sh-format -msgid "" -"Submodule path '$path' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" - -#: git-submodule.sh:532 -#, sh-format -msgid "Unable to find current revision in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:551 -#, sh-format -msgid "Unable to fetch in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:565 -#, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:566 -#, sh-format -msgid "Submodule path '$path': rebased into '$sha1'" -msgstr "" - -#: git-submodule.sh:571 -#, sh-format -msgid "Unable to merge '$sha1' in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:572 -#, sh-format -msgid "Submodule path '$path': merged in '$sha1'" -msgstr "" - -#: git-submodule.sh:577 -#, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$path'" -msgstr "" - -#: git-submodule.sh:578 -#, sh-format -msgid "Submodule path '$path': checked out '$sha1'" -msgstr "" - -#: git-submodule.sh:600 git-submodule.sh:923 -#, sh-format -msgid "Failed to recurse into submodule path '$path'" -msgstr "" - -#: git-submodule.sh:708 -msgid "--" -msgstr "" - -#: git-submodule.sh:766 -#, sh-format -msgid " Warn: $name doesn't contain commit $sha1_src" -msgstr "" - -#: git-submodule.sh:769 -#, sh-format -msgid " Warn: $name doesn't contain commit $sha1_dst" -msgstr "" - -#: git-submodule.sh:772 -#, sh-format -msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" - -#: git-submodule.sh:797 -msgid "blob" -msgstr "" - -#: git-submodule.sh:798 -msgid "submodule" -msgstr "" - -#: git-submodule.sh:969 -#, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "" @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2013 Peter krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2014 Peter krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014. # msgid "" msgstr "" "Project-Id-Version: git 1.8.4\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-11-02 08:06+0800\n" -"PO-Revision-Date: 2013-11-09 19:02+0100\n" +"POT-Creation-Date: 2014-02-01 08:06+0800\n" +"PO-Revision-Date: 2014-02-02 17:21+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -57,7 +57,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -78,8 +78,8 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 @@ -262,64 +262,64 @@ msgstr "Misslyckades låsa referens för uppdatering" msgid "Failed to write ref" msgstr "Misslyckades skriva referens" -#: bundle.c:36 +#: bundle.c:37 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ser inte ut som en v2-bundle-fil" -#: bundle.c:63 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:89 builtin/commit.c:706 +#: bundle.c:90 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:140 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: bundle.c:186 +#: bundle.c:187 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) denna referens:" msgstr[1] "Paketet (bundlen) dessa %d referenser:" -#: bundle.c:193 +#: bundle.c:194 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:195 +#: bundle.c:196 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:294 +#: bundle.c:296 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:335 +#: bundle.c:337 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:380 +#: bundle.c:382 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." @@ -354,16 +354,16 @@ msgstr "%s %s är inte en incheckning!" msgid "memory exhausted" msgstr "minnet slut" -#: connected.c:60 +#: connected.c:70 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:80 +#: connected.c:90 #, c-format msgid "failed write to rev-list: %s" msgstr "kunde inte skriva till rev-list: %s" -#: connected.c:88 +#: connected.c:98 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "kunde inte stänga rev-list:s standard in: %s" @@ -435,22 +435,27 @@ msgid_plural "%lu years ago" msgstr[0] "%lu år sedan" msgstr[1] "%lu år sedan" -#: diff.c:112 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "kunde inte läsa orderfilen \"%s\"" + +#: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:117 +#: diff.c:118 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:210 +#: diff.c:213 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:260 +#: diff.c:263 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -459,7 +464,7 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3490 +#: diff.c:3509 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -468,7 +473,7 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3504 +#: diff.c:3523 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" @@ -579,7 +584,7 @@ msgid "failed to read the cache" msgstr "misslyckads läsa cachen" #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 -#: builtin/clone.c:655 +#: builtin/clone.c:661 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -628,7 +633,7 @@ msgstr "kan inte läsa objektet %s: \"%s\"" msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:774 builtin/clone.c:311 +#: merge-recursive.c:774 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" @@ -678,7 +683,7 @@ msgstr "" msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1082 +#: merge-recursive.c:1082 wt-status.c:283 msgid "renamed" msgstr "namnbytt" @@ -740,7 +745,7 @@ msgstr "objektet %s är inte en blob" msgid "modify" msgstr "ändra" -#: merge-recursive.c:1565 +#: merge-recursive.c:1565 wt-status.c:281 msgid "modified" msgstr "ändrad" @@ -762,7 +767,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)" msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1634 git-submodule.sh:1125 +#: merge-recursive.c:1634 git-submodule.sh:1148 msgid "submodule" msgstr "undermodul" @@ -833,7 +838,7 @@ msgstr "sammanslagningen returnerade ingen incheckning" msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2010 builtin/merge.c:672 +#: merge-recursive.c:2010 builtin/merge.c:665 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -888,12 +893,12 @@ msgstr " %s" msgid "-NUM" msgstr "-TAL" -#: pathspec.c:118 +#: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:128 +#: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -901,36 +906,36 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:158 +#: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:164 +#: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:168 +#: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:186 +#: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats" -#: pathspec.c:211 +#: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:222 +#: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: \"%s\" är utanför arkivet" -#: pathspec.c:278 +#: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" @@ -940,42 +945,74 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" #. * name. E.g. when add--interactive dies when running #. * "checkout -p" #. -#: pathspec.c:340 +#: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:415 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: remote.c:1833 +#: pathspec.c:442 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" +"Ingenting att exkludera från med :(exkludera)-mönster.\n" +"Glömde du kanske att antingen lägga till \":/\" eller \".\"?" + +#: remote.c:753 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Kan inte hämta både %s och %s till %s" + +#: remote.c:757 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s spårar vanligtvis %s, inte %s" + +#: remote.c:761 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s spårar både %s och %s" + +#. +#. * This last possibility doesn't occur because +#. * FETCH_HEAD_IGNORE entries always appear at +#. * the end of the list. +#. +#: remote.c:769 +msgid "Internal error" +msgstr "Internt fel" + +#: remote.c:1871 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:1837 +#: remote.c:1875 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:1840 +#: remote.c:1878 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:1844 +#: remote.c:1882 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:1850 +#: remote.c:1888 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:1853 +#: remote.c:1891 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -985,11 +1022,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1861 +#: remote.c:1899 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:1864 +#: remote.c:1902 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1004,7 +1041,7 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:1874 +#: remote.c:1912 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" @@ -1017,14 +1054,14 @@ msgstr "misslyckades öppna /dev/null" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 -#: builtin/merge.c:1013 builtin/merge.c:1023 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 +#: builtin/merge.c:1006 builtin/merge.c:1016 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 -#: builtin/merge.c:1015 builtin/merge.c:1028 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 +#: builtin/merge.c:1008 builtin/merge.c:1021 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" @@ -1264,7 +1301,7 @@ msgstr "Kan inte ångra som första incheckning" msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#: sha1_name.c:440 +#: sha1_name.c:439 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1286,21 +1323,21 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1112 +#: sha1_name.c:1070 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: sha1_name.c:1115 +#: sha1_name.c:1073 #, c-format msgid "No such branch: '%s'" msgstr "Okänd gren: \"%s\"" -#: sha1_name.c:1117 +#: sha1_name.c:1075 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Ingen standarduppström angiven för grenen \"%s\"" -#: sha1_name.c:1121 +#: sha1_name.c:1079 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" @@ -1410,226 +1447,218 @@ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" msgid "no such user" msgstr "okänd användare" -#: wt-status.c:146 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:173 wt-status.c:200 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)" -#: wt-status.c:175 wt-status.c:202 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" -#: wt-status.c:179 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:181 wt-status.c:185 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" -#: wt-status.c:183 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:194 +#: wt-status.c:198 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:212 +#: wt-status.c:216 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:216 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:218 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:219 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:221 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:233 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:250 +#: wt-status.c:254 msgid "bug" msgstr "programfel" -#: wt-status.c:255 +#: wt-status.c:259 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:256 +#: wt-status.c:260 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:257 +#: wt-status.c:261 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:259 +#: wt-status.c:263 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:260 +#: wt-status.c:264 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:261 +#: wt-status.c:265 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:291 -msgid "new commits, " -msgstr "nya incheckningar, " - -#: wt-status.c:293 -msgid "modified content, " -msgstr "ändrat innehåll, " +#: wt-status.c:275 +msgid "new file" +msgstr "ny fil" -#: wt-status.c:295 -msgid "untracked content, " -msgstr "ospårat innehåll, " +#: wt-status.c:277 +msgid "copied" +msgstr "kopierad" -#: wt-status.c:312 -#, c-format -msgid "new file: %s" -msgstr "ny fil: %s" - -#: wt-status.c:315 -#, c-format -msgid "copied: %s -> %s" -msgstr "kopierad: %s -> %s" +#: wt-status.c:279 +msgid "deleted" +msgstr "borttagen" -#: wt-status.c:318 -#, c-format -msgid "deleted: %s" -msgstr "borttagen: %s" +#: wt-status.c:285 +msgid "typechange" +msgstr "typbyte" -#: wt-status.c:321 -#, c-format -msgid "modified: %s" -msgstr "ändrad: %s" +#: wt-status.c:287 +msgid "unknown" +msgstr "okänd" -#: wt-status.c:324 -#, c-format -msgid "renamed: %s -> %s" -msgstr "namnbyte: %s -> %s" +#: wt-status.c:289 +msgid "unmerged" +msgstr "osammanslagen" -#: wt-status.c:327 -#, c-format -msgid "typechange: %s" -msgstr "typbyte: %s" +#: wt-status.c:336 +msgid "new commits, " +msgstr "nya incheckningar, " -#: wt-status.c:330 -#, c-format -msgid "unknown: %s" -msgstr "okänd: %s" +#: wt-status.c:338 +msgid "modified content, " +msgstr "ändrat innehåll, " -#: wt-status.c:333 -#, c-format -msgid "unmerged: %s" -msgstr "osammansl.: %s" +#: wt-status.c:340 +msgid "untracked content, " +msgstr "ospårat innehåll, " -#: wt-status.c:336 +#: wt-status.c:357 #, c-format msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:703 +#: wt-status.c:732 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:705 +#: wt-status.c:734 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:848 +#: wt-status.c:836 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" +"Rör inte raden ovan.\n" +"Allt nedan kommer tas bort." + +#: wt-status.c:899 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:851 +#: wt-status.c:902 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:854 +#: wt-status.c:905 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:857 +#: wt-status.c:908 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:867 +#: wt-status.c:918 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:870 +#: wt-status.c:921 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:874 +#: wt-status.c:925 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:876 +#: wt-status.c:927 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:878 +#: wt-status.c:929 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:938 wt-status.c:955 +#: wt-status.c:989 wt-status.c:1006 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:943 wt-status.c:960 +#: wt-status.c:994 wt-status.c:1011 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:946 +#: wt-status.c:997 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:948 +#: wt-status.c:999 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:950 +#: wt-status.c:1001 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:963 +#: wt-status.c:1014 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:967 +#: wt-status.c:1018 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1637,118 +1666,118 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:972 +#: wt-status.c:1023 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:975 +#: wt-status.c:1026 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:979 +#: wt-status.c:1030 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:984 +#: wt-status.c:1035 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:987 +#: wt-status.c:1038 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:989 +#: wt-status.c:1040 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:999 +#: wt-status.c:1050 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1004 +#: wt-status.c:1055 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1007 +#: wt-status.c:1058 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1009 +#: wt-status.c:1060 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1018 +#: wt-status.c:1069 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1023 +#: wt-status.c:1074 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1026 +#: wt-status.c:1077 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1028 +#: wt-status.c:1079 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1039 +#: wt-status.c:1090 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1043 +#: wt-status.c:1094 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1046 +#: wt-status.c:1097 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1221 +#: wt-status.c:1272 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1228 +#: wt-status.c:1279 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1235 +#: wt-status.c:1286 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1237 +#: wt-status.c:1288 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1240 +#: wt-status.c:1291 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1257 +#: wt-status.c:1308 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1271 +#: wt-status.c:1322 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1273 +#: wt-status.c:1324 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1277 +#: wt-status.c:1328 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1760,32 +1789,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1283 +#: wt-status.c:1334 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1285 +#: wt-status.c:1336 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1291 +#: wt-status.c:1342 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1296 +#: wt-status.c:1347 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1299 +#: wt-status.c:1350 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1302 +#: wt-status.c:1353 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1794,56 +1823,56 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1305 +#: wt-status.c:1356 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1308 +#: wt-status.c:1359 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1311 wt-status.c:1316 +#: wt-status.c:1362 wt-status.c:1367 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1314 +#: wt-status.c:1365 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1318 +#: wt-status.c:1369 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1427 +#: wt-status.c:1478 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1433 +#: wt-status.c:1484 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1463 +#: wt-status.c:1514 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1465 +#: wt-status.c:1516 msgid "behind " msgstr "efter " -#: wt-status.c:1468 wt-status.c:1471 +#: wt-status.c:1519 wt-status.c:1522 msgid "ahead " msgstr "före " -#: wt-status.c:1473 +#: wt-status.c:1524 msgid ", behind " msgstr ", efter " -#: compat/precompose_utf8.c:55 builtin/clone.c:350 +#: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -1973,15 +2002,15 @@ msgstr "Kunde inte tillämpa \"%s\"" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 #: builtin/rm.c:269 msgid "dry run" msgstr "testkörning" #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "var pratsam" @@ -2062,11 +2091,11 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -2400,7 +2429,7 @@ msgid "unable to read index file" msgstr "kan inte läsa indexfilen" #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 -#: builtin/fetch.c:77 +#: builtin/fetch.c:78 msgid "path" msgstr "sökväg" @@ -2598,95 +2627,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)" -#: builtin/blame.c:2248 +#: builtin/blame.c:2249 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2249 +#: builtin/blame.c:2250 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2250 +#: builtin/blame.c:2251 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2251 +#: builtin/blame.c:2252 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2252 +#: builtin/blame.c:2253 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2253 +#: builtin/blame.c:2254 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2254 +#: builtin/blame.c:2255 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2255 +#: builtin/blame.c:2256 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2256 +#: builtin/blame.c:2257 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2257 +#: builtin/blame.c:2258 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:2258 +#: builtin/blame.c:2259 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2259 +#: builtin/blame.c:2260 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2260 +#: builtin/blame.c:2261 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2261 +#: builtin/blame.c:2262 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:2262 +#: builtin/blame.c:2263 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2263 +#: builtin/blame.c:2264 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2264 +#: builtin/blame.c:2265 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:2265 +#: builtin/blame.c:2266 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2266 builtin/blame.c:2267 +#: builtin/blame.c:2267 builtin/blame.c:2268 msgid "score" msgstr "poäng" -#: builtin/blame.c:2266 +#: builtin/blame.c:2267 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2267 +#: builtin/blame.c:2268 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" @@ -2790,290 +2819,290 @@ msgstr "Tog bort grenen %s (var %s).\n" msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:453 +#: builtin/branch.c:454 #, c-format msgid "[%s: gone]" msgstr "[%s: försvunnen]" -#: builtin/branch.c:456 +#: builtin/branch.c:459 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:461 +#: builtin/branch.c:466 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:465 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:467 +#: builtin/branch.c:472 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:473 +#: builtin/branch.c:478 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:496 +#: builtin/branch.c:502 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:588 +#: builtin/branch.c:594 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:591 +#: builtin/branch.c:597 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: builtin/branch.c:594 +#: builtin/branch.c:600 #, c-format msgid "(detached from %s)" msgstr "(frånkopplad från %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:643 +#: builtin/branch.c:649 #, c-format msgid "object '%s' does not point to a commit" msgstr "objektet \"%s\" pekar på en incheckning" -#: builtin/branch.c:675 +#: builtin/branch.c:681 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:688 +#: builtin/branch.c:694 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:698 +#: builtin/branch.c:704 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:713 +#: builtin/branch.c:719 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:717 +#: builtin/branch.c:723 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:721 +#: builtin/branch.c:727 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:728 +#: builtin/branch.c:734 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:743 +#: builtin/branch.c:749 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:767 +#: builtin/branch.c:773 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:797 +#: builtin/branch.c:803 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:799 +#: builtin/branch.c:805 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:800 +#: builtin/branch.c:806 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:801 +#: builtin/branch.c:807 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:803 +#: builtin/branch.c:809 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:808 +#: builtin/branch.c:814 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "incheckning" -#: builtin/branch.c:812 builtin/branch.c:818 +#: builtin/branch.c:818 builtin/branch.c:824 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:824 +#: builtin/branch.c:830 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:825 +#: builtin/branch.c:831 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:827 +#: builtin/branch.c:833 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:828 +#: builtin/branch.c:834 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:829 +#: builtin/branch.c:835 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:830 +#: builtin/branch.c:836 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:831 +#: builtin/branch.c:837 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:832 +#: builtin/branch.c:838 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:834 +#: builtin/branch.c:840 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:835 +#: builtin/branch.c:841 msgid "force creation (when already exists)" msgstr "tvinga skapande (när den redan finns)" -#: builtin/branch.c:838 +#: builtin/branch.c:844 msgid "print only not merged branches" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:844 +#: builtin/branch.c:850 msgid "print only merged branches" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:848 +#: builtin/branch.c:854 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:861 +#: builtin/branch.c:867 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:866 builtin/clone.c:629 +#: builtin/branch.c:872 builtin/clone.c:635 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:890 +#: builtin/branch.c:896 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:896 builtin/branch.c:935 +#: builtin/branch.c:902 builtin/branch.c:941 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:911 +#: builtin/branch.c:917 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:916 +#: builtin/branch.c:922 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:923 +#: builtin/branch.c:929 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:926 +#: builtin/branch.c:932 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:941 +#: builtin/branch.c:947 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:946 +#: builtin/branch.c:952 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:950 +#: builtin/branch.c:956 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:957 +#: builtin/branch.c:963 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:969 +#: builtin/branch.c:975 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:973 +#: builtin/branch.c:979 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:979 +#: builtin/branch.c:985 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:994 +#: builtin/branch.c:999 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:1000 +#: builtin/branch.c:1005 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:1003 +#: builtin/branch.c:1008 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3082,7 +3111,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:1020 +#: builtin/branch.c:1025 #, c-format msgid "" "\n" @@ -3093,12 +3122,12 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:1021 +#: builtin/branch.c:1026 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1022 +#: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3116,43 +3145,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:312 +#: builtin/cat-file.c:328 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>" -#: builtin/cat-file.c:313 +#: builtin/cat-file.c:329 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <objektlista>" -#: builtin/cat-file.c:350 +#: builtin/cat-file.c:366 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:351 +#: builtin/cat-file.c:367 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:352 +#: builtin/cat-file.c:368 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:354 +#: builtin/cat-file.c:370 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:355 +#: builtin/cat-file.c:371 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:357 +#: builtin/cat-file.c:373 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör textconv på objektets innehåll" -#: builtin/cat-file.c:359 +#: builtin/cat-file.c:375 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:362 +#: builtin/cat-file.c:378 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" @@ -3180,7 +3209,7 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -3471,7 +3500,7 @@ msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 -#: builtin/remote.c:169 builtin/remote.c:171 +#: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "gren" @@ -3519,11 +3548,11 @@ msgstr "tvinga utcheckning (kasta bort lokala ändringar)" msgid "perform a 3-way merge with the new branch" msgstr "utför en 3-vägssammanslagning för den nya grenen" -#: builtin/checkout.c:1106 builtin/merge.c:232 +#: builtin/checkout.c:1106 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 msgid "style" msgstr "stil" @@ -3722,7 +3751,7 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "mönster" @@ -3762,8 +3791,8 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 -#: builtin/push.c:474 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 +#: builtin/push.c:521 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -3823,7 +3852,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 msgid "depth" msgstr "djup" @@ -3856,42 +3885,52 @@ msgstr "ställ in konfiguration i det nya arkivet" msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:315 +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "referensarkivet \"%s\" är grunt" + +#: builtin/clone.c:259 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "referensarkivet \"%s\" är ympat" + +#: builtin/clone.c:321 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:317 builtin/diff.c:77 +#: builtin/clone.c:323 builtin/diff.c:83 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:319 +#: builtin/clone.c:325 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:333 +#: builtin/clone.c:339 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:355 +#: builtin/clone.c:361 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:359 +#: builtin/clone.c:365 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:382 builtin/clone.c:559 +#: builtin/clone.c:388 builtin/clone.c:565 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:395 +#: builtin/clone.c:401 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -3901,100 +3940,109 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:474 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:554 +#: builtin/clone.c:560 #, c-format msgid "Checking connectivity... " msgstr "Kontrollerar anslutning..." -#: builtin/clone.c:557 +#: builtin/clone.c:563 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:620 +#: builtin/clone.c:626 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:651 +#: builtin/clone.c:657 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:759 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:763 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:774 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:777 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:790 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:795 +#: builtin/clone.c:802 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:797 +#: builtin/clone.c:805 +msgid "source repository is shallow, ignoring --local" +msgstr "källarkivet är grunt, ignorerar --local" + +#: builtin/clone.c:810 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:807 +#: builtin/clone.c:814 builtin/fetch.c:1119 +#, c-format +msgid "depth %s is not a positive number" +msgstr "djupet %s är inte ett positivt tal" + +#: builtin/clone.c:824 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:817 +#: builtin/clone.c:834 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:830 builtin/clone.c:842 +#: builtin/clone.c:847 builtin/clone.c:859 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:833 +#: builtin/clone.c:850 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:852 +#: builtin/clone.c:869 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:854 +#: builtin/clone.c:871 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:888 +#: builtin/clone.c:906 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:939 builtin/clone.c:947 +#: builtin/clone.c:957 builtin/clone.c:965 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:950 +#: builtin/clone.c:968 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -4347,7 +4395,7 @@ msgstr "visa koncis status" msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 msgid "machine-readable output" msgstr "maskinläsbar utdata" @@ -4428,7 +4476,7 @@ msgstr "författare" msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1458 builtin/gc.c:260 +#: builtin/commit.c:1458 builtin/gc.c:261 msgid "date" msgstr "datum" @@ -4436,7 +4484,7 @@ msgstr "datum" msgid "override date for commit" msgstr "överstyr datum för inchecknignen" -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 #: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "meddelande" @@ -4492,11 +4540,11 @@ msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 msgid "key id" msgstr "nyckel-id" -#: builtin/commit.c:1471 builtin/merge.c:231 +#: builtin/commit.c:1471 builtin/merge.c:224 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -4553,7 +4601,7 @@ msgstr "ok att registrera en ändring med tomt meddelande" msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1567 builtin/merge.c:525 +#: builtin/commit.c:1567 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -4572,29 +4620,29 @@ msgstr "kunde inte läsa MERGE_MODE" msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1614 +#: builtin/commit.c:1611 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1655 +#: builtin/commit.c:1652 msgid "cannot lock HEAD ref" msgstr "kunde inte låsa HEAD-referens" -#: builtin/commit.c:1659 +#: builtin/commit.c:1656 msgid "cannot update HEAD ref" msgstr "kunde inte uppdatera HEAD-referens" -#: builtin/commit.c:1670 +#: builtin/commit.c:1667 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4857,7 +4905,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)" msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:423 builtin/name-rev.c:322 +#: builtin/describe.c:423 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" @@ -4881,31 +4929,31 @@ msgstr "Inga namn hittades, kan inte beskriva något." msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/diff.c:79 +#: builtin/diff.c:85 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:230 +#: builtin/diff.c:236 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:307 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:350 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:359 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:366 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -4966,144 +5014,153 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:74 +#: builtin/fetch.c:75 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:76 +#: builtin/fetch.c:77 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:78 +#: builtin/fetch.c:79 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:79 +#: builtin/fetch.c:80 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:81 +#: builtin/fetch.c:82 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:83 +#: builtin/fetch.c:84 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:85 +#: builtin/fetch.c:86 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:87 +#: builtin/fetch.c:88 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:88 +#: builtin/fetch.c:89 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:89 +#: builtin/fetch.c:90 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:93 +#: builtin/fetch.c:94 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:95 +#: builtin/fetch.c:96 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:98 +#: builtin/fetch.c:99 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:100 +#: builtin/fetch.c:101 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:102 builtin/log.c:1197 +#: builtin/fetch.c:103 builtin/log.c:1197 msgid "dir" msgstr "kat" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:106 +#: builtin/fetch.c:107 msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:236 +#: builtin/fetch.c:109 +msgid "accept refs that update .git/shallow" +msgstr "tar emot referenser som uppdaterar .git/shallow" + +#: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:290 +#: builtin/fetch.c:411 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:295 +#: builtin/fetch.c:416 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:309 +#: builtin/fetch.c:430 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:310 builtin/fetch.c:396 +#: builtin/fetch.c:431 builtin/fetch.c:517 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:321 +#: builtin/fetch.c:442 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:341 +#: builtin/fetch.c:462 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:344 +#: builtin/fetch.c:465 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:347 +#: builtin/fetch.c:468 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:398 +#: builtin/fetch.c:519 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:429 builtin/fetch.c:735 +#: builtin/fetch.c:552 builtin/fetch.c:785 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:438 +#: builtin/fetch.c:561 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:537 +#: builtin/fetch.c:579 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "avvisa %s då grunda rötter inte kan uppdateras" + +#: builtin/fetch.c:667 builtin/fetch.c:750 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:548 +#: builtin/fetch.c:678 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5112,55 +5169,55 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:598 +#: builtin/fetch.c:730 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:599 +#: builtin/fetch.c:731 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:606 +#: builtin/fetch.c:755 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:607 builtin/remote.c:1055 +#: builtin/fetch.c:756 builtin/remote.c:1050 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:725 +#: builtin/fetch.c:775 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:744 +#: builtin/fetch.c:794 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:747 +#: builtin/fetch.c:797 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:801 +#: builtin/fetch.c:853 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:976 +#: builtin/fetch.c:1015 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:978 builtin/remote.c:100 +#: builtin/fetch.c:1017 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1036 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5168,32 +5225,32 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1020 +#: builtin/fetch.c:1059 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1068 +#: builtin/fetch.c:1107 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1109 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1089 +#: builtin/fetch.c:1132 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1091 +#: builtin/fetch.c:1134 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1145 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1110 +#: builtin/fetch.c:1153 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -5203,8 +5260,9 @@ msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 +#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446 +#: parse-options.h:135 parse-options.h:242 msgid "n" msgstr "n" @@ -5228,43 +5286,43 @@ msgstr "inled meddelande med <text>" msgid "file to read from" msgstr "fil att läsa från" -#: builtin/for-each-ref.c:995 +#: builtin/for-each-ref.c:1063 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [flaggor] [<mönster>]" -#: builtin/for-each-ref.c:1010 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:1012 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:1014 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:1016 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for tcl" msgstr "citera platshållare passande för tcl" -#: builtin/for-each-ref.c:1019 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/for-each-ref.c:1021 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "nyckel" -#: builtin/for-each-ref.c:1022 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "fältnamn att sortera på" @@ -5308,41 +5366,41 @@ msgstr "aktivera striktare kontroll" msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:623 builtin/prune.c:134 +#: builtin/fsck.c:623 builtin/prune.c:144 msgid "show progress" msgstr "visa förlopp" -#: builtin/gc.c:23 +#: builtin/gc.c:24 msgid "git gc [options]" msgstr "git gc [flaggor]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: builtin/gc.c:106 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:261 +#: builtin/gc.c:262 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:263 +#: builtin/gc.c:264 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:264 +#: builtin/gc.c:265 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:265 +#: builtin/gc.c:266 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:305 +#: builtin/gc.c:306 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -5352,7 +5410,7 @@ msgstr "" "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n" #. be quiet on --auto -#: builtin/gc.c:315 +#: builtin/gc.c:316 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5360,7 +5418,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:340 +#: builtin/gc.c:341 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5698,57 +5756,57 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:349 +#: builtin/help.c:353 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:366 +#: builtin/help.c:370 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:374 +#: builtin/help.c:378 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:420 +#: builtin/help.c:424 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: builtin/help.c:421 +#: builtin/help.c:425 msgid "A Git glossary" msgstr "En Git-ordlista" -#: builtin/help.c:422 +#: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: builtin/help.c:423 +#: builtin/help.c:427 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: builtin/help.c:424 +#: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: builtin/help.c:425 +#: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Introduktion till Git (för version 1.5.1 och senare)" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: builtin/help.c:438 +#: builtin/help.c:442 msgid "The common Git guides are:\n" msgstr "De vanliga Git-vägledningarna är:\n" -#: builtin/help.c:460 builtin/help.c:476 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:492 +#: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" @@ -6157,21 +6215,21 @@ msgstr "behörigheter" msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet skall delas bland flera användare" -#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 msgid "be quiet" msgstr "var tyst" -#: builtin/init-db.c:522 builtin/init-db.c:529 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:533 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:555 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6180,11 +6238,11 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:579 +#: builtin/init-db.c:580 msgid "Cannot access current working directory" msgstr "Kan inte komma åt aktuell arbetskatalog" -#: builtin/init-db.c:586 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -6606,151 +6664,151 @@ msgstr "Tillgängliga strategier är:" msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:198 +#: builtin/merge.c:191 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:201 +#: builtin/merge.c:194 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:202 +#: builtin/merge.c:195 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:204 +#: builtin/merge.c:197 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:207 +#: builtin/merge.c:200 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:209 +#: builtin/merge.c:202 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:211 +#: builtin/merge.c:204 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:212 +#: builtin/merge.c:205 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:214 +#: builtin/merge.c:207 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:218 +#: builtin/merge.c:211 msgid "Verify that the named commit has a valid GPG signature" msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:220 +#: builtin/merge.c:213 msgid "merge strategy to use" msgstr "sammanslagninsstrategi att använda" -#: builtin/merge.c:221 +#: builtin/merge.c:214 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:222 +#: builtin/merge.c:215 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:224 +#: builtin/merge.c:217 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:228 +#: builtin/merge.c:221 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:257 +#: builtin/merge.c:250 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:262 +#: builtin/merge.c:255 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:267 +#: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:286 builtin/merge.c:303 +#: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:333 +#: builtin/merge.c:326 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:346 +#: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:378 +#: builtin/merge.c:371 msgid "Writing SQUASH_MSG" msgstr "Skriver SQUASH_MSG" -#: builtin/merge.c:380 +#: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" msgstr "Avslutar SQUASH_MSG" -#: builtin/merge.c:403 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:453 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:565 +#: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:650 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/merge.c:685 +#: builtin/merge.c:678 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:699 +#: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:713 +#: builtin/merge.c:706 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:802 +#: builtin/merge.c:795 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:811 +#: builtin/merge.c:804 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:817 +#: builtin/merge.c:810 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6766,48 +6824,48 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:841 +#: builtin/merge.c:834 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:853 +#: builtin/merge.c:846 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:918 +#: builtin/merge.c:911 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:934 +#: builtin/merge.c:927 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:975 +#: builtin/merge.c:968 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:977 +#: builtin/merge.c:970 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:979 +#: builtin/merge.c:972 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:984 +#: builtin/merge.c:977 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1140 +#: builtin/merge.c:1133 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1156 git-pull.sh:31 +#: builtin/merge.c:1149 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6815,11 +6873,11 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1159 git-pull.sh:34 +#: builtin/merge.c:1152 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:1163 +#: builtin/merge.c:1156 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6827,140 +6885,148 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1166 +#: builtin/merge.c:1159 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1175 +#: builtin/merge.c:1168 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1184 +#: builtin/merge.c:1177 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1216 +#: builtin/merge.c:1209 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." -#: builtin/merge.c:1219 +#: builtin/merge.c:1212 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1221 +#: builtin/merge.c:1214 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1226 +#: builtin/merge.c:1219 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1277 +#: builtin/merge.c:1270 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: builtin/merge.c:1280 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." #. 'N' -#: builtin/merge.c:1283 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1286 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: builtin/merge.c:1370 +#: builtin/merge.c:1363 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1409 +#: builtin/merge.c:1402 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1416 +#: builtin/merge.c:1409 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1448 +#: builtin/merge.c:1441 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1471 builtin/merge.c:1550 +#: builtin/merge.c:1464 builtin/merge.c:1543 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1468 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1534 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1543 +#: builtin/merge.c:1536 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1545 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1557 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" -#: builtin/merge-base.c:26 +#: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..." -#: builtin/merge-base.c:27 +#: builtin/merge-base.c:30 msgid "git merge-base [-a|--all] --octopus <commit>..." msgstr "git merge-base [-a|--all] --octopus <incheckning>..." -#: builtin/merge-base.c:28 +#: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <incheckning>..." -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" -#: builtin/merge-base.c:98 +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <ref> <incheckning>" + +#: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "skriv ut alla gemensamma anfäder" -#: builtin/merge-base.c:99 +#: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "hitta anfader för enkel n-vägssammanslagning" -#: builtin/merge-base.c:100 +#: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "visa revisioner som inte kan nås från andra" -#: builtin/merge-base.c:102 +#: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "är den första anfader till den andra?" +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "se var <incheckning> grenades av från referensloggen från <ref>" + #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " @@ -7020,123 +7086,127 @@ msgstr "tillåt skapa mer än ett träd" msgid "git mv [options] <source>... <destination>" msgstr "git mv [flaggor] <källa>... <mål>" -#: builtin/mv.c:67 +#: builtin/mv.c:71 msgid "force move/rename even if target exists" msgstr "tvinga flytta/ändra namn även om målet finns" -#: builtin/mv.c:68 +#: builtin/mv.c:72 msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:113 +#: builtin/mv.c:122 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:117 +#: builtin/mv.c:126 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:120 +#: builtin/mv.c:129 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:123 +#: builtin/mv.c:132 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:129 +#: builtin/mv.c:138 #, c-format msgid "Huh? Directory %s is in index and no submodule?" msgstr "Vad? Katalogen %s är i indexet och inte en undermodul?" -#: builtin/mv.c:131 builtin/rm.c:318 +#: builtin/mv.c:140 builtin/rm.c:318 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "" "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" -#: builtin/mv.c:147 +#: builtin/mv.c:156 #, c-format msgid "Huh? %.*s is in index?" msgstr "Vad? %.*s är i indexet?" -#: builtin/mv.c:159 +#: builtin/mv.c:168 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:191 +#: builtin/mv.c:200 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:193 +#: builtin/mv.c:202 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:201 +#: builtin/mv.c:210 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:204 +#: builtin/mv.c:213 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:207 +#: builtin/mv.c:216 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:222 +#: builtin/mv.c:218 +msgid "destination directory does not exist" +msgstr "destinationskatalogen finns inte" + +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:232 +#: builtin/mv.c:243 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [options] <commit>..." msgstr "git name-rev [flaggor] <incheckning>..." -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [options] --all" msgstr "git name-rev [flaggor] --all" -#: builtin/name-rev.c:261 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --stdin" msgstr "git name-rev [flaggor] --stdin" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:320 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:326 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -7462,7 +7532,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes_ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:974 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -7480,143 +7550,143 @@ msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2396 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2400 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2423 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2427 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2446 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2448 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2450 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2453 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsmätaren visas" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2454 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2455 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2458 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2460 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2462 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2464 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2466 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2468 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2470 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2472 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2474 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2476 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2478 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2480 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2482 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till de som ännu inte packats" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2485 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2488 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2491 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2493 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2495 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2498 parse-options.h:143 +#: builtin/pack-objects.c:2496 parse-options.h:143 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2497 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2500 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2502 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2504 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2508 +#: builtin/pack-objects.c:2506 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" @@ -7640,15 +7710,15 @@ msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:132 +#: builtin/prune.c:142 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:133 +#: builtin/prune.c:143 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:136 +#: builtin/prune.c:146 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" @@ -7656,15 +7726,15 @@ msgstr "låt tid gå ut för objekt äldre än <tid>" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/push.c:47 +#: builtin/push.c:86 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:66 +#: builtin/push.c:96 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:101 +#: builtin/push.c:141 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -7673,7 +7743,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:104 +#: builtin/push.c:144 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7698,7 +7768,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:119 +#: builtin/push.c:159 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7713,7 +7783,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:133 +#: builtin/push.c:173 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7726,12 +7796,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:141 +#: builtin/push.c:181 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: builtin/push.c:144 +#: builtin/push.c:184 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7742,7 +7812,7 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:167 +#: builtin/push.c:207 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7754,6 +7824,13 @@ msgid "" "\n" " git config --global push.default simple\n" "\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"In Git 2.0, Git will default to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" @@ -7771,19 +7848,27 @@ msgstr "" "\n" " git config --global push.default simple\n" "\n" +"Nör push.default är satt till \"matching\" kommer git att sända lokala " +"grenar\n" +"till fjärrgrenar som redan finns och som har samma namn.\n" +"\n" +"Git 2.0 kommer som standard välja den mer konservativa inställningen\n" +"\"simple\", vilket bara sänder in den aktuella grenen till den motsvarande\n" +"fjärrgren \"git pull\" använder för att uppdatera den aktuella grenen.\n" +"\n" "Se \"git help config\" och sök efter \"push.default\" för ytterligare \n" "information. (Läget \"simple\" introducerades i Git 1.7.11. Använd det\n" "liknande läget \"current\" istället för \"simple\" om du ibland använder\n" "äldre versioner av Git.)" -#: builtin/push.c:227 +#: builtin/push.c:274 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:234 +#: builtin/push.c:281 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7795,7 +7880,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:240 +#: builtin/push.c:287 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7809,7 +7894,7 @@ msgstr "" "endast\n" "sända aktuell gren." -#: builtin/push.c:246 +#: builtin/push.c:293 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -7821,7 +7906,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:252 +#: builtin/push.c:299 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -7835,11 +7920,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:259 +#: builtin/push.c:306 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:262 +#: builtin/push.c:309 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -7850,22 +7935,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:328 +#: builtin/push.c:375 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:332 +#: builtin/push.c:379 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:365 +#: builtin/push.c:412 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:366 +#: builtin/push.c:413 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7886,95 +7971,95 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:381 +#: builtin/push.c:428 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:382 +#: builtin/push.c:429 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:387 +#: builtin/push.c:434 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:388 +#: builtin/push.c:435 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:393 +#: builtin/push.c:440 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:453 +#: builtin/push.c:500 msgid "repository" msgstr "arkiv" -#: builtin/push.c:454 +#: builtin/push.c:501 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:455 +#: builtin/push.c:502 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:457 +#: builtin/push.c:504 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:458 +#: builtin/push.c:505 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:461 +#: builtin/push.c:508 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:463 +#: builtin/push.c:510 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:464 +#: builtin/push.c:511 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:466 +#: builtin/push.c:513 msgid "check" msgstr "kontrollera" -#: builtin/push.c:467 +#: builtin/push.c:514 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:469 +#: builtin/push.c:516 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:470 builtin/push.c:471 +#: builtin/push.c:517 builtin/push.c:518 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:472 +#: builtin/push.c:519 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:475 +#: builtin/push.c:522 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:477 +#: builtin/push.c:524 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:478 +#: builtin/push.c:525 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:488 +#: builtin/push.c:535 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:490 +#: builtin/push.c:537 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -8062,11 +8147,11 @@ msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" -#: builtin/remote.c:11 +#: builtin/remote.c:12 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -8074,82 +8159,82 @@ msgstr "" "git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <namn> <url>" -#: builtin/remote.c:13 builtin/remote.c:32 +#: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "git remote rename <gammal> <ny>" -#: builtin/remote.c:14 builtin/remote.c:37 +#: builtin/remote.c:15 builtin/remote.c:38 msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:15 +#: builtin/remote.c:16 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <namn>" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <namn>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <namn> <gren>..." -#: builtin/remote.c:20 builtin/remote.c:68 +#: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <namn> <nyurl>" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <namn> <url>" -#: builtin/remote.c:27 +#: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: builtin/remote.c:42 +#: builtin/remote.c:43 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" -#: builtin/remote.c:47 +#: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <namn> <gren>..." -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "git remote show [<flaggor>] <namn>" -#: builtin/remote.c:58 +#: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<flaggor>] <namn>" -#: builtin/remote.c:63 +#: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "Uppdaterar %s" -#: builtin/remote.c:130 +#: builtin/remote.c:120 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -8157,101 +8242,101 @@ msgstr "" "--mirror är farlig och föråldrad; använd\n" "\t --mirror=fetch eller --mirror=push istället" -#: builtin/remote.c:147 +#: builtin/remote.c:137 #, c-format msgid "unknown mirror argument: %s" msgstr "okänt argument till mirror: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:153 msgid "fetch the remote branches" msgstr "hämta fjärrgrenarna" -#: builtin/remote.c:165 +#: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" msgstr "importera alla taggar och associerade objekt vid hämtning" -#: builtin/remote.c:168 +#: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" msgstr "eller hämta inte några taggar alls (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:160 msgid "branch(es) to track" msgstr "gren(ar) att spåra" -#: builtin/remote.c:171 +#: builtin/remote.c:161 msgid "master branch" msgstr "huvudgren" -#: builtin/remote.c:172 +#: builtin/remote.c:162 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:173 +#: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" msgstr "ställ in arkiv som spegel att sända eller ta emot från" -#: builtin/remote.c:185 +#: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:195 builtin/remote.c:646 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:199 builtin/remote.c:650 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/remote.c:243 +#: builtin/remote.c:233 #, c-format msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:299 +#: builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: builtin/remote.c:339 +#: builtin/remote.c:334 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hämta mappning för referensspecifikation %s" -#: builtin/remote.c:440 builtin/remote.c:448 +#: builtin/remote.c:435 builtin/remote.c:443 msgid "(matching)" msgstr "(matchande)" -#: builtin/remote.c:452 +#: builtin/remote.c:447 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Kunde inte tillämpa \"%s\" på \"%s\"" -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:656 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:662 builtin/remote.c:799 +#: builtin/remote.c:657 builtin/remote.c:794 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:677 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8262,32 +8347,32 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:683 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Kunde inte lägga till på \"%s\"" -#: builtin/remote.c:694 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Kunde inte sätta \"%s\"" -#: builtin/remote.c:716 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:750 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:764 +#: builtin/remote.c:759 #, c-format msgid "Could not remove branch %s" msgstr "Kunde inte ta bort grenen %s" -#: builtin/remote.c:834 +#: builtin/remote.c:829 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8301,262 +8386,262 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:943 +#: builtin/remote.c:938 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:946 +#: builtin/remote.c:941 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:948 +#: builtin/remote.c:943 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:950 +#: builtin/remote.c:945 msgid " ???" msgstr " ???" -#: builtin/remote.c:991 +#: builtin/remote.c:986 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:998 +#: builtin/remote.c:993 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1001 +#: builtin/remote.c:996 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1002 +#: builtin/remote.c:997 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1004 +#: builtin/remote.c:999 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1000 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 msgid "create" msgstr "skapa" -#: builtin/remote.c:1054 +#: builtin/remote.c:1049 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1058 +#: builtin/remote.c:1053 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1061 +#: builtin/remote.c:1056 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1064 +#: builtin/remote.c:1059 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1071 +#: builtin/remote.c:1066 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1074 +#: builtin/remote.c:1069 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1081 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1091 +#: builtin/remote.c:1144 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1118 +#: builtin/remote.c:1171 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1172 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1120 builtin/remote.c:1285 +#: builtin/remote.c:1173 builtin/remote.c:1318 msgid "(no URL)" msgstr "(ingen URL)" -#: builtin/remote.c:1129 builtin/remote.c:1131 +#: builtin/remote.c:1182 builtin/remote.c:1184 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1192 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1151 +#: builtin/remote.c:1204 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1154 builtin/remote.c:1181 +#: builtin/remote.c:1207 builtin/remote.c:1234 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1163 +#: builtin/remote.c:1216 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1171 +#: builtin/remote.c:1224 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1178 +#: builtin/remote.c:1231 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1199 +#: builtin/remote.c:1252 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1201 +#: builtin/remote.c:1254 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1216 +#: builtin/remote.c:1269 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1218 +#: builtin/remote.c:1271 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1228 +#: builtin/remote.c:1281 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1236 +#: builtin/remote.c:1289 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1238 +#: builtin/remote.c:1291 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1274 +#: builtin/remote.c:1307 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1275 +#: builtin/remote.c:1308 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1281 +#: builtin/remote.c:1314 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1315 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1295 +#: builtin/remote.c:1328 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1331 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1321 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1387 builtin/remote.c:1461 +#: builtin/remote.c:1440 builtin/remote.c:1514 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1407 +#: builtin/remote.c:1460 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1414 +#: builtin/remote.c:1467 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1436 +#: builtin/remote.c:1489 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1438 +#: builtin/remote.c:1491 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1440 +#: builtin/remote.c:1493 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1447 +#: builtin/remote.c:1500 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1487 +#: builtin/remote.c:1540 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1495 +#: builtin/remote.c:1548 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1497 +#: builtin/remote.c:1550 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1569 +#: builtin/remote.c:1564 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" @@ -8604,6 +8689,10 @@ msgstr "med -A, lös inte upp objekt äldre än detta" msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" +#: builtin/repack.c:162 builtin/repack.c:166 +msgid "bytes" +msgstr "byte" + #: builtin/repack.c:163 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" @@ -8616,7 +8705,7 @@ msgstr "begränsa maximalt deltadjup" msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:345 +#: builtin/repack.c:343 #, c-format msgid "removing '%s' failed" msgstr "misslyckades ta bort \"%s\"" @@ -8630,21 +8719,25 @@ msgid "git replace -d <object>..." msgstr "git replace -d <objekt>..." #: builtin/replace.c:19 -msgid "git replace -l [<pattern>]" -msgstr "git replace -l [<mönster>]" +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<format>] [-l [<mönster>]]" -#: builtin/replace.c:131 +#: builtin/replace.c:174 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:132 +#: builtin/replace.c:175 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:133 +#: builtin/replace.c:176 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" +#: builtin/replace.c:177 +msgid "use this format" +msgstr "använd detta format" + #: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" @@ -8777,19 +8870,23 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-parse.c:345 +#: builtin/rev-parse.c:359 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [options] -- [<argument>...]" -#: builtin/rev-parse.c:350 +#: builtin/rev-parse.c:364 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:352 +#: builtin/rev-parse.c:366 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:470 +#: builtin/rev-parse.c:369 +msgid "output in stuck long form" +msgstr "utdata fast i lång form" + +#: builtin/rev-parse.c:486 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9034,67 +9131,67 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show possible merge bases" msgstr "visa möjliga sammanslaningsbaser" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:678 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:680 +#: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" @@ -9583,15 +9680,15 @@ msgstr "giltig till" msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:238 +#: parse-options.h:235 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:240 +#: parse-options.h:237 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:246 +#: parse-options.h:243 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" @@ -9892,8 +9989,8 @@ msgstr "" # cogito-relaterat #: git-bisect.sh:140 -msgid "won't bisect on seeked tree" -msgstr "kör inte \"bisect\" på ett \"seeked\"-träd" +msgid "won't bisect on cg-seek'ed tree" +msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" @@ -10037,7 +10134,7 @@ msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:255 +#: git-pull.sh:247 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10048,15 +10145,15 @@ msgstr "" "Varning: snabbspolar din arbetskatalog från\n" "Varning: incheckningen $orig_head." -#: git-pull.sh:280 +#: git-pull.sh:272 msgid "Cannot merge multiple branches into empty head" msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: git-pull.sh:284 +#: git-pull.sh:276 msgid "Cannot rebase onto multiple branches" msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" -#: git-rebase.sh:54 +#: git-rebase.sh:55 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -10067,16 +10164,16 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"." -#: git-rebase.sh:156 +#: git-rebase.sh:158 msgid "Applied autostash." msgstr "Tillämpade autostash." -#: git-rebase.sh:159 +#: git-rebase.sh:161 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:160 +#: git-rebase.sh:162 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -10086,31 +10183,31 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: git-rebase.sh:199 +#: git-rebase.sh:201 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:204 +#: git-rebase.sh:206 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Det verkar som en git-am körs. Kan inte ombasera." -#: git-rebase.sh:338 +#: git-rebase.sh:346 msgid "The --exec option must be used with the --interactive option" msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive" -#: git-rebase.sh:343 +#: git-rebase.sh:351 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:354 +#: git-rebase.sh:362 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: git-rebase.sh:361 +#: git-rebase.sh:369 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:364 +#: git-rebase.sh:372 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -10118,12 +10215,12 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:382 +#: git-rebase.sh:390 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:401 +#: git-rebase.sh:409 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10144,66 +10241,66 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:446 +#: git-rebase.sh:456 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:473 git-rebase.sh:477 +#: git-rebase.sh:483 git-rebase.sh:487 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:482 +#: git-rebase.sh:492 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:505 +#: git-rebase.sh:515 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:528 +#: git-rebase.sh:548 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:533 +#: git-rebase.sh:553 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:537 +#: git-rebase.sh:557 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:557 +#: git-rebase.sh:577 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:561 +#: git-rebase.sh:581 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." -#: git-rebase.sh:572 +#: git-rebase.sh:592 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" #. Detach HEAD and reset the tree -#: git-rebase.sh:581 +#: git-rebase.sh:601 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#: git-rebase.sh:591 +#: git-rebase.sh:611 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -10452,56 +10549,56 @@ msgstr "Misslyckades registrera undermodulen \"$sm_path\"" msgid "Entering '$prefix$displaypath'" msgstr "Går in i \"$prefix$displaypath\"" -#: git-submodule.sh:554 +#: git-submodule.sh:559 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" "Stoppar på \"$prefix$displaypath\"; skriptet returnerade en status skild " "från noll." -#: git-submodule.sh:600 +#: git-submodule.sh:605 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" "Hittade ingen url för undermodulsökvägen \"$displaypath\" i .gitmodules" -#: git-submodule.sh:609 +#: git-submodule.sh:614 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "Misslyckades registrera url för undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:611 +#: git-submodule.sh:616 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:619 +#: git-submodule.sh:633 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$displaypath" "\"" -#: git-submodule.sh:656 +#: git-submodule.sh:671 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "Använd \".\" om du verkligen vill avinitiera alla undermoduler" -#: git-submodule.sh:673 +#: git-submodule.sh:688 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\"" -#: git-submodule.sh:674 +#: git-submodule.sh:689 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#: git-submodule.sh:680 +#: git-submodule.sh:695 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -10510,28 +10607,28 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:683 +#: git-submodule.sh:698 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:684 +#: git-submodule.sh:699 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:687 +#: git-submodule.sh:702 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:696 +#: git-submodule.sh:711 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:811 +#: git-submodule.sh:834 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" @@ -10540,109 +10637,124 @@ msgstr "" "Undermodulen \"$displaypath\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:824 +#: git-submodule.sh:847 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:833 +#: git-submodule.sh:856 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:857 +#: git-submodule.sh:880 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:871 +#: git-submodule.sh:894 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:872 +#: git-submodule.sh:895 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:877 +#: git-submodule.sh:900 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:878 +#: git-submodule.sh:901 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:883 +#: git-submodule.sh:906 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\"" -#: git-submodule.sh:884 +#: git-submodule.sh:907 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "Undermodulsökvägen \"$prefix$sm_path\": \"$command $sha1\"" -#: git-submodule.sh:889 +#: git-submodule.sh:912 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:890 +#: git-submodule.sh:913 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:917 +#: git-submodule.sh:940 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:1025 +#: git-submodule.sh:1048 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" #. unexpected type -#: git-submodule.sh:1073 +#: git-submodule.sh:1096 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:1093 +#: git-submodule.sh:1116 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" -#: git-submodule.sh:1096 +#: git-submodule.sh:1119 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" -#: git-submodule.sh:1099 +#: git-submodule.sh:1122 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Varning: $display_name innehåller inte incheckningarna $sha1_src och " "$sha1_dst" -#: git-submodule.sh:1124 +#: git-submodule.sh:1147 msgid "blob" msgstr "blob" -#: git-submodule.sh:1238 +#: git-submodule.sh:1261 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1302 +#: git-submodule.sh:1325 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "copied: %s -> %s" +#~ msgstr "kopierad: %s -> %s" + +#~ msgid "deleted: %s" +#~ msgstr "borttagen: %s" + +#~ msgid "modified: %s" +#~ msgstr "ändrad: %s" + +#~ msgid "renamed: %s -> %s" +#~ msgstr "namnbyte: %s -> %s" + +#~ msgid "unmerged: %s" +#~ msgstr "osammansl.: %s" + #~ msgid "input paths are terminated by a null character" #~ msgstr "sökvägar avdelas med null-tecken" @@ -1,23 +1,23 @@ # Vietnamese translation for GIT-CORE. # Bản dịch tiếng Việt dành cho GIT-CORE. # This file is distributed under the same license as the git-core package. -# First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013. +# First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014. # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012. # msgid "" msgstr "" -"Project-Id-Version: git-v1.8.5-rc0-24-g727b957\n" +"Project-Id-Version: git v1.9-pu\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-11-02 08:06+0800\n" -"PO-Revision-Date: 2013-11-02 13:15+0700\n" +"POT-Creation-Date: 2014-02-01 08:06+0800\n" +"PO-Revision-Date: 2014-02-03 07:30+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Team-Website: <http://translationproject.org/team/vi.html>\n" "Plural-Forms: nplurals=2; plural=1;\n" +"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ../\n" "X-Generator: Poedit 1.5.5\n" @@ -62,7 +62,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lệnh>] --list" -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào" @@ -83,8 +83,8 @@ msgstr "tiền tố" msgid "prepend prefix to each pathname in the archive" msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 @@ -146,38 +146,37 @@ msgstr "" #: branch.c:60 #, c-format msgid "Not setting branch %s as its own upstream." -msgstr "Chưa cài đặt nhánh %s như là thượng nguồn (upstream) của nó." +msgstr "Chưa cài đặt nhánh %s như là thượng nguồn của nó." #: branch.c:82 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." -msgstr "" -"Nhánh %s cài đặt để theo dõi vết nhánh máy chủ %s từ %s bằng cách rebase." +msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s bằng cách rebase." #: branch.c:83 #, c-format msgid "Branch %s set up to track remote branch %s from %s." -msgstr "Nhánh %s cài đặt để theo vết nhánh máy chủ %s từ %s." +msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s." #: branch.c:87 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "Nhánh %s cài đặt để theo vết nhánh nội bộ %s bằng cách rebase." +msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s bằng cách rebase." #: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s." -msgstr "Nhánh %s cài đặt để theo vết nhánh nội bộ %s." +msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s." #: branch.c:92 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." -msgstr "Nhánh %s cài đặt để theo vết nhánh máy chủ %s bằng cách rebase." +msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s bằng cách rebase." #: branch.c:93 #, c-format msgid "Branch %s set up to track remote ref %s." -msgstr "Nhánh %s cài đặt để theo vết tham chiếu máy chủ %s." +msgstr "Nhánh %s cài đặt để theo dõi tham chiếu máy chủ %s." #: branch.c:97 #, c-format @@ -193,12 +192,12 @@ msgstr "Nhánh %s cài đặt để theo dõi tham chiếu nội bộ %s." #: branch.c:118 #, c-format msgid "Tracking not set up: name too long: %s" -msgstr "Theo vết chưa được cài đặt: tên quá dài: %s" +msgstr "Việc theo dõi chưa được cài đặt: tên quá dài: %s" #: branch.c:137 #, c-format msgid "Not tracking: ambiguous information for ref %s" -msgstr "Không theo vết: thông tin chưa rõ ràng cho tham chiếu %s" +msgstr "Không theo dõi: thông tin chưa rõ ràng cho tham chiếu %s" #: branch.c:182 #, c-format @@ -218,13 +217,13 @@ msgstr "Không thể ép buộc cập nhật nhánh hiện hành." #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -"Không thể cài đặt thông tin theo vết; điểm bắt đầu “%s” không phải là một " +"Không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s” không phải là một " "nhánh." #: branch.c:217 #, c-format msgid "the requested upstream branch '%s' does not exist" -msgstr "nhánh thượng nguồn đã yêu cầu “%s” chưa sẵn có" +msgstr "nhánh thượng nguồn đã yêu cầu “%s” không tồn tại" #: branch.c:219 msgid "" @@ -238,7 +237,7 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" "\n" -"Nếu bạn có ý định cải tổ công việc của bạn trên nhánh thượng nguồn\n" +"Nếu bạn có ý định “cải tổ” công việc của bạn trên nhánh thượng nguồn\n" "(upstream) cái mà đã sẵn có trên máy chủ, bạn cần chạy\n" "lệnh \"git fetch\" để lấy nó về.\n" "\n" @@ -269,70 +268,70 @@ msgstr "Gặp lỗi khi khóa tham chiếu (ref) để cập nhật" msgid "Failed to write ref" msgstr "Gặp lỗi khi ghi tham chiếu (ref)" -#: bundle.c:36 +#: bundle.c:37 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump của git)" -#: bundle.c:63 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" -msgstr "phần đầu (header) không được thừa nhận: %s%s (%d)" +msgstr "phần đầu không được thừa nhận: %s%s (%d)" -#: bundle.c:89 builtin/commit.c:706 +#: bundle.c:90 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" -#: bundle.c:140 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" -msgstr "Kho chứa thiếu những lần chuyển giao (commit) cần trước hết này:" +msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:" -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi" -#: bundle.c:186 +#: bundle.c:187 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Bundle chứa tham chiếu (ref) này:" msgstr[1] "Bundle chứa %d tham chiếu (ref):" -#: bundle.c:193 +#: bundle.c:194 msgid "The bundle records a complete history." msgstr "Lệnh bundle ghi lại toàn bộ lịch sử." -#: bundle.c:195 +#: bundle.c:196 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Lệnh bundle yêu cầu tham chiếu này:" msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) này:" -#: bundle.c:294 +#: bundle.c:296 msgid "rev-list died" msgstr "rev-list đã chết" -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" -#: bundle.c:335 +#: bundle.c:337 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list" -#: bundle.c:380 +#: bundle.c:382 msgid "Refusing to create empty bundle." msgstr "Từ chối tạo một bundle trống rỗng." #: bundle.c:398 msgid "Could not spawn pack-objects" -msgstr "Không thể sản sinh pack-objects" +msgstr "Không thể sản sinh đối tượng gói" #: bundle.c:416 msgid "pack-objects died" @@ -361,16 +360,16 @@ msgstr "%s %s không phải là một lần commit!" msgid "memory exhausted" msgstr "hết bộ nhớ" -#: connected.c:60 +#: connected.c:70 msgid "Could not run 'git rev-list'" msgstr "Không thể chạy “git rev-list”" -#: connected.c:80 +#: connected.c:90 #, c-format msgid "failed write to rev-list: %s" msgstr "gặp lỗi khi ghi vào rev-list: %s" -#: connected.c:88 +#: connected.c:98 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list: %s" @@ -442,22 +441,27 @@ msgid_plural "%lu years ago" msgstr[0] "%lu năm trước" msgstr[1] "%lu năm trước" -#: diff.c:112 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" + +#: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm “%s”\n" -#: diff.c:117 +#: diff.c:118 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Không hiểu đối số dirstat “%s”\n" -#: diff.c:210 +#: diff.c:213 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule”: “%s”" -#: diff.c:260 +#: diff.c:263 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -466,7 +470,7 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:3490 +#: diff.c:3509 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -475,7 +479,7 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3504 +#: diff.c:3523 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”" @@ -524,11 +528,11 @@ msgstr "các lệnh git sẵn có trong thư mục “%s”:" #: help.c:217 msgid "git commands available from elsewhere on your $PATH" -msgstr "các lệnh git sẵn sàng để dùng từ một nơi khác trong $PATH của bạn" +msgstr "các lệnh git sẵn có từ một nơi khác trong $PATH của bạn" #: help.c:233 msgid "The most commonly used git commands are:" -msgstr "Những lệnh git hay được sử dụng nhất là:" +msgstr "Những lệnh git hay được dùng nhất là:" #: help.c:290 #, c-format @@ -550,7 +554,7 @@ msgid "" "Continuing under the assumption that you meant '%s'" msgstr "" "CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn.\n" -"Giả định rằng ý bạn là “%s”" +"Tiếp tục và coi rằng ý bạn là “%s”" #: help.c:374 #, c-format @@ -586,7 +590,7 @@ msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 -#: builtin/clone.c:655 +#: builtin/clone.c:661 msgid "unable to write new index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới" @@ -623,7 +627,7 @@ msgstr ": có lẽ là một xung đột D/F?" #: merge-recursive.c:709 #, c-format msgid "refusing to lose untracked file at '%s'" -msgstr "từ chối đóng tập tin không được theo vết tại “%s”" +msgstr "từ chối đóng tập tin không được theo dõi tại “%s”" #: merge-recursive.c:749 #, c-format @@ -635,7 +639,7 @@ msgstr "không thể đọc đối tượng %s “%s”" msgid "blob expected for %s '%s'" msgstr "đối tượng blob được mong đợi cho %s “%s”" -#: merge-recursive.c:774 builtin/clone.c:311 +#: merge-recursive.c:774 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "gặp lỗi khi mở “%s”" @@ -685,7 +689,7 @@ msgstr "" msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1082 +#: merge-recursive.c:1082 wt-status.c:283 msgid "renamed" msgstr "đã đổi tên" @@ -748,7 +752,7 @@ msgstr "đối tượng %s không phải là một blob" msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:1565 +#: merge-recursive.c:1565 wt-status.c:281 msgid "modified" msgstr "đã sửa" @@ -770,7 +774,7 @@ msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1634 git-submodule.sh:1125 +#: merge-recursive.c:1634 git-submodule.sh:1148 msgid "submodule" msgstr "mô-đun-con" @@ -835,22 +839,22 @@ msgstr[1] "tìm thấy %u tổ tiên chung:" #: merge-recursive.c:1941 msgid "merge returned no commit" -msgstr "hòa trộn không trả về lần chuyển giao (commit) nào" +msgstr "hòa trộn không trả về lần chuyển giao nào" #: merge-recursive.c:1998 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:2010 builtin/merge.c:672 +#: merge-recursive.c:2010 builtin/merge.c:665 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" #: notes-utils.c:40 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -"Không thể chuyển giao (commit) chưa được khởi tạo hoặc không được tham chiếu " -"cây ghi chú" +"Không thể chuyển giao cây ghi chú chưa được khởi tạo hoặc không được tham " +"chiếu" #: notes-utils.c:81 #, c-format @@ -860,7 +864,7 @@ msgstr "Giá trị notes.rewriteMode sai: “%s”" #: notes-utils.c:91 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài của refs/notes/)" +msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value @@ -899,12 +903,12 @@ msgstr " %s" msgid "-NUM" msgstr "-SỐ" -#: pathspec.c:118 +#: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "các cài đặt đặc tả đường dẫn “glob” và “noglob” toàn cục là xung khắc nhau" -#: pathspec.c:128 +#: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -912,36 +916,36 @@ msgstr "" "cài đặt đặc tả đường dẫn “literal” toàn cục là xung khắc với các cài đặt đặc " "tả đường dẫn toàn cục khác" -#: pathspec.c:158 +#: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "tham số không hợp lệ cho “tiền tố” màu nhiệm đặc tả đường đẫn" -#: pathspec.c:164 +#: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Số màu nhiệm đặc tả đường dẫn không hợp lệ “%.*s” trong “%s”" -#: pathspec.c:168 +#: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Thiếu “)” tại cuối của số màu nhiệm đặc tả đường dẫn trong “%s”" -#: pathspec.c:186 +#: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Chưa viết mã cho số màu nhiệm đặc tả đường dẫn “%c” trong “%s”" -#: pathspec.c:211 +#: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: “literal” và “glob” xung khắc nhau" -#: pathspec.c:222 +#: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: “%s” ngoài một kho chứa" -#: pathspec.c:278 +#: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”" @@ -951,59 +955,91 @@ msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s #. * name. E.g. when add--interactive dies when running #. * "checkout -p" #. -#: pathspec.c:340 +#: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %s" -#: pathspec.c:415 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "đặc tả đường dẫn “%s” vượt ra ngoài liên kết mềm" -#: remote.c:1833 +#: pathspec.c:442 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" +"Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n" +"Có lẽ bạn đã quên thêm hoặc là “:/” hoặc là “.”?" + +#: remote.c:753 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Không thể lấy về cả %s và %s cho %s" + +#: remote.c:757 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s thường theo dõi %s, không phải %s" + +#: remote.c:761 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s theo dõi cả %s và %s" + +#. +#. * This last possibility doesn't occur because +#. * FETCH_HEAD_IGNORE entries always appear at +#. * the end of the list. +#. +#: remote.c:769 +msgid "Internal error" +msgstr "Lỗi nội bộ" + +#: remote.c:1871 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "Nhánh của bạn dựa trên cơ sở là “%s”, nhưng trên thượng nguồn không còn.\n" -#: remote.c:1837 +#: remote.c:1875 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n" -#: remote.c:1840 +#: remote.c:1878 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Nhánh của bạn đã cập nhật với “%s”.\n" -#: remote.c:1844 +#: remote.c:1882 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" -msgstr[0] "Nhánh của bạn là đầu của “%s” bởi %d lần chuyển giao (commit).\n" -msgstr[1] "Nhánh của bạn là đầu của “%s” bởi %d lần chuyển giao (commit).\n" +msgstr[0] "Nhánh của bạn là đầu của “%s” bởi %d lần chuyển giao.\n" +msgstr[1] "Nhánh của bạn là đầu của “%s” bởi %d lần chuyển giao.\n" -#: remote.c:1850 +#: remote.c:1888 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n" -#: remote.c:1853 +#: remote.c:1891 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "" -"Nhánh của bạn thì ở đằng sau “%s” bởi %d lần chuyển giao (commit), và có thể " -"được fast-forward.\n" +"Nhánh của bạn ở đằng sau “%s” %d lần chuyển giao, và có thể được fast-" +"forward.\n" msgstr[1] "" -"Nhánh của bạn thì ở đằng sau “%s” bởi %d lần chuyển giao (commit), và có thể " -"được fast-forward.\n" +"Nhánh của bạn ở đằng sau “%s” %d lần chuyển giao, và có thể được fast-" +"forward.\n" -#: remote.c:1861 +#: remote.c:1899 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n" -#: remote.c:1864 +#: remote.c:1902 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1013,13 +1049,13 @@ msgid_plural "" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" "Nhánh của bạn và “%s” bị phân kỳ,\n" -"và có %d và %d lần chuyển giao (commit) khác nhau cho từng cái,\n" +"và có %d và %d lần chuyển giao khác nhau cho từng cái,\n" "tương ứng với mỗi lần.\n" msgstr[1] "" "Your branch and “%s” have diverged,\n" "and have %d and %d different commit each, respectively.\n" -#: remote.c:1874 +#: remote.c:1912 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của " @@ -1027,21 +1063,21 @@ msgstr "" #: run-command.c:80 msgid "open /dev/null failed" -msgstr "gặp lỗi khi mở /dev/null" +msgstr "gặp lỗi khi mở “/dev/null”" #: run-command.c:82 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) gặp lỗi" -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 -#: builtin/merge.c:1013 builtin/merge.c:1023 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 +#: builtin/merge.c:1006 builtin/merge.c:1016 #, c-format msgid "Could not open '%s' for writing" msgstr "Không thể mở “%s” để ghi" -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 -#: builtin/merge.c:1015 builtin/merge.c:1028 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 +#: builtin/merge.c:1008 builtin/merge.c:1021 #, c-format msgid "Could not write to '%s'" msgstr "Không thể ghi vào “%s”" @@ -1062,7 +1098,7 @@ msgid "" msgstr "" "sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" "với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n" -"và chuyển giao (commit) kết quả bằng lệnh “git commit”" +"và chuyển giao kết quả bằng lệnh “git commit”" #: sequencer.c:245 sequencer.c:870 sequencer.c:953 #, c-format @@ -1084,7 +1120,7 @@ msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi l #: sequencer.c:268 msgid "Commit your changes or stash them to proceed." -msgstr "Chuyển giao (commit) các thay đổi của bạn hay stash chúng để xử lý." +msgstr "Chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý." #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:325 @@ -1108,7 +1144,7 @@ msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" #: sequencer.c:428 #, c-format msgid "Could not parse parent commit %s\n" -msgstr "Không thể phân tích commit (lần chuyển giao) cha mẹ %s\n" +msgstr "Không thể phân tích lần chuyển giao cha mẹ “%s”\n" #: sequencer.c:494 msgid "Your index file is unmerged." @@ -1117,21 +1153,19 @@ msgstr "Tập tin lưu mục lục của bạn không được hòa trộn." #: sequencer.c:513 #, c-format msgid "Commit %s is a merge but no -m option was given." -msgstr "" -"Lần chuyển giao (commit) %s là một lần hòa trộn nhưng không đưa ra tùy chọn -" -"m." +msgstr "Lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m." #: sequencer.c:521 #, c-format msgid "Commit %s does not have parent %d" -msgstr "Lần chuyển giao (commit) %s không có cha mẹ %d" +msgstr "Lần chuyển giao %s không có cha mẹ %d" #: sequencer.c:525 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" -"Luồng chính đã được chỉ ra nhưng lần chuyển giao (commit) %s không phải là " -"một lần hòa trộn." +"Luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần " +"hòa trộn." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 @@ -1143,7 +1177,7 @@ msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s" #: sequencer.c:542 #, c-format msgid "Cannot get commit message for %s" -msgstr "Không thể lấy thông điệp lần chuyển giao (commit) cho %s" +msgstr "Không thể lấy ghi chú lần chuyển giao cho %s" #: sequencer.c:628 #, c-format @@ -1157,7 +1191,7 @@ msgstr "không thể apply (áp dụng miếng vá) %s... %s" #: sequencer.c:665 msgid "empty commit set passed" -msgstr "lần chuyển giao (commit) trống rỗng đặt là hợp quy cách" +msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách" #: sequencer.c:673 #, c-format @@ -1181,7 +1215,7 @@ msgstr "Không phân tích được dòng %d." #: sequencer.c:763 msgid "No commits parsed." -msgstr "Không có lần chuyển giao (commit) nào được phân tích." +msgstr "Không có lần chuyển giao nào được phân tích." #: sequencer.c:776 #, c-format @@ -1215,7 +1249,7 @@ msgstr "Bảng tùy chọn dị hình: %s" #: sequencer.c:851 msgid "a cherry-pick or revert is already in progress" -msgstr "một thao tác cherry-pick hoặc revert đang được thực hiện" +msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện" #: sequencer.c:852 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" @@ -1255,7 +1289,7 @@ msgstr "không thể đọc %s: %s" #: sequencer.c:921 msgid "unexpected end of file" -msgstr "kết thúc tập tin đột xuất" +msgstr "gặp kết thúc tập tin đột xuất" #: sequencer.c:927 #, c-format @@ -1265,7 +1299,7 @@ msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng" #: sequencer.c:950 #, c-format msgid "Could not format %s." -msgstr "Không thể định dạng %s." +msgstr "Không thể định dạng “%s”." #: sequencer.c:1093 #, c-format @@ -1279,13 +1313,13 @@ msgstr "%s: điểm xét duyệt sai" #: sequencer.c:1130 msgid "Can't revert as initial commit" -msgstr "Không thể revert một lần chuyển giao (commit) khởi tạo" +msgstr "Không thể revert một lần chuyển giao khởi tạo" #: sequencer.c:1131 msgid "Can't cherry-pick into empty head" msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" -#: sha1_name.c:440 +#: sha1_name.c:439 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1309,26 +1343,25 @@ msgstr "" "này\n" "bằng cách chạy lệnh \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1112 +#: sha1_name.c:1070 msgid "HEAD does not point to a branch" msgstr "HEAD không chỉ đến một nhánh nào cả" -#: sha1_name.c:1115 +#: sha1_name.c:1073 #, c-format msgid "No such branch: '%s'" msgstr "Không có nhánh nào như thế: “%s”" -#: sha1_name.c:1117 +#: sha1_name.c:1075 #, c-format msgid "No upstream configured for branch '%s'" -msgstr "Không có thượng nguồn (upstream) được cấu hình cho nhánh “%s”" +msgstr "Không có thượng nguồn được cấu hình cho nhánh “%s”" -#: sha1_name.c:1121 +#: sha1_name.c:1079 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -"Nhánh thượng nguồn (upstream) “%s” không được lưu lại như là một nhánh " -"“remote-tracking”" +"Nhánh thượng nguồn “%s” không được lưu lại như là một nhánh “remote-tracking”" #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" @@ -1385,11 +1418,11 @@ msgstr "Không thể tạo liên kết git “%s”" #: submodule.c:1155 #, c-format msgid "Could not set core.worktree in %s" -msgstr "Không thể đặt cây thư mục làm việc “core.worktree” trong “%s”." +msgstr "Không thể đặt “core.worktree” trong “%s”." #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" -msgstr "tên lược đồ URL không hợp lệ hay thiếu hậu tố “://”" +msgstr "tên lược đồ URL không hợp lệ, hoặc thiếu hậu tố “://”" #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 #, c-format @@ -1435,361 +1468,351 @@ msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: % msgid "no such user" msgstr "không có người dùng như vậy" -#: wt-status.c:146 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Những đường dẫn chưa được hòa trộn:" -#: wt-status.c:173 wt-status.c:200 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (dùng \"git reset %s <tập-tin>...\" để bỏ một stage (trạng thái))" +msgstr " (dùng \"git reset %s <tập-tin>...\" để bỏ ra khỏi bệ phóng)" -#: wt-status.c:175 wt-status.c:202 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (dùng \"git rm --cached <tập-tin>...\" để bỏ trạng thái (stage))" +msgstr " (dùng \"git rm --cached <tập-tin>...\" để bỏ ra khỏi bệ phóng)" -#: wt-status.c:179 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (dùng \"git add <tập-tin>...\" để đánh dấu là cần giải quyết)" -#: wt-status.c:181 wt-status.c:185 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -" (dùng \"git add/rm <tập-tin>...\" như là một cách thích hợp để đánh dấu " -"là cần được giải quyết)" +" (dùng \"git add/rm <tập-tin>...\" như là một cách thích hợp để đánh dấu là " +"cần được giải quyết)" -#: wt-status.c:183 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dùng \"git rm <tập-tin>...\" để đánh dấu là cần giải quyết)" -#: wt-status.c:194 +#: wt-status.c:198 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:212 +#: wt-status.c:216 msgid "Changes not staged for commit:" -msgstr "" -"Các thay đổi không được đặt trạng thái (stage) cho lần chuyển giao (commit):" +msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:" -#: wt-status.c:216 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr "" -" (dùng \"git add <tập-tin>...\" để cập nhật những gì cần chuyển giao " -"(commit))" +msgstr " (dùng \"git add <tập-tin>...\" để cập nhật những gì sẽ chuyển giao)" -#: wt-status.c:218 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (dùng \"git add/rm <tập-tin>...\" để cập nhật những gì sẽ được chuyển giao)" -#: wt-status.c:219 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -" (dùng \"git checkout -- <tập-tin>...\" để bỏ thay đổi trong thư mục làm " -"việc)" +" (dùng \"git checkout -- <tập-tin>...\" để loại bỏ các thay đổi trong thư " +"mục làm việc)" -#: wt-status.c:221 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -" (chuyển giao (commit) hoặc là loại bỏ các nội dung không-bị-theo-vết hay " -"đã bị chỉnh sửa trong mô-đun-con)" +" (chuyển giao hoặc là loại bỏ các nội dung chưa được theo dõi hay đã sửa " +"chữa trong mô-đun-con)" -#: wt-status.c:233 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -" (dùng \"git %s <tập-tin>...\" để thêm vào những gì cần chuyển giao " -"(commit))" +" (dùng \"git %s <tập-tin>...\" để thêm vào những gì cần được chuyển giao)" -#: wt-status.c:250 +#: wt-status.c:254 msgid "bug" msgstr "lỗi" -#: wt-status.c:255 +#: wt-status.c:259 msgid "both deleted:" msgstr "bị xóa bởi cả hai:" -#: wt-status.c:256 +#: wt-status.c:260 msgid "added by us:" msgstr "được thêm vào bởi chúng ta:" -#: wt-status.c:257 +#: wt-status.c:261 msgid "deleted by them:" msgstr "bị xóa đi bởi họ:" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "được thêm vào bởi họ:" -#: wt-status.c:259 +#: wt-status.c:263 msgid "deleted by us:" msgstr "bị xóa bởi chúng ta:" -#: wt-status.c:260 +#: wt-status.c:264 msgid "both added:" msgstr "được thêm vào bởi cả hai:" -#: wt-status.c:261 +#: wt-status.c:265 msgid "both modified:" msgstr "bị sửa bởi cả hai:" -#: wt-status.c:291 -msgid "new commits, " -msgstr "lần chuyển giao (commit) mới, " +#: wt-status.c:275 +msgid "new file" +msgstr "tập tin mới" -#: wt-status.c:293 -msgid "modified content, " -msgstr "nội dung bị sửa đổi, " - -#: wt-status.c:295 -msgid "untracked content, " -msgstr "nội dung chưa được theo dõi, " +#: wt-status.c:277 +msgid "copied" +msgstr "đã chép" -#: wt-status.c:312 -#, c-format -msgid "new file: %s" -msgstr "tập tin mới: %s" +#: wt-status.c:279 +msgid "deleted" +msgstr "bị xoá" -#: wt-status.c:315 -#, c-format -msgid "copied: %s -> %s" -msgstr "đã sao chép: %s -> %s" +#: wt-status.c:285 +msgid "typechange" +msgstr "đổi-kiểu" -#: wt-status.c:318 -#, c-format -msgid "deleted: %s" -msgstr "đã xóa: %s" +#: wt-status.c:287 +msgid "unknown" +msgstr "không hiểu" -#: wt-status.c:321 -#, c-format -msgid "modified: %s" -msgstr "đã sửa đổi: %s" +#: wt-status.c:289 +msgid "unmerged" +msgstr "chưa hòa trộn" -#: wt-status.c:324 -#, c-format -msgid "renamed: %s -> %s" -msgstr "đã đổi tên: %s -> %s" - -#: wt-status.c:327 -#, c-format -msgid "typechange: %s" -msgstr "đổi-kiểu: %s" +#: wt-status.c:336 +msgid "new commits, " +msgstr "lần chuyển giao mới, " -#: wt-status.c:330 -#, c-format -msgid "unknown: %s" -msgstr "không hiểu: %s" +#: wt-status.c:338 +msgid "modified content, " +msgstr "nội dung bị sửa đổi, " -#: wt-status.c:333 -#, c-format -msgid "unmerged: %s" -msgstr "chưa hòa trộn: %s" +#: wt-status.c:340 +msgid "untracked content, " +msgstr "nội dung chưa được theo dõi, " -#: wt-status.c:336 +#: wt-status.c:357 #, c-format msgid "bug: unhandled diff status %c" -msgstr "lỗi: không lấy được trạng thái lệnh diff %c" +msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c" -#: wt-status.c:703 +#: wt-status.c:732 msgid "Submodules changed but not updated:" msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" -#: wt-status.c:705 +#: wt-status.c:734 msgid "Submodule changes to be committed:" -msgstr "Những mô-đun-con thay đổi đã được chuyển giao (commit):" +msgstr "Những mô-đun-con thay đổi đã được chuyển giao:" + +#: wt-status.c:836 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" +"Không động đến đường ở trên.\n" +"Mọi thứ phía dưới sẽ được xóa bỏ." -#: wt-status.c:848 +#: wt-status.c:899 msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:851 +#: wt-status.c:902 msgid " (fix conflicts and run \"git commit\")" -msgstr " (sửa các xung đột sau đó chạy \"git commit\")" +msgstr " (sửa các xung đột rồi chạy \"git commit\")" -#: wt-status.c:854 +#: wt-status.c:905 msgid "All conflicts fixed but you are still merging." msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn." -#: wt-status.c:857 +#: wt-status.c:908 msgid " (use \"git commit\" to conclude merge)" msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)" -#: wt-status.c:867 +#: wt-status.c:918 msgid "You are in the middle of an am session." msgstr "Bạn đang ở giữa của một phiên “am”." -#: wt-status.c:870 +#: wt-status.c:921 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:874 +#: wt-status.c:925 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")" -#: wt-status.c:876 +#: wt-status.c:927 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:878 +#: wt-status.c:929 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" -#: wt-status.c:938 wt-status.c:955 +#: wt-status.c:989 wt-status.c:1006 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "Bạn hiện nay đang thực hiện việc rebase nhánh “%s” trên “%s”." +msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:943 wt-status.c:960 +#: wt-status.c:994 wt-status.c:1011 msgid "You are currently rebasing." -msgstr "Bạn hiện nay đang thực hiện việc rebase (tái cấu trúc)." +msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)." -#: wt-status.c:946 +#: wt-status.c:997 msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " (sửa các xung đột và sau đó chạy lệnh \"git rebase --continue\")" +msgstr "" +" (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")" -#: wt-status.c:948 +#: wt-status.c:999 msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " (dùng \"git rebase --skip\" để bỏ qua lần vá này)" +msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)" -#: wt-status.c:950 +#: wt-status.c:1001 msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " (dùng \"git rebase --abort\" để check-out nhánh nguyên thủy)" +msgstr "" +" (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:963 +#: wt-status.c:1014 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git rebase --continue\")" +" (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --" +"continue\")" -#: wt-status.c:967 +#: wt-status.c:1018 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao (commit) " -"trong khi đang rebase nhánh “%s” trên “%s”." +"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi " +"đang “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:972 +#: wt-status.c:1023 msgid "You are currently splitting a commit during a rebase." msgstr "" "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc " "rebase." -#: wt-status.c:975 +#: wt-status.c:1026 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -" (Một khi thư mục làm việc của bạn đã gọn gàng, chạy \"git rebase --continue" -"\")" +" (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git " +"rebase --continue\")" -#: wt-status.c:979 +#: wt-status.c:1030 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao (commit) trong " -"khi đang rebase nhánh “%s” trên “%s”." +"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang " +"rebase nhánh “%s” trên “%s”." -#: wt-status.c:984 +#: wt-status.c:1035 msgid "You are currently editing a commit during a rebase." msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase." -#: wt-status.c:987 +#: wt-status.c:1038 msgid " (use \"git commit --amend\" to amend the current commit)" -msgstr "" -" (dùng \"git commit --amend\" để tu bổ lần chuyển giao (commit) hiện tại)" +msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)" -#: wt-status.c:989 +#: wt-status.c:1040 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -" (dùng \"git rebase --continue\" một khi bạn cảm thấy hài lòng về những " -"thay đổi của mình)" +" (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài " +"lòng về những thay đổi của mình)" -#: wt-status.c:999 +#: wt-status.c:1050 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s." -#: wt-status.c:1004 +#: wt-status.c:1055 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")" -#: wt-status.c:1007 +#: wt-status.c:1058 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --" "continue\")" -#: wt-status.c:1009 +#: wt-status.c:1060 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)" -#: wt-status.c:1018 +#: wt-status.c:1069 #, c-format msgid "You are currently reverting commit %s." msgstr "Bạn hiện nay đang thực hiện thao tác revert lần chuyển giao “%s”." -#: wt-status.c:1023 +#: wt-status.c:1074 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")" -#: wt-status.c:1026 +#: wt-status.c:1077 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")" -#: wt-status.c:1028 +#: wt-status.c:1079 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác revert)" -#: wt-status.c:1039 +#: wt-status.c:1090 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ " "nhánh “%s”." -#: wt-status.c:1043 +#: wt-status.c:1094 msgid "You are currently bisecting." msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)." -#: wt-status.c:1046 +#: wt-status.c:1097 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" -#: wt-status.c:1221 +#: wt-status.c:1272 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1228 +#: wt-status.c:1279 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1235 +#: wt-status.c:1286 msgid "HEAD detached at " msgstr "HEAD được tách rời tại " -#: wt-status.c:1237 +#: wt-status.c:1288 msgid "HEAD detached from " -msgstr "HEAD được tách rời từ" +msgstr "HEAD được tách rời từ " -#: wt-status.c:1240 +#: wt-status.c:1291 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1257 +#: wt-status.c:1308 msgid "Initial commit" -msgstr "Lần chuyển giao (commit) khởi đầu" +msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1271 +#: wt-status.c:1322 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1273 +#: wt-status.c:1324 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1277 +#: wt-status.c:1328 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1801,99 +1824,98 @@ msgstr "" "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n" "tự thêm các tập tin mới (xem “git help status”.." -#: wt-status.c:1283 +#: wt-status.c:1334 #, c-format msgid "Untracked files not listed%s" -msgstr "Những tập tin không bị theo vết không được liệt kê ra %s" +msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s" -#: wt-status.c:1285 +#: wt-status.c:1336 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" -#: wt-status.c:1291 +#: wt-status.c:1342 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1296 +#: wt-status.c:1347 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"không có thay đổi nào được thêm vào commit (dùng \"git add\" và/hoặc \"git " -"commit -a\")\n" +"không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc " +"\"git commit -a\")\n" -#: wt-status.c:1299 +#: wt-status.c:1350 #, c-format msgid "no changes added to commit\n" -msgstr "không có thay đổi nào được thêm vào lần chuyển giao (commit)\n" +msgstr "không có thay đổi nào được thêm vào để chuyển giao\n" -#: wt-status.c:1302 +#: wt-status.c:1353 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin " -"không được theo dấu vết hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" +"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " +"theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" -#: wt-status.c:1305 +#: wt-status.c:1356 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -"không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin " -"không được theo dấu vết hiện diện\n" +"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " +"theo dõi hiện diện\n" -#: wt-status.c:1308 +#: wt-status.c:1359 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -" không có gì để commit (tạo/sao-chép các tập tin và dùng \"git add\" để theo " -"dõi dấu vết)\n" +"không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để " +"đưa vào theo dõi)\n" -#: wt-status.c:1311 wt-status.c:1316 +#: wt-status.c:1362 wt-status.c:1367 #, c-format msgid "nothing to commit\n" -msgstr "không có gì để chuyển giao (commit)\n" +msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1314 +#: wt-status.c:1365 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -"không có gì để chuyển giao (commit) (dùng -u để bỏ các tập tin cần theo dấu " -"vết)\n" +"không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n" -#: wt-status.c:1318 +#: wt-status.c:1369 #, c-format msgid "nothing to commit, working directory clean\n" -msgstr "không có gì để chuyển giao (commit), thư mục làm việc sạch sẽ\n" +msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n" -#: wt-status.c:1427 +#: wt-status.c:1478 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1433 +#: wt-status.c:1484 msgid "Initial commit on " -msgstr "Lần chuyển giao (commit) khởi tạo trên " +msgstr "Lần chuyển giao khởi tạo trên " -#: wt-status.c:1463 +#: wt-status.c:1514 msgid "gone" msgstr "đã ra đi" -#: wt-status.c:1465 +#: wt-status.c:1516 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1468 wt-status.c:1471 +#: wt-status.c:1519 wt-status.c:1522 msgid "ahead " msgstr "phía trước " -#: wt-status.c:1473 +#: wt-status.c:1524 msgid ", behind " msgstr ", đằng sau " -#: compat/precompose_utf8.c:55 builtin/clone.c:350 +#: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" -msgstr "bỏ liên kết (unlink) %s không thành công" +msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" #: builtin/add.c:20 msgid "git add [options] [--] <pathspec>..." @@ -1935,12 +1957,12 @@ msgstr "" "Để thêm nội dung cho toàn bộ cây, chạy:\n" "\n" " git add %s :/\n" -" (hay git add %s :/)\n" +" (hoặc git add %s :/)\n" "\n" "Để hạn chế lệnh cho thư-mục hiện tại, chạy:\n" "\n" " git add %s .\n" -" (hay git add %s .)\n" +" (hoặc git add %s .)\n" "\n" "Với phiên bản hiện tại của Git, lệnh bị hạn chế cho thư-mục hiện tại.\n" @@ -1990,7 +2012,7 @@ msgstr "gỡ bỏ “%s”\n" #: builtin/add.c:237 msgid "Unstaged changes after refreshing the index:" msgstr "" -"Các thay đổi không được lưu trạng thái sau khi làm tươi mới lại bảng mục lục:" +"Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:" #: builtin/add.c:299 msgid "Could not read the index" @@ -2008,16 +2030,16 @@ msgstr "Không thể ghi ra miếng vá" #: builtin/add.c:319 #, c-format msgid "Could not stat '%s'" -msgstr "không thể lấy trạng thái về “%s”" +msgstr "không thể lấy thông tin thống kê về “%s”" #: builtin/add.c:321 msgid "Empty patch. Aborted." -msgstr "Miếng vá trống rỗng. Đã bỏ qua." +msgstr "Miếng vá trống rỗng. Nên bỏ qua." #: builtin/add.c:327 #, c-format msgid "Could not apply '%s'" -msgstr "Không thể apply (áp dụng miếng vá) “%s”" +msgstr "Không thể áp dụng miếng vá “%s”" #: builtin/add.c:337 msgid "The following paths are ignored by one of your .gitignore files:\n" @@ -2025,15 +2047,15 @@ msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\n" -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 #: builtin/rm.c:269 msgid "dry run" msgstr "chạy thử" #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "chi tiết" @@ -2043,7 +2065,7 @@ msgstr "sửa bằng cách tương tác" #: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272 msgid "select hunks interactively" -msgstr "chọn “hunks” một cách tương tác" +msgstr "chọn “hunks” theo kiểu tương tác" #: builtin/add.c:359 msgid "edit current diff and apply" @@ -2055,7 +2077,7 @@ msgstr "cho phép thêm các tập tin bị bỏ qua khác" #: builtin/add.c:361 msgid "update tracked files" -msgstr "cập nhật các tập tin được theo vết" +msgstr "cập nhật các tập tin được theo dõi" #: builtin/add.c:362 msgid "record only the fact that the path will be added later" @@ -2115,14 +2137,14 @@ msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" #: builtin/add.c:487 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Có lẽ bạn muốn là “git add .” phải không?\n" +msgstr "Có lẽ ý bạn là “git add .” phải không?\n" #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "Không thể ghi tập tin lưu bảng mục lục mới" @@ -2150,7 +2172,7 @@ msgstr "" #: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" -msgstr "thi hành biểu thức chính quy trả về %d cho kết xuất: %s" +msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s" #: builtin/apply.c:913 #, c-format @@ -2160,22 +2182,23 @@ msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d #: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply: git-diff sai - mong đợi /dev/null, đã nhận %s trên dòng %d" +msgstr "" +"git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d" #: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply: git-diff sai - tên tập tin mới mâu thuấn trên dòng %d" +msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d" #: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply: git-diff sai - tên tập tin cũ mâu thuấn trên dòng %d" +msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d" #: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: git-diff sai - cần /dev/null trên dòng %d" +msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d" #: builtin/apply.c:1422 #, c-format @@ -2244,12 +2267,12 @@ msgstr "miếng vá định dạng nhị phân không được nhận ra tại d #: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" -msgstr "vá chỉ với “garbage” tại dòng %d" +msgstr "vá chỉ với “rác” tại dòng %d" #: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" -msgstr "không thể đọc liên kết tượng trưng %s" +msgstr "không thể đọc liên kết mềm %s" #: builtin/apply.c:2080 #, c-format @@ -2271,7 +2294,7 @@ msgstr[1] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." #: builtin/apply.c:2818 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "Nội dung bị giảm xuống (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" +msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" #: builtin/apply.c:2824 #, c-format @@ -2279,7 +2302,7 @@ msgid "" "while searching for:\n" "%.*s" msgstr "" -"Trong khi đang tìm kiếm cho:\n" +"trong khi đang tìm kiếm cho:\n" "%.*s" #: builtin/apply.c:2843 @@ -2302,7 +2325,7 @@ msgstr "" #: builtin/apply.c:2973 #, c-format msgid "patch failed: %s:%ld" -msgstr "vá gặp lỗi: %s:%ld" +msgstr "gặp lỗi khi vá: %s:%ld" #: builtin/apply.c:3095 #, c-format @@ -2317,7 +2340,7 @@ msgstr "đọc %s gặp lỗi" #: builtin/apply.c:3174 builtin/apply.c:3396 #, c-format msgid "path %s has been renamed/deleted" -msgstr "đường dẫn %s đã bị xóa/đổi tên" +msgstr "đường dẫn %s đã bị xóa hoặc đổi tên" #: builtin/apply.c:3255 builtin/apply.c:3410 #, c-format @@ -2346,7 +2369,7 @@ msgstr "%s: sai kiểu" #: builtin/apply.c:3437 #, c-format msgid "%s has type %o, expected %o" -msgstr "%s có kiểu %o, mong chờ %o" +msgstr "%s có kiểu %o, cần %o" #: builtin/apply.c:3538 #, c-format @@ -2391,7 +2414,7 @@ msgstr "không thể gỡ bỏ %s từ mục lục" #: builtin/apply.c:3851 #, c-format msgid "corrupt patch for submodule %s" -msgstr "miếng vá sai hỏng cho mô-đun-con (subproject) %s" +msgstr "miếng vá sai hỏng cho mô-đun-con %s" #: builtin/apply.c:3855 #, c-format @@ -2401,7 +2424,7 @@ msgstr "không thể lấy trạng thái về tập tin %s mới hơn đã đư #: builtin/apply.c:3860 #, c-format msgid "unable to create backing store for newly created file %s" -msgstr "không thể tạo “backing store” cho tập tin được tạo mới hơn %s" +msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s" #: builtin/apply.c:3863 builtin/apply.c:3971 #, c-format @@ -2416,7 +2439,7 @@ msgstr "đang đóng tập tin “%s”" #: builtin/apply.c:3945 #, c-format msgid "unable to write file '%s' mode %o" -msgstr "không thể ghi vào tập tin “%s” chế độ (mode) %o" +msgstr "không thể ghi vào tập tin “%s” chế độ %o" #: builtin/apply.c:4032 #, c-format @@ -2459,7 +2482,7 @@ msgid "unable to read index file" msgstr "không thể đọc tập tin lưu bảng mục lục" #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 -#: builtin/fetch.c:77 +#: builtin/fetch.c:78 msgid "path" msgstr "đường-dẫn" @@ -2477,11 +2500,11 @@ msgstr "số" #: builtin/apply.c:4364 msgid "remove <num> leading slashes from traditional diff paths" -msgstr "gỡ bỏ <số> phần dẫn đầu (slashe) từ đường dẫn diff cổ điển" +msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển" #: builtin/apply.c:4367 msgid "ignore additions made by the patch" -msgstr "lờ đi phần phụ thêm tạo ra bởi miếng vá" +msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá" #: builtin/apply.c:4369 msgid "instead of applying the patch, output diffstat for the input" @@ -2541,7 +2564,7 @@ msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi #: builtin/apply.c:4397 builtin/apply.c:4400 msgid "ignore changes in whitespace when finding context" -msgstr "lờ đi sự thay đổi do khoảng trắng khi quét nội dung" +msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung" #: builtin/apply.c:4403 msgid "apply the patch in reverse" @@ -2653,8 +2676,7 @@ msgstr "thực hiện “git bisect next”" #: builtin/bisect--helper.c:19 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -"cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao (commit) " -"hiện hành" +"cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện hành" #: builtin/blame.c:27 msgid "git blame [options] [rev-opts] [rev] [--] file" @@ -2664,97 +2686,97 @@ msgstr "git blame [các-tùy-chọn] [rev-opts] [rev] [--] tập-tin" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-opts] được mô tả trong git-rev-list(1)" -#: builtin/blame.c:2248 +#: builtin/blame.c:2249 msgid "Show blame entries as we find them, incrementally" msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần" -#: builtin/blame.c:2249 +#: builtin/blame.c:2250 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)" -#: builtin/blame.c:2250 +#: builtin/blame.c:2251 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)" -#: builtin/blame.c:2251 +#: builtin/blame.c:2252 msgid "Show work cost statistics" msgstr "Hiển thị thống kê công sức làm việc" -#: builtin/blame.c:2252 +#: builtin/blame.c:2253 msgid "Show output score for blame entries" msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”" -#: builtin/blame.c:2253 +#: builtin/blame.c:2254 msgid "Show original filename (Default: auto)" msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" -#: builtin/blame.c:2254 +#: builtin/blame.c:2255 msgid "Show original linenumber (Default: off)" msgstr "Hiển thị số dòng gốc (Mặc định: off)" -#: builtin/blame.c:2255 +#: builtin/blame.c:2256 msgid "Show in a format designed for machine consumption" msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy" -#: builtin/blame.c:2256 +#: builtin/blame.c:2257 msgid "Show porcelain format with per-line commit information" msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng" -#: builtin/blame.c:2257 +#: builtin/blame.c:2258 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Dùng cùng chế độ xuất ra vóigit-annotate (Mặc định: off)" -#: builtin/blame.c:2258 +#: builtin/blame.c:2259 msgid "Show raw timestamp (Default: off)" msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)" -#: builtin/blame.c:2259 +#: builtin/blame.c:2260 msgid "Show long commit SHA1 (Default: off)" -msgstr "Hiển thị SHA1 của lần chuyển giao (commit) dạng dài (Mặc định: off)" +msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)" -#: builtin/blame.c:2260 +#: builtin/blame.c:2261 msgid "Suppress author name and timestamp (Default: off)" msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)" -#: builtin/blame.c:2261 +#: builtin/blame.c:2262 msgid "Show author email instead of name (Default: off)" msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)" -#: builtin/blame.c:2262 +#: builtin/blame.c:2263 msgid "Ignore whitespace differences" msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:2263 +#: builtin/blame.c:2264 msgid "Spend extra cycles to find better match" msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa" -#: builtin/blame.c:2264 +#: builtin/blame.c:2265 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”" -#: builtin/blame.c:2265 +#: builtin/blame.c:2266 msgid "Use <file>'s contents as the final image" msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng" -#: builtin/blame.c:2266 builtin/blame.c:2267 +#: builtin/blame.c:2267 builtin/blame.c:2268 msgid "score" msgstr "điểm số" -#: builtin/blame.c:2266 +#: builtin/blame.c:2267 msgid "Find line copies within and across files" msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin" -#: builtin/blame.c:2267 +#: builtin/blame.c:2268 msgid "Find line movements within and across files" msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "Process only line range n,m, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" @@ -2795,7 +2817,7 @@ msgstr "" #: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" -msgstr "Không thể tìm kiếm đối tượng chuyển giao (commit) cho “%s”" +msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s”" #: builtin/branch.c:172 #, c-format @@ -2816,7 +2838,7 @@ msgstr "không thể dùng tùy chọn -a với -d" #: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" -msgstr "Không thể tìm kiếm đối tượng chuyển giao (commit) cho HEAD" +msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD" #: builtin/branch.c:227 #, c-format @@ -2856,302 +2878,300 @@ msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n" #: builtin/branch.c:366 #, c-format msgid "branch '%s' does not point at a commit" -msgstr "nhánh “%s” không chỉ đến một lần chuyển giao (commit) nào cả" +msgstr "nhánh “%s” không chỉ đến một lần chuyển giao nào cả" -#: builtin/branch.c:453 +#: builtin/branch.c:454 #, c-format msgid "[%s: gone]" msgstr "[%s: đã ra đi]" -#: builtin/branch.c:456 +#: builtin/branch.c:459 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s: behind %d]" msgstr "[%s: đằng sau %d]" -#: builtin/branch.c:461 +#: builtin/branch.c:466 #, c-format msgid "[behind %d]" msgstr "[đằng sau %d]" -#: builtin/branch.c:465 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: phía trước %d]" -#: builtin/branch.c:467 +#: builtin/branch.c:472 #, c-format msgid "[ahead %d]" msgstr "[phía trước %d]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: trước %d, sau %d]" -#: builtin/branch.c:473 +#: builtin/branch.c:478 #, c-format msgid "[ahead %d, behind %d]" msgstr "[trước %d, sau %d]" -#: builtin/branch.c:496 +#: builtin/branch.c:502 msgid " **** invalid ref ****" -msgstr " **** tham chiếu sai ****" +msgstr " **** tham chiếu không hợp lệ ****" -#: builtin/branch.c:588 +#: builtin/branch.c:594 #, c-format msgid "(no branch, rebasing %s)" msgstr "(không nhánh, đang rebase %s)" -#: builtin/branch.c:591 +#: builtin/branch.c:597 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(không nhánh, bisect được bắt đầu tại %s)" -#: builtin/branch.c:594 +#: builtin/branch.c:600 #, c-format msgid "(detached from %s)" msgstr "(được tách rời từ %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(không nhánh)" -#: builtin/branch.c:643 +#: builtin/branch.c:649 #, c-format msgid "object '%s' does not point to a commit" -msgstr "đối tượng “%s” không chỉ đến một lần chuyển giao (commit) nào cả" +msgstr "đối tượng “%s” không chỉ đến một lần chuyển giao nào cả" -#: builtin/branch.c:675 +#: builtin/branch.c:681 msgid "some refs could not be read" msgstr "một số tham chiếu đã không thể đọc được" -#: builtin/branch.c:688 +#: builtin/branch.c:694 msgid "cannot rename the current branch while not on any." msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả." -#: builtin/branch.c:698 +#: builtin/branch.c:704 #, c-format msgid "Invalid branch name: '%s'" msgstr "Tên nhánh không hợp lệ: “%s”" -#: builtin/branch.c:713 +#: builtin/branch.c:719 msgid "Branch rename failed" msgstr "Gặp lỗi khi đổi tên nhánh" -#: builtin/branch.c:717 +#: builtin/branch.c:723 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Đã đổi tên nhánh khuyết danh “%s” đi" -#: builtin/branch.c:721 +#: builtin/branch.c:727 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!" -#: builtin/branch.c:728 +#: builtin/branch.c:734 msgid "Branch is renamed, but update of config-file failed" msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi" -#: builtin/branch.c:743 +#: builtin/branch.c:749 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: builtin/branch.c:767 +#: builtin/branch.c:773 #, c-format msgid "could not write branch description template: %s" msgstr "không thể ghi vào mẫu mô tả nhánh: %s" -#: builtin/branch.c:797 +#: builtin/branch.c:803 msgid "Generic options" msgstr "Tùy chọn chung" -#: builtin/branch.c:799 +#: builtin/branch.c:805 msgid "show hash and subject, give twice for upstream branch" msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn" -#: builtin/branch.c:800 +#: builtin/branch.c:806 msgid "suppress informational messages" msgstr "Thu hồi các thông điệp thông tin" -#: builtin/branch.c:801 +#: builtin/branch.c:807 msgid "set up tracking mode (see git-pull(1))" -msgstr "cài đặt chế độ theo vết (xem git-pull(1))" +msgstr "cài đặt chế độ theo dõi (xem git-pull(1))" -#: builtin/branch.c:803 +#: builtin/branch.c:809 msgid "change upstream info" -msgstr "thay đổi thông tin thượng nguồn (upstream)" +msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "use colored output" msgstr "sử dụng kết xuất có tô màu" -#: builtin/branch.c:808 +#: builtin/branch.c:814 msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "commit" -#: builtin/branch.c:812 builtin/branch.c:818 +#: builtin/branch.c:818 builtin/branch.c:824 msgid "print only branches that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" -#: builtin/branch.c:824 +#: builtin/branch.c:830 msgid "Specific git-branch actions:" msgstr "Hành động git-branch:" -#: builtin/branch.c:825 +#: builtin/branch.c:831 msgid "list both remote-tracking and local branches" msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ" -#: builtin/branch.c:827 +#: builtin/branch.c:833 msgid "delete fully merged branch" msgstr "xóa một cách đầy đủ nhánh đã hòa trộn" -#: builtin/branch.c:828 +#: builtin/branch.c:834 msgid "delete branch (even if not merged)" msgstr "xoá nhánh (cho dù là chưa được hòa trộn)" -#: builtin/branch.c:829 +#: builtin/branch.c:835 msgid "move/rename a branch and its reflog" msgstr "di chuyển hay đổi tên một nhánh và reflog của nó" -#: builtin/branch.c:830 +#: builtin/branch.c:836 msgid "move/rename a branch, even if target exists" -msgstr "di chuyển hoặc đổi tên một nhánh, thậm chí cả khi đích đã có sẵn" +msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn" -#: builtin/branch.c:831 +#: builtin/branch.c:837 msgid "list branch names" msgstr "liệt kê các tên nhánh" -#: builtin/branch.c:832 +#: builtin/branch.c:838 msgid "create the branch's reflog" msgstr "tạo reflog của nhánh" -#: builtin/branch.c:834 +#: builtin/branch.c:840 msgid "edit the description for the branch" msgstr "sửa mô tả cho nhánh" -#: builtin/branch.c:835 +#: builtin/branch.c:841 msgid "force creation (when already exists)" -msgstr "ép buộc tạo (khi đã sẵn tồn tại rồi)" +msgstr "ép buộc tạo (khi đã có nhánh cùng tên)" -#: builtin/branch.c:838 +#: builtin/branch.c:844 msgid "print only not merged branches" msgstr "chỉ hiển thị các nhánh chưa được hòa trộn" -#: builtin/branch.c:844 +#: builtin/branch.c:850 msgid "print only merged branches" msgstr "chỉ hiển thị các nhánh được hòa trộn" -#: builtin/branch.c:848 +#: builtin/branch.c:854 msgid "list branches in columns" msgstr "liệt kê các nhánh trong các cột" -#: builtin/branch.c:861 +#: builtin/branch.c:867 msgid "Failed to resolve HEAD as a valid ref." msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu (ref) hợp lệ." -#: builtin/branch.c:866 builtin/clone.c:629 +#: builtin/branch.c:872 builtin/clone.c:635 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:890 +#: builtin/branch.c:896 msgid "--column and --verbose are incompatible" -msgstr "--column và --verbose xung khắc nhau" +msgstr "tùy chọn --column và --verbose xung khắc nhau" -#: builtin/branch.c:896 builtin/branch.c:935 +#: builtin/branch.c:902 builtin/branch.c:941 msgid "branch name required" msgstr "cần tên nhánh" -#: builtin/branch.c:911 +#: builtin/branch.c:917 msgid "Cannot give description to detached HEAD" msgstr "Không thể đưa ra mô tả HEAD đã tách rời" -#: builtin/branch.c:916 +#: builtin/branch.c:922 msgid "cannot edit description of more than one branch" msgstr "không thể sửa mô tả cho nhiều hơn một nhánh" -#: builtin/branch.c:923 +#: builtin/branch.c:929 #, c-format msgid "No commit on branch '%s' yet." msgstr "Vẫn chưa chuyển giao trên nhánh “%s”." -#: builtin/branch.c:926 +#: builtin/branch.c:932 #, c-format msgid "No branch named '%s'." msgstr "Không có nhánh nào có tên “%s”." -#: builtin/branch.c:941 +#: builtin/branch.c:947 msgid "too many branches for a rename operation" msgstr "quá nhiều nhánh dành cho thao tác đổi tên" -#: builtin/branch.c:946 +#: builtin/branch.c:952 msgid "too many branches to set new upstream" -msgstr "quá nhiều nhánh được đặt cho thượng nguồn (upstream) mới" +msgstr "quá nhiều nhánh được đặt cho thượng nguồn mới" -#: builtin/branch.c:950 +#: builtin/branch.c:956 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -"không thể đặt thượng nguồn (upstream) của HEAD thành %s khi mà nó chẳng chỉ " -"đến nhánh nào cả." +"không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh " +"nào cả." -#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 #, c-format msgid "no such branch '%s'" msgstr "không có nhánh nào như thế “%s”" -#: builtin/branch.c:957 +#: builtin/branch.c:963 #, c-format msgid "branch '%s' does not exist" -msgstr "nhánh “%s” chưa sẵn có" +msgstr "chưa có nhánh “%s”" -#: builtin/branch.c:969 +#: builtin/branch.c:975 msgid "too many branches to unset upstream" -msgstr "quá nhiều nhánh để bỏ đặt ngược dòng (upstream)" +msgstr "quá nhiều nhánh để bỏ đặt thượng nguồn" -#: builtin/branch.c:973 +#: builtin/branch.c:979 msgid "could not unset upstream of HEAD when it does not point to any branch." -msgstr "" -"không thể bỏ đặt ngược dòng (upstream) của HEAD không chỉ đến một nhánh nào " -"cả." +msgstr "không thể bỏ đặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả." -#: builtin/branch.c:979 +#: builtin/branch.c:985 #, c-format msgid "Branch '%s' has no upstream information" -msgstr "Nhánh “%s” không có thông tin thượng nguồn (upstream)" +msgstr "Nhánh “%s” không có thông tin thượng nguồn" -#: builtin/branch.c:994 +#: builtin/branch.c:999 msgid "it does not make sense to create 'HEAD' manually" -msgstr "không hợp lý khi tạo “HEAD” thủ công " +msgstr "không hợp lý khi tạo “HEAD” thủ công" -#: builtin/branch.c:1000 +#: builtin/branch.c:1005 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không hợp lý đối với tên " "nhánh" -#: builtin/branch.c:1003 +#: builtin/branch.c:1008 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -"Cờ --set-upstream bị phản đối và sẽ bị xóa bỏ. Nên dùng --track hoặc --set-" +"Cờ --set-upstream đã lạc hậu và sẽ bị xóa bỏ. Nên dùng --track hoặc --set-" "upstream-to\n" -#: builtin/branch.c:1020 +#: builtin/branch.c:1025 #, c-format msgid "" "\n" @@ -3162,12 +3182,12 @@ msgstr "" "Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n" "\n" -#: builtin/branch.c:1021 +#: builtin/branch.c:1026 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1022 +#: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3179,50 +3199,50 @@ msgstr "“%s” tốt\n" #: builtin/bundle.c:56 msgid "Need a repository to create a bundle." -msgstr "Cần một kho chứa để mà tạo một bundle." +msgstr "Cần một kho chứa để có thể tạo một bundle." #: builtin/bundle.c:60 msgid "Need a repository to unbundle." -msgstr "Cần một kho chứa để mà bung một bundle." +msgstr "Cần một kho chứa để có thể giải nén một bundle." -#: builtin/cat-file.c:312 +#: builtin/cat-file.c:328 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<kiểu>|--textconv) <đối tượng>" -#: builtin/cat-file.c:313 +#: builtin/cat-file.c:329 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <danh-sách-đối-tượng>" -#: builtin/cat-file.c:350 +#: builtin/cat-file.c:366 msgid "<type> can be one of: blob, tree, commit, tag" -msgstr "<kiểu> là một trong số: blob, tree, commit, tag" +msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag" -#: builtin/cat-file.c:351 +#: builtin/cat-file.c:367 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:352 +#: builtin/cat-file.c:368 msgid "show object size" msgstr "hiển thị kích thước đối tượng" -#: builtin/cat-file.c:354 +#: builtin/cat-file.c:370 msgid "exit with zero when there's no error" msgstr "thoát với 0 khi không có lỗi" -#: builtin/cat-file.c:355 +#: builtin/cat-file.c:371 msgid "pretty-print object's content" msgstr "in nội dung đối tượng dạng dễ đọc" -#: builtin/cat-file.c:357 +#: builtin/cat-file.c:373 msgid "for blob objects, run textconv on object's content" msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng" -#: builtin/cat-file.c:359 +#: builtin/cat-file.c:375 msgid "show info and content of objects fed from the standard input" msgstr "" "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:362 +#: builtin/cat-file.c:378 msgid "show info about objects fed from the standard input" msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn" @@ -3241,7 +3261,7 @@ msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" -msgstr "chỉ sử dụng .gitattributes từ bảng mục lục" +msgstr "chỉ dùng .gitattributes từ bảng mục lục" #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" @@ -3251,7 +3271,7 @@ msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" msgid "terminate input and output records by a NUL character" msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -3331,7 +3351,7 @@ msgstr "cập nhật thông tin thống kê trong tập tin lưu bảng mục l #: builtin/checkout-index.c:200 msgid "read list of paths from the standard input" -msgstr " đọc danh sách đường dẫn từ thiết bị nhập chuẩn" +msgstr "đọc danh sách đường dẫn từ đầu vào tiêu chuẩn" #: builtin/checkout-index.c:202 msgid "write the content to temporary files" @@ -3347,7 +3367,7 @@ msgstr "khi tạo các tập tin, nối thêm <chuỗi>" #: builtin/checkout-index.c:207 msgid "copy out the files from named stage" -msgstr "sao chép ra các tập tin từ trạng thái được đặt tên" +msgstr "sao chép ra các tập tin từ bệ phóng có tên" #: builtin/checkout.c:25 msgid "git checkout [options] <branch>" @@ -3391,12 +3411,12 @@ msgstr "Không thể thêm kết quả hòa trộn cho “%s”" #: builtin/checkout.c:241 #, c-format msgid "'%s' cannot be used with updating paths" -msgstr "“%s” không thể được sử dụng với các đường dẫn cập nhật" +msgstr "không được dùng “%s” với các đường dẫn cập nhật" #: builtin/checkout.c:244 builtin/checkout.c:247 #, c-format msgid "'%s' cannot be used with %s" -msgstr "“%s” không thể được dùng cùng với %s" +msgstr "không được dùng “%s” với %s" #: builtin/checkout.c:250 #, c-format @@ -3415,7 +3435,7 @@ msgstr "đường dẫn “%s” không được hòa trộn" #: builtin/checkout.c:473 msgid "you need to resolve your current index first" -msgstr "bạn cần phải phân giải bảng mục lục hiện tại của bạn trước đã" +msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã" #: builtin/checkout.c:594 #, c-format @@ -3470,14 +3490,14 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Cảnh báo: bạn đã rời bỏ %d lần chuyển giao (commit) lại đằng sau, không được " -"kết nối đến\n" +"Cảnh báo: bạn đã rời bỏ %d lần chuyển giao lại đằng sau, không được kết nối " +"đến\n" "bất kỳ nhánh nào của bạn:\n" "\n" "%s\n" msgstr[1] "" -"Cảnh báo: bạn đã rời bỏ %d lần chuyển giao (commit) lại đằng sau, không được " -"kết nối đến\n" +"Cảnh báo: bạn đã rời bỏ %d lần chuyển giao lại đằng sau, không được kết nối " +"đến\n" "bất kỳ nhánh nào của bạn:\n" "\n" "%s\n" @@ -3504,7 +3524,7 @@ msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt" #: builtin/checkout.c:764 msgid "Previous HEAD position was" -msgstr "Vị trí kế trước của HEAD là" +msgstr "Vị trí trước kia của HEAD là" #: builtin/checkout.c:791 builtin/checkout.c:1028 msgid "You are on a branch yet to be born" @@ -3518,13 +3538,13 @@ msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d." #: builtin/checkout.c:974 #, c-format msgid "invalid reference: %s" -msgstr "tham chiếu sai: %s" +msgstr "tham chiếu không hợp lệ: %s" #. case (1): want a tree #: builtin/checkout.c:1003 #, c-format msgid "reference is not a tree: %s" -msgstr "tham chiếu không phải là một cây (tree):%s" +msgstr "tham chiếu không phải là một cây:%s" #: builtin/checkout.c:1042 msgid "paths cannot be used with switching branches" @@ -3539,7 +3559,7 @@ msgstr "“%s” không thể được sử dụng với các nhánh chuyển" #: builtin/checkout.c:1064 #, c-format msgid "'%s' cannot be used with '%s'" -msgstr "“%s” không thể được sử dụng với “%s”" +msgstr "“%s” không thể được dùng với “%s”" #: builtin/checkout.c:1069 #, c-format @@ -3547,7 +3567,7 @@ msgid "Cannot switch branch to a non-commit '%s'" msgstr "Không thể chuyển nhánh đến một non-commit “%s”" #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 -#: builtin/remote.c:169 builtin/remote.c:171 +#: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "nhánh" @@ -3557,7 +3577,7 @@ msgstr "tạo và checkout một nhánh mới" #: builtin/checkout.c:1094 msgid "create/reset and checkout a branch" -msgstr "create/reset và checkout một nhánh" +msgstr "tạo/đặt_lại và checkout một nhánh" #: builtin/checkout.c:1095 msgid "create reflog for new branch" @@ -3569,7 +3589,7 @@ msgstr "rời bỏ HEAD tại lần chuyển giao danh nghĩa" #: builtin/checkout.c:1097 msgid "set upstream info for new branch" -msgstr "đặt thông tin thượng nguồn (upstream) cho nhánh mới" +msgstr "đặt thông tin thượng nguồn cho nhánh mới" #: builtin/checkout.c:1099 msgid "new branch" @@ -3577,7 +3597,7 @@ msgstr "nhánh mới" #: builtin/checkout.c:1099 msgid "new unparented branch" -msgstr "nhánh mồ côi mới" +msgstr "nhánh không cha mới" #: builtin/checkout.c:1100 msgid "checkout our version for unmerged files" @@ -3597,21 +3617,21 @@ msgstr "ép buộc lấy ra (checkout) (bỏ đi những thay đổi nội bộ) msgid "perform a 3-way merge with the new branch" msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" -#: builtin/checkout.c:1106 builtin/merge.c:232 +#: builtin/checkout.c:1106 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 msgid "style" msgstr "kiểu" #: builtin/checkout.c:1108 msgid "conflict style (merge or diff3)" -msgstr "xung đột kiểu (hòa trộn hay diff3)" +msgstr "xung đột kiểu (hòa trộn hoặc diff3)" #: builtin/checkout.c:1111 msgid "do not limit pathspecs to sparse entries only" -msgstr "không giới hạn pathspecs chỉ thành các mục thưa thớt" +msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt" #: builtin/checkout.c:1113 msgid "second guess 'git checkout no-such-branch'" @@ -3619,7 +3639,7 @@ msgstr "gợi ý thứ hai “git checkout không-nhánh-nào-như-vậy”" #: builtin/checkout.c:1136 msgid "-b, -B and --orphan are mutually exclusive" -msgstr "Tùy chọn -b, -B và --orphan loại từ lẫn nhau" +msgstr "Các tùy chọn -b, -B và --orphan loại từ lẫn nhau" #: builtin/checkout.c:1153 msgid "--track needs a branch name" @@ -3641,7 +3661,7 @@ msgid "" msgstr "" "Không thể cập nhật và chuyển thành nhánh “%s” cùng lúc\n" "Bạn đã có ý định checkout “%s” cái mà không thể được phân giải như là lần " -"chuyển giao (commit)?" +"chuyển giao?" #: builtin/checkout.c:1209 #, c-format @@ -3727,7 +3747,7 @@ msgstr "Hả (%s)?" #: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " -msgstr "Mẫu để lọc các tập tin cần lờ đi đầu vào>>" +msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> " #: builtin/clean.c:696 #, c-format @@ -3741,7 +3761,7 @@ msgstr "Chọn mục muốn xóa" #: builtin/clean.c:757 #, c-format msgid "remove %s? " -msgstr "gỡ bỏ “%s”?" +msgstr "gỡ bỏ “%s”? " #: builtin/clean.c:782 msgid "Bye." @@ -3793,14 +3813,14 @@ msgstr "ép buộc" #: builtin/clean.c:877 msgid "interactive cleaning" -msgstr "sửa bằng cách tương tác" +msgstr "dọn bằng kiểu tương tác" #: builtin/clean.c:879 msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "mẫu" @@ -3840,10 +3860,10 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [các-tùy-chọn] [--] <kho> [<t.mục>]" -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 -#: builtin/push.c:474 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 +#: builtin/push.c:521 msgid "force progress reporting" -msgstr "ép buộc báo cáo tiến trình" +msgstr "ép buộc báo cáo tiến triển công việc" #: builtin/clone.c:66 msgid "don't create a checkout" @@ -3851,11 +3871,11 @@ msgstr "không tạo một checkout" #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 msgid "create a bare repository" -msgstr "tạo kho thuần (bare)" +msgstr "tạo kho thuần" #: builtin/clone.c:71 msgid "create a mirror repository (implies bare)" -msgstr "tạo kho bản sao (mirror) (ngụ ý là bare)" +msgstr "tạo kho bản sao (ý là kho thuần)" #: builtin/clone.c:73 msgid "to clone from a local repository" @@ -3875,7 +3895,7 @@ msgstr "khởi tạo mô-đun-con trong bản sao" #: builtin/clone.c:82 builtin/init-db.c:485 msgid "template-directory" -msgstr "thư-mục-tạm" +msgstr "thư-mục-mẫu" #: builtin/clone.c:83 builtin/init-db.c:486 msgid "directory from which templates will be used" @@ -3891,19 +3911,19 @@ msgstr "tên" #: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" -msgstr "dùng <tên> thay vì “origin” để theo dõi thượng nguồn (uptream)" +msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn" #: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "lấy ra nhánh (checkout <nhánh>) thay vì HEAD của máy chủ" +msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" #: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "đường dẫn đến git-upload-pack trên máy chủ" -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 msgid "depth" -msgstr "độ sâu" +msgstr "độ-sâu" #: builtin/clone.c:93 msgid "create a shallow clone of that depth" @@ -3911,7 +3931,7 @@ msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho" #: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" -msgstr "nhân bản (clone) chỉ một nhánh, HEAD hoặc --branch" +msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch" #: builtin/clone.c:96 builtin/init-db.c:494 msgid "gitdir" @@ -3923,7 +3943,7 @@ msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm v #: builtin/clone.c:98 msgid "key=value" -msgstr "khóa=giá trị" +msgstr "khóa=giá_trị" #: builtin/clone.c:99 msgid "set config inside the new repository" @@ -3934,42 +3954,52 @@ msgstr "đặt cấu hình bên trong một kho chứa mới" msgid "reference repository '%s' is not a local repository." msgstr "kho tham chiếu “%s” không phải là một kho nội bộ." -#: builtin/clone.c:315 +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "kho tham chiếu “%s” là nông" + +#: builtin/clone.c:259 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "kho tham chiếu “%s” bị cấy ghép" + +#: builtin/clone.c:321 #, c-format msgid "failed to create directory '%s'" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/clone.c:317 builtin/diff.c:77 +#: builtin/clone.c:323 builtin/diff.c:83 #, c-format msgid "failed to stat '%s'" msgstr "gặp lỗi stat (lấy trạng thái về) “%s”" -#: builtin/clone.c:319 +#: builtin/clone.c:325 #, c-format msgid "%s exists and is not a directory" msgstr "%s tồn tại nhưng không phải là một thư mục" -#: builtin/clone.c:333 +#: builtin/clone.c:339 #, c-format msgid "failed to stat %s\n" -msgstr "lỗi stat (lấy trạng thái về) %s\n" +msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n" -#: builtin/clone.c:355 +#: builtin/clone.c:361 #, c-format msgid "failed to create link '%s'" msgstr "gặp lỗi khi tạo được liên kết mềm %s" -#: builtin/clone.c:359 +#: builtin/clone.c:365 #, c-format msgid "failed to copy file to '%s'" -msgstr "gặp lỗi khi chép tập tin tới “%s”" +msgstr "gặp lỗi khi sao chép tập tin và “%s”" -#: builtin/clone.c:382 builtin/clone.c:559 +#: builtin/clone.c:388 builtin/clone.c:565 #, c-format msgid "done.\n" msgstr "hoàn tất.\n" -#: builtin/clone.c:395 +#: builtin/clone.c:401 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -3979,99 +4009,108 @@ msgstr "" "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n" "và thử checkout với lệnh “git checkout -f HEAD”\n" -#: builtin/clone.c:474 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." -#: builtin/clone.c:554 +#: builtin/clone.c:560 #, c-format msgid "Checking connectivity... " -msgstr "Đang kiểm tra kết nối..." +msgstr "Đang kiểm tra kết nối... " -#: builtin/clone.c:557 +#: builtin/clone.c:563 msgid "remote did not send all necessary objects" msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" -#: builtin/clone.c:620 +#: builtin/clone.c:626 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể checkout.\n" -#: builtin/clone.c:651 +#: builtin/clone.c:657 msgid "unable to checkout working tree" msgstr "không thể lấy ra (checkout) cây làm việc" -#: builtin/clone.c:759 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:763 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." -#: builtin/clone.c:774 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "tùy chọn --bare và --origin %s xung khắc nhau." -#: builtin/clone.c:777 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." -#: builtin/clone.c:790 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:795 +#: builtin/clone.c:802 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:797 +#: builtin/clone.c:805 +msgid "source repository is shallow, ignoring --local" +msgstr "kho nguồn là nông, nên bỏ qua --local" + +#: builtin/clone.c:810 msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:807 +#: builtin/clone.c:814 builtin/fetch.c:1119 +#, c-format +msgid "depth %s is not a positive number" +msgstr "độ sâu %s không phải là một số nguyên dương" + +#: builtin/clone.c:824 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng." -#: builtin/clone.c:817 +#: builtin/clone.c:834 #, c-format msgid "working tree '%s' already exists." msgstr "cây làm việc “%s” đã sẵn tồn tại rồi." -#: builtin/clone.c:830 builtin/clone.c:842 +#: builtin/clone.c:847 builtin/clone.c:859 #, c-format msgid "could not create leading directories of '%s'" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" -#: builtin/clone.c:833 +#: builtin/clone.c:850 #, c-format msgid "could not create work tree dir '%s'." msgstr "không thể tạo cây thư mục làm việc dir “%s”." -#: builtin/clone.c:852 +#: builtin/clone.c:869 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Đang nhân bản thành kho chứa bare “%s”...\n" -#: builtin/clone.c:854 +#: builtin/clone.c:871 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”...\n" -#: builtin/clone.c:888 +#: builtin/clone.c:906 #, c-format msgid "Don't know how to clone %s" msgstr "Không biết làm cách nào để nhân bản (clone) %s" -#: builtin/clone.c:939 builtin/clone.c:947 +#: builtin/clone.c:957 builtin/clone.c:965 #, c-format msgid "Remote branch %s not found in upstream %s" -msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn (upstream) %s" +msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" -#: builtin/clone.c:950 +#: builtin/clone.c:968 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -4149,8 +4188,8 @@ msgid "" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"Bạn đã yêu cầu amend (tu bổ) phần lớn các lần chuyển giao (commit) gần đây, " -"nhưng làm như thế\n" +"Bạn đã yêu cầu amend (“tu bổ”) phần lớn các lần chuyển giao gần đây, nhưng " +"làm như thế\n" "có thể làm cho nó trở nên trống rỗng. Bạn có thể lặp lại lệnh của mình bằng " "--allow-empty,\n" "hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n" @@ -4166,7 +4205,7 @@ msgid "" msgstr "" "Lần cherry-pick trước hiện nay trống rỗng, có lẽ là bởi vì sự phân giải xung " "đột.\n" -"Nếu bạn vẫn muốn chuyển giao nó cho dù thế nào đi nữa, sử dụng:\n" +"Nếu bạn vẫn muốn chuyển giao nó cho dù thế nào đi nữa, hãy dùng:\n" "\n" " git commit --allow-empty\n" "\n" @@ -4201,7 +4240,7 @@ msgstr "không thể tạo bảng mục lục tạm thời" #: builtin/commit.c:335 msgid "interactive add failed" -msgstr "việc thêm tương tác gặp lỗi" +msgstr "gặp lỗi khi thêm bằng cách tương" #: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439 msgid "unable to write new_index file" @@ -4210,14 +4249,12 @@ msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)" #: builtin/commit.c:420 msgid "cannot do a partial commit during a merge." msgstr "" -"không thể thực hiện việc chuyển giao (commit) cục bộ trong khi đang được hòa " -"trộn." +"không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn." #: builtin/commit.c:422 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -"không thể thực hiện việc chuyển giao (commit) bộ phận trong khi đang cherry-" -"pick." +"không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick." #: builtin/commit.c:432 msgid "cannot read the index" @@ -4230,11 +4267,11 @@ msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" #: builtin/commit.c:543 builtin/commit.c:549 #, c-format msgid "invalid commit: %s" -msgstr "lần chuyển giao (commit) không hợp lệ: %s" +msgstr "lần chuyển giao không hợp lệ: %s" #: builtin/commit.c:571 msgid "malformed --author parameter" -msgstr "đối số --author bị dị hình" +msgstr "đối số cho --author bị dị hình" #: builtin/commit.c:591 #, c-format @@ -4262,7 +4299,7 @@ msgstr "không đọc được tệp nhật ký “%s”" #: builtin/commit.c:654 msgid "commit has empty message" -msgstr "lần chuyển giao (commit) có ghi chú trống rỗng" +msgstr "lần chuyển giao có ghi chú trống rỗng" #: builtin/commit.c:670 msgid "could not read MERGE_MSG" @@ -4279,7 +4316,7 @@ msgstr "Không thể đọc “%s”." #: builtin/commit.c:749 msgid "could not write commit template" -msgstr "không thể ghi mẫu commit" +msgstr "không thể ghi mẫu chuyển giao" #: builtin/commit.c:760 #, c-format @@ -4320,7 +4357,7 @@ msgstr "" "Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng " "được\n" "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " -"chuyển giao (commit).\n" +"chuyển giao.\n" #: builtin/commit.c:782 #, c-format @@ -4332,7 +4369,7 @@ msgstr "" "Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng " "được\n" "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" -"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao (commit).\n" +"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" #: builtin/commit.c:795 #, c-format @@ -4342,11 +4379,11 @@ msgstr "%sTác giả: %s" #: builtin/commit.c:802 #, c-format msgid "%sCommitter: %s" -msgstr "%sNgười chuyển giao (commit): %s" +msgstr "%sNgười chuyển giao: %s" #: builtin/commit.c:822 msgid "Cannot read index" -msgstr "không đọc được bảng mục lục" +msgstr "Không đọc được bảng mục lục" #: builtin/commit.c:865 msgid "Error building trees" @@ -4365,7 +4402,7 @@ msgstr "Không tìm thấy tác giả có sẵn với “%s”" #: builtin/commit.c:997 builtin/commit.c:1237 #, c-format msgid "Invalid untracked files mode '%s'" -msgstr "Chế độ cho các tập tin không bị theo vết không hợp lệ “%s”" +msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”" #: builtin/commit.c:1034 msgid "--long and -z are incompatible" @@ -4377,18 +4414,18 @@ msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợ #: builtin/commit.c:1075 msgid "You have nothing to amend." -msgstr "Không có gì để amend (tu bổ) cả." +msgstr "Không có gì để mà “tu bổ” cả." #: builtin/commit.c:1078 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -"Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện amend (tu bổ)." +"Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”." #: builtin/commit.c:1080 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện amend (tu " -"bổ)." +"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu " +"bổ”." #: builtin/commit.c:1083 msgid "Options --squash and --fixup cannot be used together" @@ -4396,7 +4433,8 @@ msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng v #: builtin/commit.c:1093 msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "Chỉ một tùy chọn trong số -c/-C/-F/--fixup được sử dụng" +msgstr "" +"Chỉ được dùng một trong số tùy chọn trong số các tùy chọn -c/-C/-F/--fixup" #: builtin/commit.c:1095 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." @@ -4419,7 +4457,7 @@ msgstr "Không đường dẫn với các tùy chọn --include/--only không h #: builtin/commit.c:1124 msgid "Clever... amending the last one with dirty index." -msgstr "Giỏi... tu bổ cái cuối với bảng mục lục bẩn." +msgstr "Giỏi... “tu bổ” cái cuối với bảng mục lục bẩn." #: builtin/commit.c:1126 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." @@ -4444,7 +4482,7 @@ msgstr "hiển thị trạng thái ở dạng súc tích" msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" @@ -4489,7 +4527,7 @@ msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong c #: builtin/commit.c:1340 msgid "couldn't look up newly created commit" -msgstr "không thể tìm thấy lần chuyển giao (commit) mới hơn đã được tạo" +msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo" #: builtin/commit.c:1342 msgid "could not parse newly created commit" @@ -4528,31 +4566,30 @@ msgstr "tác giả" msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1458 builtin/gc.c:260 +#: builtin/commit.c:1458 builtin/gc.c:261 msgid "date" msgstr "ngày tháng" #: builtin/commit.c:1458 msgid "override date for commit" -msgstr "ghi đè ngày tháng cho commit" +msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 #: builtin/notes.c:562 builtin/tag.c:455 msgid "message" -msgstr "thông điệp" +msgstr "chú thích" #: builtin/commit.c:1459 msgid "commit message" -msgstr "chú thích của lần commit" +msgstr "chú thích của lần chuyển giao" #: builtin/commit.c:1460 msgid "reuse and edit message from specified commit" -msgstr "" -"dùng lại các ghi chú từ lần chuyển giao (commit) đã cho nhưng có cho sửa chữa" +msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa" #: builtin/commit.c:1461 msgid "reuse message from specified commit" -msgstr "dùng lại các ghi chú từ lần chuyển giao (commit) đã cho" +msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho" #: builtin/commit.c:1462 msgid "use autosquash formatted message to fixup specified commit" @@ -4572,7 +4609,7 @@ msgstr "" #: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86 msgid "add Signed-off-by:" -msgstr "thêm dòng Signed-off-by:" +msgstr "(nên dùng) thêm dòng Signed-off-by:" #: builtin/commit.c:1466 msgid "use specified template file" @@ -4592,15 +4629,15 @@ msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩ #: builtin/commit.c:1469 msgid "include status in commit message template" -msgstr "bao gồm các trạng thái ghi mẫu ghi chú chuyển giao (commit)" +msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao" -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 msgid "key id" -msgstr "id khóa" +msgstr "id của khóa" -#: builtin/commit.c:1471 builtin/merge.c:231 +#: builtin/commit.c:1471 builtin/merge.c:224 msgid "GPG sign commit" -msgstr "ký lần commit dùng GPG" +msgstr "ký lần chuyển giao dùng GPG" #. end commit message options #: builtin/commit.c:1474 @@ -4613,7 +4650,7 @@ msgstr "chuyển giao tất cả các tập tin có thay đổi" #: builtin/commit.c:1476 msgid "add specified files to index for commit" -msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao (commit)" +msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao" #: builtin/commit.c:1477 msgid "interactively add files" @@ -4637,7 +4674,7 @@ msgstr "hiển thị xem cái gì có thể được chuyển giao" #: builtin/commit.c:1492 msgid "amend previous commit" -msgstr "tu bổ (amend) lần commit trước" +msgstr "“tu bổ” (amend) lần commit trước" #: builtin/commit.c:1493 msgid "bypass post-rewrite hook" @@ -4655,7 +4692,7 @@ msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1567 builtin/merge.c:525 +#: builtin/commit.c:1567 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" @@ -4672,34 +4709,33 @@ msgstr "không thể đọc MERGE_MODE" #: builtin/commit.c:1600 #, c-format msgid "could not read commit message: %s" -msgstr "không thể đọc thông điệp (message) commit (lần chuyển giao): %s" +msgstr "không thể đọc phần chú thích (message) commit (lần chuyển giao): %s" -#: builtin/commit.c:1614 +#: builtin/commit.c:1611 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -"Đang bỏ qua việc chuyển giao (commit); bạn đã không biên soạn thông điệp " +"Đang bỏ qua việc chuyển giao; bạn đã không biên soạn phần chú thích " "(message).\n" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Aborting commit due to empty commit message.\n" -msgstr "" -"Đang bỏ qua lần chuyển giao (commit) bởi vì thông điệp của nó trống rỗng.\n" +msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n" -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 msgid "failed to write commit object" -msgstr "gặp lỗi khi ghi đối tượng chuyển giao (commit)" +msgstr "gặp lỗi khi ghi đối tượng chuyển giao" -#: builtin/commit.c:1655 +#: builtin/commit.c:1652 msgid "cannot lock HEAD ref" msgstr "không thể khóa HEAD ref (tham chiếu)" -#: builtin/commit.c:1659 +#: builtin/commit.c:1656 msgid "cannot update HEAD ref" msgstr "không thể cập nhật ref (tham chiếu) HEAD" -#: builtin/commit.c:1670 +#: builtin/commit.c:1667 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4707,8 +4743,8 @@ msgid "" msgstr "" "Kho chứa đã hoàn tất việc cập nhật, nhưng không thể ghi vào\n" "tập tin new_index (bảng mục lục mới). Hãy kiểm tra xem đĩa có bị đầy quá\n" -"hay quota (hạn nghạch đĩa cứng) bị vượt quá, và sau đó \"git reset HEAD\" để " -"khắc phục." +"hay quota (hạn nghạch) bị vượt quá, và sau đó \"git reset HEAD\" để khắc " +"phục." #: builtin/config.c:8 msgid "git config [options]" @@ -4720,7 +4756,7 @@ msgstr "Vị trí tập tin cấu hình" #: builtin/config.c:55 msgid "use global config file" -msgstr "đặt tập tin cấu hình cần toàn cục" +msgstr "dùng tập tin cấu hình toàn cục" #: builtin/config.c:56 msgid "use system config file" @@ -4780,11 +4816,11 @@ msgstr "gỡ bỏ mọi cái khớp: tên [value-regex]" #: builtin/config.c:69 msgid "rename section: old-name new-name" -msgstr "đổi tên chương: tên-cũ tên-mới" +msgstr "đổi tên phần: tên-cũ tên-mới" #: builtin/config.c:70 msgid "remove a section: name" -msgstr "gỡ bỏ chương: tên" +msgstr "gỡ bỏ phần: tên" #: builtin/config.c:71 msgid "list all" @@ -4915,7 +4951,7 @@ msgstr "" #: builtin/describe.c:384 #, c-format msgid "traversed %lu commits\n" -msgstr "đã xuyên %lu qua lần chuyển giao (commit)\n" +msgstr "đã xuyên %lu qua lần chuyển giao\n" #: builtin/describe.c:387 #, c-format @@ -4932,7 +4968,7 @@ msgstr "tìm các thẻ mà nó đến trước lần chuyển giao" #: builtin/describe.c:410 msgid "debug search strategy on stderr" -msgstr "chiến lược tìm kiếm trên đầu ra lỗi chuẩn stderr" +msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr" #: builtin/describe.c:411 msgid "use any ref" @@ -4960,9 +4996,9 @@ msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)" #: builtin/describe.c:421 msgid "only consider tags matching <pattern>" -msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" +msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" -#: builtin/describe.c:423 builtin/name-rev.c:322 +#: builtin/describe.c:423 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback" @@ -4986,31 +5022,31 @@ msgstr "Không tìm thấy các tên, không thể mô tả gì cả." msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty là xung khắc với các tùy chọn commit-ish" -#: builtin/diff.c:79 +#: builtin/diff.c:85 #, c-format msgid "'%s': not a regular file or symlink" msgstr "“%s”: không phải tập tin bình thường hay liên kết mềm" -#: builtin/diff.c:230 +#: builtin/diff.c:236 #, c-format msgid "invalid option: %s" msgstr "tùy chọn không hợp lệ: %s" -#: builtin/diff.c:307 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Không phải là kho git" -#: builtin/diff.c:350 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "đối tượng đã cho “%s” không hợp lệ." -#: builtin/diff.c:359 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”" -#: builtin/diff.c:366 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "đã cho đối tượng không thể nắm giữ “%s”." @@ -5071,146 +5107,155 @@ msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<các-tùy-chọn>]" -#: builtin/fetch.c:74 +#: builtin/fetch.c:75 msgid "fetch from all remotes" msgstr "lấy về từ tất cả các máy chủ" -#: builtin/fetch.c:76 +#: builtin/fetch.c:77 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó" -#: builtin/fetch.c:78 +#: builtin/fetch.c:79 msgid "path to upload pack on remote end" msgstr "đường dẫn đến gói (pack) tải lên trên máy chủ cuối" -#: builtin/fetch.c:79 +#: builtin/fetch.c:80 msgid "force overwrite of local branch" msgstr "ép buộc ghi đè lên nhánh nội bộ" -#: builtin/fetch.c:81 +#: builtin/fetch.c:82 msgid "fetch from multiple remotes" msgstr "lấy từ nhiều máy chủ cùng lúc" -#: builtin/fetch.c:83 +#: builtin/fetch.c:84 msgid "fetch all tags and associated objects" msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó" -#: builtin/fetch.c:85 +#: builtin/fetch.c:86 msgid "do not fetch all tags (--no-tags)" msgstr "không lấy tất cả các thẻ (--no-tags)" -#: builtin/fetch.c:87 +#: builtin/fetch.c:88 msgid "prune remote-tracking branches no longer on remote" msgstr "" "cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ " "nữa" -#: builtin/fetch.c:88 +#: builtin/fetch.c:89 msgid "on-demand" msgstr "khi-cần" -#: builtin/fetch.c:89 +#: builtin/fetch.c:90 msgid "control recursive fetching of submodules" msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con" -#: builtin/fetch.c:93 +#: builtin/fetch.c:94 msgid "keep downloaded pack" msgstr "giữ các gói đã tải về" -#: builtin/fetch.c:95 +#: builtin/fetch.c:96 msgid "allow updating of HEAD ref" msgstr "cho phép cập nhật th.chiếu HEAD" -#: builtin/fetch.c:98 +#: builtin/fetch.c:99 msgid "deepen history of shallow clone" msgstr "làm sâu hơn lịch sử của bản sao" -#: builtin/fetch.c:100 +#: builtin/fetch.c:101 msgid "convert to a complete repository" msgstr "chuyển đổi hoàn toàn sang kho git" -#: builtin/fetch.c:102 builtin/log.c:1197 +#: builtin/fetch.c:103 builtin/log.c:1197 msgid "dir" msgstr "tmục" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 msgid "prepend this to submodule path output" msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con" -#: builtin/fetch.c:106 +#: builtin/fetch.c:107 msgid "default mode for recursion" msgstr "chế độ mặc định cho đệ qui" -#: builtin/fetch.c:236 +#: builtin/fetch.c:109 +msgid "accept refs that update .git/shallow" +msgstr "chấp nhận tham chiếu cập nhật .git/shallow" + +#: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" -#: builtin/fetch.c:290 +#: builtin/fetch.c:411 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:295 +#: builtin/fetch.c:416 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:309 +#: builtin/fetch.c:430 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) về nhánh hiện hành)" -#: builtin/fetch.c:310 builtin/fetch.c:396 +#: builtin/fetch.c:431 builtin/fetch.c:517 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:321 +#: builtin/fetch.c:442 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 msgid " (unable to update local ref)" msgstr " (không thể cập nhật tham chiếu (ref) nội bộ)" -#: builtin/fetch.c:341 +#: builtin/fetch.c:462 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:344 +#: builtin/fetch.c:465 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:347 +#: builtin/fetch.c:468 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "unable to update local ref" msgstr "không thể cập nhật tham chiếu (ref) nội bộ" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:398 +#: builtin/fetch.c:519 msgid "(non-fast-forward)" msgstr "(non-fast-forward)" -#: builtin/fetch.c:429 builtin/fetch.c:735 +#: builtin/fetch.c:552 builtin/fetch.c:785 #, c-format msgid "cannot open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: builtin/fetch.c:438 +#: builtin/fetch.c:561 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" -#: builtin/fetch.c:537 +#: builtin/fetch.c:579 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật" + +#: builtin/fetch.c:667 builtin/fetch.c:750 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:548 +#: builtin/fetch.c:678 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5219,57 +5264,57 @@ msgstr "" "một số tham chiếu (refs) nội bộ không thể được cập nhật; hãy thử chạy\n" " “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột" -#: builtin/fetch.c:598 +#: builtin/fetch.c:730 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:599 +#: builtin/fetch.c:731 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:606 +#: builtin/fetch.c:755 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:607 builtin/remote.c:1055 +#: builtin/fetch.c:756 builtin/remote.c:1050 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:725 +#: builtin/fetch.c:775 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -"Từ chối việc lấy (fetch) vào trong nhánh hiện tại %s của một kho chứa không " -"phải kho trần (bare)" +"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho " +"trần (bare)" -#: builtin/fetch.c:744 +#: builtin/fetch.c:794 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" -#: builtin/fetch.c:747 +#: builtin/fetch.c:797 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n" -#: builtin/fetch.c:801 +#: builtin/fetch.c:853 #, c-format msgid "Don't know how to fetch from %s" msgstr "Không biết làm cách nào để lấy về từ %s" -#: builtin/fetch.c:976 +#: builtin/fetch.c:1015 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy về %s\n" -#: builtin/fetch.c:978 builtin/remote.c:100 +#: builtin/fetch.c:1017 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "không thể lấy về %s" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1036 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5277,43 +5322,44 @@ msgstr "" "Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." -#: builtin/fetch.c:1020 +#: builtin/fetch.c:1059 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1068 +#: builtin/fetch.c:1107 msgid "--depth and --unshallow cannot be used together" msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1109 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" -#: builtin/fetch.c:1089 +#: builtin/fetch.c:1132 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:1091 +#: builtin/fetch.c:1134 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1145 #, c-format msgid "No such remote or remote group: %s" msgstr "không có nhóm máy chủ hay máy chủ như thế: %s" -#: builtin/fetch.c:1110 +#: builtin/fetch.c:1153 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" #: builtin/fmt-merge-msg.c:13 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <thông điệp>] [--log[=<n>]|--no-log] [--file <tập-tin>]" +"git fmt-merge-msg [-m <chú_thích>] [--log[=<n>]|--no-log] [--file <tập-tin>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 +#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446 +#: parse-options.h:135 parse-options.h:242 msgid "n" msgstr "n" @@ -5337,43 +5383,43 @@ msgstr "dùng <văn bản thường> để bắt đầu ghi chú" msgid "file to read from" msgstr "tập tin để đọc dữ liệu từ đó" -#: builtin/for-each-ref.c:995 +#: builtin/for-each-ref.c:1063 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [các-tùy-chọn] [<mẫu>]" -#: builtin/for-each-ref.c:1010 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "trích dẫn để phù hợp cho hệ vỏ (shell)" -#: builtin/for-each-ref.c:1012 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "trích dẫn để phù hợp cho perl" -#: builtin/for-each-ref.c:1014 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "trích dẫn để phù hợp cho python" -#: builtin/for-each-ref.c:1016 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for tcl" msgstr "trích dẫn để phù hợp cho tcl" -#: builtin/for-each-ref.c:1019 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "hiển thị chỉ <n> tham chiếu khớp" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177 msgid "format" msgstr "định dạng" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "định dạng sẽ dùng cho đầu ra" -#: builtin/for-each-ref.c:1021 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "khóa" -#: builtin/for-each-ref.c:1022 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "tên trường cần sắp xếp" @@ -5417,41 +5463,41 @@ msgstr "cho phép kiểm tra hạn chế hơn" msgid "write dangling objects in .git/lost-found" msgstr "ghi các đối tượng không được quản lý trong .git/lost-found" -#: builtin/fsck.c:623 builtin/prune.c:134 +#: builtin/fsck.c:623 builtin/prune.c:144 msgid "show progress" msgstr "hiển thị quá trình" -#: builtin/gc.c:23 +#: builtin/gc.c:24 msgid "git gc [options]" msgstr "git gc [các-tùy-chọn]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Invalid %s: '%s'" msgstr "%s không hợp lệ: “%s”" -#: builtin/gc.c:106 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "thư mục đối tượng dài một cách điên rồ %.*s" -#: builtin/gc.c:261 +#: builtin/gc.c:262 msgid "prune unreferenced objects" msgstr "xóa bỏ các đối tượng không được tham chiếu" -#: builtin/gc.c:263 +#: builtin/gc.c:264 msgid "be more thorough (increased runtime)" msgstr "cẩn thận hơn nữa (tăng thời gian chạy)" -#: builtin/gc.c:264 +#: builtin/gc.c:265 msgid "enable auto-gc mode" msgstr "bật chế độ auto-gc" -#: builtin/gc.c:265 +#: builtin/gc.c:266 msgid "force running gc even if there may be another gc running" msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy" -#: builtin/gc.c:305 +#: builtin/gc.c:306 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -5462,7 +5508,7 @@ msgstr "" "chi tiết.\n" #. be quiet on --auto -#: builtin/gc.c:315 +#: builtin/gc.c:316 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5470,7 +5516,7 @@ msgstr "" "gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không " "phải thế)" -#: builtin/gc.c:340 +#: builtin/gc.c:341 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5529,11 +5575,11 @@ msgstr "tìm cả trong các tập tin đã bị lờ đi" #: builtin/grep.c:651 msgid "show non-matching lines" -msgstr "hiển thị những dòng không khớp với mẫu" +msgstr "hiển thị những dòng không khớp với mẫu" #: builtin/grep.c:653 msgid "case insensitive matching" -msgstr "phân biệt chữ hoa/thường" +msgstr "phân biệt HOA/thường" #: builtin/grep.c:655 msgid "match patterns only at word boundaries" @@ -5549,7 +5595,7 @@ msgstr "không khớp mẫu trong các tập tin nhị phân" #: builtin/grep.c:662 msgid "process binary files with textconv filters" -msgstr "xử lý tập tin nhị phân với các bộ lọc `textconv`" +msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”" #: builtin/grep.c:664 msgid "descend at most <depth> levels" @@ -5634,7 +5680,7 @@ msgstr "hiển thị <n> dòng nội dung sau khớp" #: builtin/grep.c:709 msgid "shortcut for -C NUM" -msgstr "Dạng tắt cho -C SỐ" +msgstr "dạng viết tắt của -C SỐ" #: builtin/grep.c:712 msgid "show a line with the function name before matches" @@ -5670,7 +5716,7 @@ msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (t #: builtin/grep.c:741 msgid "pager" -msgstr "trang giấy" +msgstr "giấy" #: builtin/grep.c:741 msgid "show matching files in the pager" @@ -5811,57 +5857,57 @@ msgstr "" "“%s”: cmd (lệnh) hỗ trợ bộ trình chiếu man.\n" "Hãy cân nhắc đến việc sử dụng “man.<tool>.path” để thay thế." -#: builtin/help.c:349 +#: builtin/help.c:353 #, c-format msgid "'%s': unknown man viewer." msgstr "“%s”: không rõ chương trình xem man." -#: builtin/help.c:366 +#: builtin/help.c:370 msgid "no man viewer handled the request" msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu" -#: builtin/help.c:374 +#: builtin/help.c:378 msgid "no info viewer handled the request" msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu" -#: builtin/help.c:420 +#: builtin/help.c:424 msgid "Defining attributes per path" msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn" -#: builtin/help.c:421 +#: builtin/help.c:425 msgid "A Git glossary" msgstr "Thuật ngữ chuyên môn Git" -#: builtin/help.c:422 +#: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" msgstr "Chỉ định các tập tin không cần theo dõi" -#: builtin/help.c:423 +#: builtin/help.c:427 msgid "Defining submodule properties" msgstr "Định nghĩa thuộc tính mô-đun-con" -#: builtin/help.c:424 +#: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" msgstr "Chỉ định điểm xét duyệt và vùng cho Git" -#: builtin/help.c:425 +#: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (bản 1.5.1 hay mới hơn)" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "An overview of recommended workflows with Git" msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git." -#: builtin/help.c:438 +#: builtin/help.c:442 msgid "The common Git guides are:\n" msgstr "Các chỉ dẫn chung về cách dùng Git là:\n" -#: builtin/help.c:460 builtin/help.c:476 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "cách dùng: %s%s" -#: builtin/help.c:492 +#: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "“git %s” được đặt bí danh thành “%s”" @@ -5884,7 +5930,7 @@ msgstr[1] "không thể điền vào %d byte" #: builtin/index-pack.c:254 msgid "early EOF" -msgstr "vừa đúng lúc EOF" +msgstr "gặp kết thúc EOF quá sớm" #: builtin/index-pack.c:255 msgid "read error on input" @@ -5948,8 +5994,8 @@ msgstr "không thể chạy hàm pread cho tập tin pack" #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" -msgstr[0] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu" -msgstr[1] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu" +msgstr[0] "tập tin pack bị kết thúc sớm, thiếu %lu byte" +msgstr[1] "tập tin pack bị kết thúc sớm, thiếu %lu byte" #: builtin/index-pack.c:575 msgid "serious inflate inconsistency" @@ -6009,7 +6055,7 @@ msgstr "pack bị sai hỏng (SHA1 không khớp)" #: builtin/index-pack.c:1041 msgid "cannot fstat packfile" -msgstr "không thể fstat packfile" +msgstr "không thể lấy thông tin thống kê packfile" #: builtin/index-pack.c:1044 msgid "pack has junk at the end" @@ -6156,17 +6202,17 @@ msgstr "tên mẫu dài một cách điên rồ %s" #: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" -msgstr "không thể lấy trạng thái (stat) về “%s”" +msgstr "không thể lấy thông tin thống kê về “%s”" #: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" -msgstr "không thể stat (lấy trạng thái về) mẫu “%s”" +msgstr "không thể lấy thông tin thống kê về mẫu “%s”" #: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" -msgstr "không thể opendir “%s”" +msgstr "không thể opendir() “%s”" #: builtin/init-db.c:97 #, c-format @@ -6176,27 +6222,27 @@ msgstr "không thể readlink “%s”" #: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" -msgstr "liên kết tượng trưng dài một cách điên rồ %s" +msgstr "liên kết mềm dài một cách điên rồ %s" #: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" -msgstr "không thể tạo liên kết tượng trưng (symlink) “%s” “%s”" +msgstr "không thể tạo liên kết mềm (symlink) “%s” “%s”" #: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" -msgstr "không thể sao chép %s sang %s" +msgstr "không thể sao chép “%s” sang “%s”" #: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" -msgstr "đang lờ đi mẫu %s" +msgstr "đang lờ đi mẫu “%s”" #: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" -msgstr "đường dẫn mẫu dài một cách điên rồ %s" +msgstr "đường dẫn mẫu “%s” dài một cách điên rồ" #: builtin/init-db.c:141 #, c-format @@ -6221,7 +6267,7 @@ msgstr "%s đã có từ trước rồi" #: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" -msgstr "không thể nắm (handle) tập tin kiểu %d" +msgstr "không thể xử lý (handle) tập tin kiểu %d" #: builtin/init-db.c:358 #, c-format @@ -6270,21 +6316,21 @@ msgstr "các quyền" msgid "specify that the git repository is to be shared amongst several users" msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng" -#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 msgid "be quiet" msgstr "im lặng" -#: builtin/init-db.c:522 builtin/init-db.c:529 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "không thể mkdir (tạo thư mục): %s" -#: builtin/init-db.c:533 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "không thể chdir (chuyển đổi thư mục) sang %s" -#: builtin/init-db.c:555 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6293,11 +6339,11 @@ msgstr "" "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-" "dir=<thư-mục>)" -#: builtin/init-db.c:579 +#: builtin/init-db.c:580 msgid "Cannot access current working directory" msgstr "Không thể truy cập thư mục làm việc hiện hành" -#: builtin/init-db.c:586 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "không thể truy cập cây (tree) làm việc “%s”" @@ -6364,7 +6410,7 @@ msgstr "Không phải là một vùng." #: builtin/log.c:911 msgid "Cover letter needs email format" -msgstr "”Cover letter” cần cho định dạng thư" +msgstr "“Cover letter” cần cho định dạng thư" #: builtin/log.c:987 #, c-format @@ -6555,13 +6601,13 @@ msgstr "git cherry [-v] [<thượng-nguồn> [<head> [<giới-hạn>]]]" msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -"Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <thượng-nguồn> một cách " -"thủ công.\n" +"Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một " +"cách thủ công.\n" #: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640 #, c-format msgid "Unknown commit %s" -msgstr "Không hiểu lần chuyển giao (commit) %s" +msgstr "Không hiểu lần chuyển giao %s" #: builtin/ls-files.c:398 msgid "git ls-files [options] [<file>...]" @@ -6599,7 +6645,7 @@ msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất" #: builtin/ls-files.c:470 msgid "show staged contents' object name in the output" -msgstr "hiển thị tên đối tượng của nội dung được lưu trạng thái ở kết xuất" +msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất" #: builtin/ls-files.c:472 msgid "show files on the filesystem that need to be removed" @@ -6725,151 +6771,151 @@ msgstr "Các chiến lược sẵn sàng là:" msgid "Available custom strategies are:" msgstr "Các chiến lược tùy chỉnh sẵn sàng là:" -#: builtin/merge.c:198 +#: builtin/merge.c:191 msgid "do not show a diffstat at the end of the merge" msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn" -#: builtin/merge.c:201 +#: builtin/merge.c:194 msgid "show a diffstat at the end of the merge" msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn" -#: builtin/merge.c:202 +#: builtin/merge.c:195 msgid "(synonym to --stat)" msgstr "(đồng nghĩa với --stat)" -#: builtin/merge.c:204 +#: builtin/merge.c:197 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn" -#: builtin/merge.c:207 +#: builtin/merge.c:200 msgid "create a single commit instead of doing a merge" -msgstr "tạo một lần chuyển giao (commit) đưon thay vì thực hiện việc hòa trộn" +msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn" -#: builtin/merge.c:209 +#: builtin/merge.c:202 msgid "perform a commit if the merge succeeds (default)" msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)" -#: builtin/merge.c:211 +#: builtin/merge.c:204 msgid "edit message before committing" -msgstr "sửa chú thích trước khi chuyển giao (commit)" +msgstr "sửa chú thích trước khi chuyển giao" -#: builtin/merge.c:212 +#: builtin/merge.c:205 msgid "allow fast-forward (default)" msgstr "cho phép fast-forward (mặc định)" -#: builtin/merge.c:214 +#: builtin/merge.c:207 msgid "abort if fast-forward is not possible" msgstr "bỏ qua nếu fast-forward không thể được" -#: builtin/merge.c:218 +#: builtin/merge.c:211 msgid "Verify that the named commit has a valid GPG signature" msgstr "Thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không" -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "chiến lược" -#: builtin/merge.c:220 +#: builtin/merge.c:213 msgid "merge strategy to use" msgstr "chiến lược hòa trộn sẽ dùng" -#: builtin/merge.c:221 +#: builtin/merge.c:214 msgid "option=value" msgstr "tùy_chọn=giá_trị" -#: builtin/merge.c:222 +#: builtin/merge.c:215 msgid "option for selected merge strategy" msgstr "tùy chọn cho chiến lược hòa trộn đã chọn" -#: builtin/merge.c:224 +#: builtin/merge.c:217 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn non-fast-forward)" -#: builtin/merge.c:228 +#: builtin/merge.c:221 msgid "abort the current in-progress merge" msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện" -#: builtin/merge.c:257 +#: builtin/merge.c:250 msgid "could not run stash." msgstr "không thể chạy stash." -#: builtin/merge.c:262 +#: builtin/merge.c:255 msgid "stash failed" msgstr "stash gặp lỗi" -#: builtin/merge.c:267 +#: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" msgstr "không phải là một đối tượng hợp lệ: %s" -#: builtin/merge.c:286 builtin/merge.c:303 +#: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" msgstr "read-tree gặp lỗi" -#: builtin/merge.c:333 +#: builtin/merge.c:326 msgid " (nothing to squash)" msgstr " (không có gì để squash)" -#: builtin/merge.c:346 +#: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash commit -- không cập nhật HEAD\n" -#: builtin/merge.c:378 +#: builtin/merge.c:371 msgid "Writing SQUASH_MSG" msgstr "Đang ghi SQUASH_MSG" -#: builtin/merge.c:380 +#: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" msgstr "Hoàn thành SQUASH_MSG" -#: builtin/merge.c:403 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" -msgstr "Không thông điệp hòa trộn -- không cập nhật HEAD\n" +msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n" -#: builtin/merge.c:453 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" -msgstr "“%s” không chỉ đến một lần chuyển giao (commit) nào cả" +msgstr "“%s” không chỉ đến một lần chuyển giao nào cả" -#: builtin/merge.c:565 +#: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuỗi branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:650 msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" -#: builtin/merge.c:685 +#: builtin/merge.c:678 msgid "Not handling anything other than two heads merge." msgstr "Không cầm nắm gì ngoài hai head hòa trộn" -#: builtin/merge.c:699 +#: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s" -#: builtin/merge.c:713 +#: builtin/merge.c:706 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:802 +#: builtin/merge.c:795 #, c-format msgid "Could not read from '%s'" msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:811 +#: builtin/merge.c:804 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"Vẫn chưa hòa trộn các lần chuyển giao (commit); sử dụng lệnh “git commit” để " -"hoàn tất việc hòa trộn.\n" +"Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit” để hoàn tất " +"việc hòa trộn.\n" -#: builtin/merge.c:817 +#: builtin/merge.c:810 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6880,216 +6926,220 @@ msgid "" msgstr "" "Hãy nhập vào các thông tin để giải thích tại sao sự hòa trộn này là cần " "thiết,\n" -"đặc biệt là khi nó hòa trộn ngược dòng đã cập nhật vào trong một nhánh " +"đặc biệt là khi nó hòa trộn thượng nguồn đã cập nhật vào trong một nhánh " "topic.\n" "\n" "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và phần chú thích này nếu " "rỗng\n" -"sẽ hủy bỏ lần chuyển giao (commit).\n" +"sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:841 +#: builtin/merge.c:834 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:853 +#: builtin/merge.c:846 #, c-format msgid "Wonderful.\n" msgstr "Thần kỳ.\n" -#: builtin/merge.c:918 +#: builtin/merge.c:911 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao " -"(commit) kết quả.\n" +"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết " +"quả.\n" -#: builtin/merge.c:934 +#: builtin/merge.c:927 #, c-format msgid "'%s' is not a commit" msgstr "%s không phải là một lần commit (chuyển giao)" -#: builtin/merge.c:975 +#: builtin/merge.c:968 msgid "No current branch." msgstr "không phải nhánh hiện hành" -#: builtin/merge.c:977 +#: builtin/merge.c:970 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:979 +#: builtin/merge.c:972 msgid "No default upstream defined for the current branch." msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành." -#: builtin/merge.c:984 +#: builtin/merge.c:977 #, c-format msgid "No remote-tracking branch for %s from %s" -msgstr "Không nhánh mạng theo vết cho %s từ %s" +msgstr "Không nhánh mạng theo dõi cho %s từ %s" -#: builtin/merge.c:1140 +#: builtin/merge.c:1133 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1156 git-pull.sh:31 +#: builtin/merge.c:1149 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" "Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại).\n" -"Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." +"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1159 git-pull.sh:34 +#: builtin/merge.c:1152 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại)." -#: builtin/merge.c:1163 +#: builtin/merge.c:1156 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" -"Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." +"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1166 +#: builtin/merge.c:1159 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)." -#: builtin/merge.c:1175 +#: builtin/merge.c:1168 msgid "You cannot combine --squash with --no-ff." msgstr "Bạn không thể kết hợp --squash với --no-ff." -#: builtin/merge.c:1184 +#: builtin/merge.c:1177 msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "" -"Không chỉ ra lần chuyển giao (commit) và merge.defaultToUpstream chưa được " -"đặt." +msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt." -#: builtin/merge.c:1216 +#: builtin/merge.c:1209 msgid "Can merge only exactly one commit into empty head" msgstr "" -"Không thể hòa trộn một cách đúng đắn một lần chuyển giao (commit) vào một " -"head rỗng" +"Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng" -#: builtin/merge.c:1219 +#: builtin/merge.c:1212 msgid "Squash commit into empty head not supported yet" msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ" -#: builtin/merge.c:1221 +#: builtin/merge.c:1214 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -"Chuyển giao (commit) không-fast-forward không hợp lý ở trong một head trống " -"rỗng" +"Chuyển giao không-fast-forward không hợp lý ở trong một head trống rỗng" -#: builtin/merge.c:1226 +#: builtin/merge.c:1219 #, c-format msgid "%s - not something we can merge" msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn" -#: builtin/merge.c:1277 +#: builtin/merge.c:1270 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s." -#: builtin/merge.c:1280 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s." #. 'N' -#: builtin/merge.c:1283 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s does not have a GPG signature." -msgstr "Lần chuyển giao (commit) %s không có chữ ký GPG." +msgstr "Lần chuyển giao %s không có chữ ký GPG." -#: builtin/merge.c:1286 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n" -#: builtin/merge.c:1370 +#: builtin/merge.c:1363 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1409 +#: builtin/merge.c:1402 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Đang thử hòa trộn kiểu “trivial in-index”...\n" -#: builtin/merge.c:1416 +#: builtin/merge.c:1409 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1448 +#: builtin/merge.c:1441 msgid "Not possible to fast-forward, aborting." msgstr "Thực hiện lệnh fast-forward là không thể được, đang bỏ qua." -#: builtin/merge.c:1471 builtin/merge.c:1550 +#: builtin/merge.c:1464 builtin/merge.c:1543 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Đang tua lại cây thành thời xa xưa...\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1468 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s...\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1534 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n" -#: builtin/merge.c:1543 +#: builtin/merge.c:1536 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1545 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1557 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Hòa trộn tự động đã trở nên tốt; bị dừng trước khi việc chuyển giao được yêu " "cầu\n" -#: builtin/merge-base.c:26 +#: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <commit> <commit>..." +msgstr "git merge-base [-a|--all] <commit> <lần_chuyển_giao>..." -#: builtin/merge-base.c:27 +#: builtin/merge-base.c:30 msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <lần commit>..." +msgstr "git merge-base [-a|--all] --octopus <lần_chuyển_giao>..." -#: builtin/merge-base.c:28 +#: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <lần commit>..." +msgstr "git merge-base --independent <lần_chuyển_giao>..." -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <commit> <lần_chuyển_giao>" + +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <tham-chiếu> [<lần_chuyển_giao>]" -#: builtin/merge-base.c:98 +#: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "xuất ra tất cả các ông bà, tổ tiên chung" -#: builtin/merge-base.c:99 +#: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "tìm tổ tiên của hòa trộn n-way đơn" -#: builtin/merge-base.c:100 +#: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "liệt kê các “rev” mà nó không thể đọc được từ cái khác" -#: builtin/merge-base.c:102 +#: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "là cha mẹ đầu tiên của cái khác?" +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "tìm xem <commit> được rẽ nhánh ở đâu từ reflog của <th.chiếu>" + #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " @@ -7150,125 +7200,129 @@ msgstr "cho phép tạo nhiều hơn một cây" msgid "git mv [options] <source>... <destination>" msgstr "git mv [các-tùy-chọn] <nguồn>... <đích>" -#: builtin/mv.c:67 +#: builtin/mv.c:71 msgid "force move/rename even if target exists" msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã tồn tại" -#: builtin/mv.c:68 +#: builtin/mv.c:72 msgid "skip move/rename errors" msgstr "bỏ qua các lỗi liên quan đến di chuyển, đổi tên" -#: builtin/mv.c:113 +#: builtin/mv.c:122 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”\n" -#: builtin/mv.c:117 +#: builtin/mv.c:126 msgid "bad source" msgstr "nguồn sai" -#: builtin/mv.c:120 +#: builtin/mv.c:129 msgid "can not move directory into itself" msgstr "không thể di chuyển một thư mục vào trong chính nó được" -#: builtin/mv.c:123 +#: builtin/mv.c:132 msgid "cannot move directory over file" msgstr "không di chuyển được thư mục thông qua tập tin" -#: builtin/mv.c:129 +#: builtin/mv.c:138 #, c-format msgid "Huh? Directory %s is in index and no submodule?" msgstr "Hả? Thư mục “%s” trong chỉ mục và không mô-đun con?" -#: builtin/mv.c:131 builtin/rm.c:318 +#: builtin/mv.c:140 builtin/rm.c:318 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Hãy lưu các thay đổi của bạn vào “.gitmodules” hay ghi vào vùng nhớ tạm " -"(stash) chúng để xử lý" +"Vui lòng đưa các thay đổi của bạn vào “.gitmodules” hay tạm cất chúng đi để " +"xử lý" -#: builtin/mv.c:147 +#: builtin/mv.c:156 #, c-format msgid "Huh? %.*s is in index?" msgstr "Hả? %.*s trong bảng mục lục à?" -#: builtin/mv.c:159 +#: builtin/mv.c:168 msgid "source directory is empty" msgstr "thư mục nguồn là trống rỗng" -#: builtin/mv.c:191 +#: builtin/mv.c:200 msgid "not under version control" msgstr "không nằm dưới sự quản lý mã nguồn" -#: builtin/mv.c:193 +#: builtin/mv.c:202 msgid "destination exists" msgstr "đích đã tồn tại sẵn rồi" -#: builtin/mv.c:201 +#: builtin/mv.c:210 #, c-format msgid "overwriting '%s'" msgstr "đang ghi đè lên “%s”" -#: builtin/mv.c:204 +#: builtin/mv.c:213 msgid "Cannot overwrite" msgstr "Không thể ghi đè" -#: builtin/mv.c:207 +#: builtin/mv.c:216 msgid "multiple sources for the same target" msgstr "Nhiều nguồn cho cùng một đích" -#: builtin/mv.c:222 +#: builtin/mv.c:218 +msgid "destination directory does not exist" +msgstr "thư mục đích không tồn tại" + +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, nguồn=%s, đích=%s" -#: builtin/mv.c:232 +#: builtin/mv.c:243 #, c-format msgid "Renaming %s to %s\n" msgstr "Đổi tên %s thành %s\n" -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 #, c-format msgid "renaming '%s' failed" -msgstr "đổi tên %s gặp lỗi" +msgstr "gặp lỗi khi đổi tên “%s”" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [options] <commit>..." msgstr "git name-rev [các-tùy-chọn] <commit>..." -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [options] --all" msgstr "git name-rev [các-tùy-chọn] --all" -#: builtin/name-rev.c:261 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --stdin" msgstr "git name-rev [các-tùy-chọn] --stdin" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "chỉ hiển thị tên (không SHA-1)" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "chỉ sử dụng các tham chiếu (refs) khớp với <mẫu>" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" "liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "đọc từ đầu vào tiêu chuẩn" -#: builtin/name-rev.c:320 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "cho phép in các tên “chưa định nghĩa” (mặc định)" -#: builtin/name-rev.c:326 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)" @@ -7527,7 +7581,7 @@ msgstr "" #: builtin/notes.c:539 #, c-format msgid "Missing notes on source object %s. Cannot copy." -msgstr "Thiếu ghi chú trên đối tượng nguốn %s. Không thể sao chép." +msgstr "Thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép." #: builtin/notes.c:588 #, c-format @@ -7593,7 +7647,7 @@ msgstr "notes_ref" msgid "use notes from <notes_ref>" msgstr "dùng “notes” từ <notes_ref>" -#: builtin/notes.c:974 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" @@ -7615,144 +7669,144 @@ msgstr "" msgid "deflate error (%d)" msgstr "lỗi giải nén (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2396 #, c-format msgid "unsupported index version %s" msgstr "phiên bản mục lục không được hỗ trợ %s" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2400 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2423 #, c-format msgid "option %s does not accept negative form" msgstr "tùy chọn %s không chấp nhận dạng thức âm" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2427 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "không thể phân tích giá trị “%s” cho tùy chọn %s" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2446 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2448 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2450 msgid "show progress meter during object writing phase" msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2453 msgid "similar to --all-progress when progress meter is shown" msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2454 msgid "version[,offset]" msgstr "phiên bản[,offset]" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2455 msgid "write the pack index file in the specified idx format version" msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2458 msgid "maximum size of each output pack file" msgstr "kcíh thước tối đa cho tập tin gói được tạo" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2460 msgid "ignore borrowed objects from alternate object store" msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2462 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2464 msgid "limit pack window by objects" msgstr "giới hạn cửa sổ đóng gói theo đối tượng" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2466 msgid "limit pack window by memory in addition to object limit" msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2468 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2470 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2472 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2474 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2476 msgid "use threads when searching for best delta matches" msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2478 msgid "do not create an empty pack output" msgstr "không thể tạo kết xuất gói (pack) trống rỗng" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2480 msgid "read revision arguments from standard input" msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2482 msgid "limit the objects to those that are not yet packed" msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2485 msgid "include objects reachable from any reference" msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2488 msgid "include objects referred by reflog entries" msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2491 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2493 msgid "include tag objects that refer to objects to be packed" msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2495 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2498 parse-options.h:143 +#: builtin/pack-objects.c:2496 parse-options.h:143 msgid "time" msgstr "thời-gian" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2497 msgid "unpack unreachable objects newer than <time>" msgstr "" "xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2500 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2502 msgid "ignore packs that have companion .keep file" msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2504 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:2508 +#: builtin/pack-objects.c:2506 msgid "do not hide commits by grafts" msgstr "không ẩn các lần chuyển giao bởi “grafts”" @@ -7776,15 +7830,15 @@ msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <thời-gian>] [--] [<head>...]" -#: builtin/prune.c:132 +#: builtin/prune.c:142 msgid "do not remove, show only" msgstr "không gỡ bỏ, chỉ hiển thị" -#: builtin/prune.c:133 +#: builtin/prune.c:143 msgid "report pruned objects" msgstr "báo cáo các đối tượng đã prune" -#: builtin/prune.c:136 +#: builtin/prune.c:146 msgid "expire objects older than <time>" msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>" @@ -7792,15 +7846,15 @@ msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<các-tùy-chọn>] [<kho-chứa> [<refspec>...]]" -#: builtin/push.c:47 +#: builtin/push.c:86 msgid "tag shorthand without <tag>" msgstr "dùng tốc ký tag không có <thẻ>" -#: builtin/push.c:66 +#: builtin/push.c:96 msgid "--delete only accepts plain target ref names" msgstr "--delete chỉ chấp nhận các tên tham chiếu (ref) dạng thường" -#: builtin/push.c:101 +#: builtin/push.c:141 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -7809,7 +7863,7 @@ msgstr "" "Để chọn mỗi tùy chọn một cách cố định, xem push.default trong “git help " "config”." -#: builtin/push.c:104 +#: builtin/push.c:144 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7823,7 +7877,7 @@ msgid "" " git push %s %s\n" "%s" msgstr "" -"Nhánh thượng nguồn (upstream) của nhánh hiện tại của bạn không khớp\n" +"Nhánh thượng nguồn của nhánh hiện tại của bạn không khớp\n" "với tên của nhánh hiện tại của bạn. Để push đến nhánh thượng nguồn\n" "trên máy chủ, sử dụng\n" "\n" @@ -7834,7 +7888,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:119 +#: builtin/push.c:159 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7849,7 +7903,7 @@ msgstr "" "\n" " git push %s HEAD:<tên-của-nhánh-máy-chủ>\n" -#: builtin/push.c:133 +#: builtin/push.c:173 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7857,18 +7911,18 @@ msgid "" "\n" " git push --set-upstream %s %s\n" msgstr "" -"Nhánh hiện tại %s không có nhánh thượng nguồn (upstream) nào.\n" -"Để push (đẩy lên) nhánh hiện tại và đặt máy chủ như là thượng nguồn " +"Nhánh hiện tại %s không có nhánh thượng nguồn nào.\n" +"Để push (đẩy lên) nhánh hiện tại và đặt máy chủ này làm thượng nguồn " "(upstream), sử dụng\n" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:141 +#: builtin/push.c:181 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "Nhánh hiện tại %s có đa nhánh thượng nguồn (upstream), từ chối push." +msgstr "Nhánh hiện tại %s có nhiều nhánh thượng nguồn, từ chối push." -#: builtin/push.c:144 +#: builtin/push.c:184 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7880,7 +7934,7 @@ msgstr "" "nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n" "để cập nhật nhánh máy chủ nào." -#: builtin/push.c:167 +#: builtin/push.c:207 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7892,6 +7946,13 @@ msgid "" "\n" " git config --global push.default simple\n" "\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"In Git 2.0, Git will default to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" @@ -7899,28 +7960,36 @@ msgid "" msgstr "" "biến push.default chưa được đặt; giá trị ngầm định của nó\n" "đã được thay đổi trong Git 2.0 từ “matching” thành “simple”.\n" -"Để không hiển thị nhắc nhở này và duy trì cách xử lý sau\n" -"những thay đổi mặc định này, hãy chạy lệnh:\n" +"Để không hiển thị nhắc nhở này và duy trì cách xử lý hiện nay sau thay đổi " +"mặc định,\n" +"hãy chạy lệnh:\n" "\n" " git config --global push.default matching\n" "\n" -"Để không hiển thị nhắc nhở này và áp dụng cách xử lý mới, hãy chạy lệnh:\n" +"Để không hiển thị nhắc nhở này và áp dụng cách ứng xử mới, hãy chạy lệnh:\n" "\n" " git config --global push.default simple\n" "\n" +"Khi push.default được đặt thành “matching”, git sẽ đẩy các nhánh nội bộ\n" +"lên các nhánh trên máy chủ, cái mà có cùng tên.\n" +"\n" +"Trong 2.0, Git sẽ mặc định duy trì các ứng xử “simple”,\n" +"cái này chỉ đẩy những nhánh hiện hành lên các nhánh tương ứng\n" +"trên máy chủ cái mà lệnh “git pull” dùng để cập nhật nhánh hiện tại.\n" +"\n" "Xem “git help config” và tìm đến “push.default” để có thêm thông tin.\n" "(chế độ “simple” được bắt đầu sử dụng từ Git 1.7.11. Sử dụng chế độ tương " "tự\n" "“current” thay vì “simple” nếu bạn thỉnh thoảng phải sử dụng bản Git cũ)" -#: builtin/push.c:227 +#: builtin/push.c:274 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Bạn đã không chỉ ra một refspecs nào để push, và push.default là \"không là " "gì cả\"." -#: builtin/push.c:234 +#: builtin/push.c:281 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7934,7 +8003,7 @@ msgstr "" "Xem “Note about fast-forwards” từ lệnh “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:240 +#: builtin/push.c:287 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7949,7 +8018,7 @@ msgstr "" "thành “simple”, “current” hoặc “upstream” để chỉ push nhánh hiện hành mà " "thôi." -#: builtin/push.c:246 +#: builtin/push.c:293 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -7963,7 +8032,7 @@ msgstr "" "Xem “Note about fast-forwards” từ lệnh “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:252 +#: builtin/push.c:299 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -7978,11 +8047,11 @@ msgstr "" "Xem “Note about fast-forwards” từ lệnh “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:259 +#: builtin/push.c:306 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ." -#: builtin/push.c:262 +#: builtin/push.c:309 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -7994,22 +8063,22 @@ msgstr "" "tượng\n" "không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n" -#: builtin/push.c:328 +#: builtin/push.c:375 #, c-format msgid "Pushing to %s\n" msgstr "Đang push (đẩy) lên %s\n" -#: builtin/push.c:332 +#: builtin/push.c:379 #, c-format msgid "failed to push some refs to '%s'" msgstr "gặp lỗi khi push (đẩy lên) một số tham chiếu (ref) đến “%s”" -#: builtin/push.c:365 +#: builtin/push.c:412 #, c-format msgid "bad repository '%s'" msgstr "repository (kho) sai “%s”" -#: builtin/push.c:366 +#: builtin/push.c:413 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -8030,96 +8099,95 @@ msgstr "" "\n" " git push <tên>\n" -#: builtin/push.c:381 +#: builtin/push.c:428 msgid "--all and --tags are incompatible" msgstr "--all và --tags xung khắc nhau" -#: builtin/push.c:382 +#: builtin/push.c:429 msgid "--all can't be combined with refspecs" msgstr "--all không thể được tổ hợp cùng với đặc tả đường dẫn" -#: builtin/push.c:387 +#: builtin/push.c:434 msgid "--mirror and --tags are incompatible" msgstr "--mirror và --tags xung khắc nhau" -#: builtin/push.c:388 +#: builtin/push.c:435 msgid "--mirror can't be combined with refspecs" msgstr "--mirror không thể được tổ hợp cùng với đặc tả đường dẫn" -#: builtin/push.c:393 +#: builtin/push.c:440 msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:453 +#: builtin/push.c:500 msgid "repository" msgstr "kho" -#: builtin/push.c:454 +#: builtin/push.c:501 msgid "push all refs" -msgstr "push tất cả refs" +msgstr "push tất cả các tham chiếu" -#: builtin/push.c:455 +#: builtin/push.c:502 msgid "mirror all refs" msgstr "mirror tất cả các tham chiếu" -#: builtin/push.c:457 +#: builtin/push.c:504 msgid "delete refs" -msgstr "xóa refs" +msgstr "xóa các tham chiếu" -#: builtin/push.c:458 +#: builtin/push.c:505 msgid "push tags (can't be used with --all or --mirror)" -msgstr "" -"các thẻ push (không thể sử dụng cùng với các tùy chọn --all hay --mirror)" +msgstr "push các thẻ (không dùng cùng với --all hay --mirror)" -#: builtin/push.c:461 +#: builtin/push.c:508 msgid "force updates" msgstr "ép buộc cập nhật" -#: builtin/push.c:463 +#: builtin/push.c:510 msgid "refname>:<expect" msgstr "tên-tham-chiếu>:<cần" -#: builtin/push.c:464 +#: builtin/push.c:511 msgid "require old value of ref to be at this value" msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này" -#: builtin/push.c:466 +#: builtin/push.c:513 msgid "check" msgstr "kiểm tra" -#: builtin/push.c:467 +#: builtin/push.c:514 msgid "control recursive pushing of submodules" msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con" -#: builtin/push.c:469 +#: builtin/push.c:516 msgid "use thin pack" msgstr "tạo gói nhẹ" -#: builtin/push.c:470 builtin/push.c:471 +#: builtin/push.c:517 builtin/push.c:518 msgid "receive pack program" -msgstr "nhận về chương trình pack" +msgstr "chương trình nhận gói" -#: builtin/push.c:472 +#: builtin/push.c:519 msgid "set upstream for git pull/status" -msgstr "đặt thượng nguồn (upstream) cho git pull/status" +msgstr "đặt thượng nguồn cho git pull/status" -#: builtin/push.c:475 +#: builtin/push.c:522 msgid "prune locally removed refs" -msgstr "prune (cắt cụt) những tham chiếu (refs) bị gỡ bỏ" +msgstr "xén tỉa những tham chiếu (refs) bị gỡ bỏ" -#: builtin/push.c:477 +#: builtin/push.c:524 msgid "bypass pre-push hook" -msgstr "vòng qua “pre-push hook”" +msgstr "vòng qua móc tiền-đẩy “pre-push”" -#: builtin/push.c:478 +#: builtin/push.c:525 msgid "push missing but relevant tags" -msgstr "push bị trượt nhưng các thẻ thích hợp" +msgstr "push phần bị thiếu nhưng nhưng các thẻ lại thích hợp" -#: builtin/push.c:488 +#: builtin/push.c:535 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags" -#: builtin/push.c:490 +#: builtin/push.c:537 msgid "--delete doesn't make sense without any refs" msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu (refs) nào" @@ -8202,18 +8270,18 @@ msgstr "gỡ lỗi “unpack-trees”" #: builtin/reflog.c:499 #, c-format msgid "%s' for '%s' is not a valid timestamp" -msgstr "giá trị %s dành cho “%s” không phải là dấu thời gian hợp lệ" +msgstr "giá trị %s dành cho “%s” không phải là dấu vết thời gian hợp lệ" #: builtin/reflog.c:615 builtin/reflog.c:620 #, c-format msgid "'%s' is not a valid timestamp" msgstr "“%s” không phải là dấu thời gian hợp lệ" -#: builtin/remote.c:11 +#: builtin/remote.c:12 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -8221,82 +8289,82 @@ msgstr "" "git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <tên> <url>" -#: builtin/remote.c:13 builtin/remote.c:32 +#: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "git remote rename <tên-cũ> <tên-mới>" -#: builtin/remote.c:14 builtin/remote.c:37 +#: builtin/remote.c:15 builtin/remote.c:38 msgid "git remote remove <name>" msgstr "git remote remove <tên>" -#: builtin/remote.c:15 +#: builtin/remote.c:16 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <tên>" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <tên>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<nhóm> | <máy-chủ>)...]" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <tên> <nhánh>..." -#: builtin/remote.c:20 builtin/remote.c:68 +#: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <tên> <url-mới> [<url-cũ>]" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <tên> <url-mới>" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <tên> <url>" -#: builtin/remote.c:27 +#: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<các-tùy-chọn>] <tên> <url>" -#: builtin/remote.c:42 +#: builtin/remote.c:43 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)" -#: builtin/remote.c:47 +#: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <tên> <nhánh>..." -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <tên> <nhánh>..." -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "git remote show [<các-tùy-chọn>] <tên>" -#: builtin/remote.c:58 +#: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<các-tùy-chọn>] <tên>" -#: builtin/remote.c:63 +#: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<các-tùy-chọn>] [<nhóm> | <máy-chủ>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "Đang cập nhật %s" -#: builtin/remote.c:130 +#: builtin/remote.c:120 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -8304,102 +8372,101 @@ msgstr "" "--mirror nguy hiểm và không dùng nữa; xin hãy\n" "\t sử dụng tùy chọn --mirror=fetch hoặc --mirror=push để thay thế" -#: builtin/remote.c:147 +#: builtin/remote.c:137 #, c-format msgid "unknown mirror argument: %s" msgstr "không hiểu tham số máy bản sao (mirror): %s" -#: builtin/remote.c:163 +#: builtin/remote.c:153 msgid "fetch the remote branches" -msgstr "lấy về (fetch) các nhánh từ máy chủ" +msgstr "lấy về các nhánh từ máy chủ" -#: builtin/remote.c:165 +#: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" -msgstr "" -"nhập vào tất cả các đối tượng thẻ và thành phần liên quan khi lấy về (fetch)" +msgstr "nhập vào tất cả các đối tượng thẻ và thành phần liên quan khi lấy về" -#: builtin/remote.c:168 +#: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" -msgstr "hoặc không lấy về (fetch) bất kỳ thẻ nào (--no-tags)" +msgstr "hoặc không lấy về bất kỳ thẻ nào (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:160 msgid "branch(es) to track" -msgstr "các nhánh theo vết" +msgstr "các nhánh để theo dõi" -#: builtin/remote.c:171 +#: builtin/remote.c:161 msgid "master branch" msgstr "nhánh master" -#: builtin/remote.c:172 +#: builtin/remote.c:162 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:173 +#: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" msgstr "đặt máy chủ (remote) như là một máy bản sao để push hay fetch từ đó" -#: builtin/remote.c:185 +#: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "đang chỉ định một nhánh master không hợp lý với tùy chọn --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "chỉ định những nhánh để theo vết chỉ hợp lý với các “fetch mirror”" +msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý với các “fetch mirror”" -#: builtin/remote.c:195 builtin/remote.c:646 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "máy chủ %s đã tồn tại rồi." -#: builtin/remote.c:199 builtin/remote.c:650 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "“%s” không phải tên máy chủ hợp lệ" -#: builtin/remote.c:243 +#: builtin/remote.c:233 #, c-format msgid "Could not setup master '%s'" msgstr "Không thể cài đặt nhánh master “%s”" -#: builtin/remote.c:299 +#: builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "nhiều hơn một %s" -#: builtin/remote.c:339 +#: builtin/remote.c:334 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Không thể lấy ánh xạ (map) fetch cho đặc tả tham chiếu %s" -#: builtin/remote.c:440 builtin/remote.c:448 +#: builtin/remote.c:435 builtin/remote.c:443 msgid "(matching)" msgstr "(khớp)" -#: builtin/remote.c:452 +#: builtin/remote.c:447 msgid "(delete)" msgstr "(xóa)" -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Không thể nối thêm “%s” vào “%s”" -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 #, c-format msgid "No such remote: %s" msgstr "Không có máy chủ nào như thế: %s" -#: builtin/remote.c:656 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" -msgstr "Không thể đổi tên chương (section) cấu hình từ “%s” thành “%s”" +msgstr "Không thể đổi tên phần của cấu hình từ “%s” thành “%s”" -#: builtin/remote.c:662 builtin/remote.c:799 +#: builtin/remote.c:657 builtin/remote.c:794 #, c-format msgid "Could not remove config section '%s'" -msgstr "Không thể gỡ bỏ chương (section) cấu hình “%s”" +msgstr "Không thể gỡ bỏ phần cấu hình “%s”" -#: builtin/remote.c:677 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8410,32 +8477,32 @@ msgstr "" "\t%s\n" "\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết." -#: builtin/remote.c:683 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Không thể nối thêm “%s”" -#: builtin/remote.c:694 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Không thể đặt “%s”" -#: builtin/remote.c:716 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" -msgstr "việc xoá %s gặp lỗi" +msgstr "gặp lỗi khi xoá “%s”" -#: builtin/remote.c:750 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" -msgstr "tạo %s gặp lỗi" +msgstr "gặp lỗi khi tạo “%s”" -#: builtin/remote.c:764 +#: builtin/remote.c:759 #, c-format msgid "Could not remove branch %s" -msgstr "Không thể gỡ bỏ nhánh %s" +msgstr "Không thể gỡ bỏ nhánh “%s”" -#: builtin/remote.c:834 +#: builtin/remote.c:829 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8450,262 +8517,262 @@ msgstr[1] "" "đi;\n" "để xóa đi, sử dụng:" -#: builtin/remote.c:943 +#: builtin/remote.c:938 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " mới (lần lấy về tiếp theo sẽ lưu trong remotes/%s)" -#: builtin/remote.c:946 +#: builtin/remote.c:941 msgid " tracked" -msgstr " được theo vết" +msgstr " được theo dõi" -#: builtin/remote.c:948 +#: builtin/remote.c:943 msgid " stale (use 'git remote prune' to remove)" msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)" -#: builtin/remote.c:950 +#: builtin/remote.c:945 msgid " ???" msgstr " ???" -#: builtin/remote.c:991 +#: builtin/remote.c:986 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge không hợp lệ; không thể rebase về phía > 1 nhánh" -#: builtin/remote.c:998 +#: builtin/remote.c:993 #, c-format msgid "rebases onto remote %s" msgstr "thực hiện rebase trên máy chủ %s" -#: builtin/remote.c:1001 +#: builtin/remote.c:996 #, c-format msgid " merges with remote %s" msgstr " hòa trộn với máy chủ %s" -#: builtin/remote.c:1002 +#: builtin/remote.c:997 msgid " and with remote" msgstr " và với máy chủ" -#: builtin/remote.c:1004 +#: builtin/remote.c:999 #, c-format msgid "merges with remote %s" msgstr "hòa trộn với máy chủ %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1000 msgid " and with remote" msgstr " và với máy chủ" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 msgid "create" msgstr "tạo" -#: builtin/remote.c:1054 +#: builtin/remote.c:1049 msgid "delete" msgstr "xoá" -#: builtin/remote.c:1058 +#: builtin/remote.c:1053 msgid "up to date" msgstr "đã cập nhật" -#: builtin/remote.c:1061 +#: builtin/remote.c:1056 msgid "fast-forwardable" msgstr "có-thể-fast-forward" -#: builtin/remote.c:1064 +#: builtin/remote.c:1059 msgid "local out of date" msgstr "dữ liệu nội bộ đã cũ" -#: builtin/remote.c:1071 +#: builtin/remote.c:1066 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s ép buộc thành %-*s (%s)" -#: builtin/remote.c:1074 +#: builtin/remote.c:1069 #, c-format msgid " %-*s pushes to %-*s (%s)" -msgstr " %-*s push tới %-*s (%s)" +msgstr " %-*s đẩy lên thành %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %s" msgstr " %-*s ép buộc thành %s" -#: builtin/remote.c:1081 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %s" -msgstr " %-*s push tới %s" +msgstr " %-*s đẩy lên thành %s" -#: builtin/remote.c:1091 +#: builtin/remote.c:1144 msgid "do not query remotes" msgstr "không truy vấn các máy chủ" -#: builtin/remote.c:1118 +#: builtin/remote.c:1171 #, c-format msgid "* remote %s" msgstr "* máy chủ %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1172 #, c-format msgid " Fetch URL: %s" -msgstr " URL để lấy về (fetch): %s" +msgstr " URL để lấy về: %s" -#: builtin/remote.c:1120 builtin/remote.c:1285 +#: builtin/remote.c:1173 builtin/remote.c:1318 msgid "(no URL)" msgstr "(không có URL)" -#: builtin/remote.c:1129 builtin/remote.c:1131 +#: builtin/remote.c:1182 builtin/remote.c:1184 #, c-format msgid " Push URL: %s" msgstr " URL để đẩy lên (push): %s" -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 #, c-format msgid " HEAD branch: %s" msgstr " Nhánh HEAD: %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1192 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n" -#: builtin/remote.c:1151 +#: builtin/remote.c:1204 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Nhánh trên máy chủ:%s" msgstr[1] " Những nhánh trên máy chủ:%s" -#: builtin/remote.c:1154 builtin/remote.c:1181 +#: builtin/remote.c:1207 builtin/remote.c:1234 msgid " (status not queried)" msgstr " (trạng thái không được yêu cầu)" -#: builtin/remote.c:1163 +#: builtin/remote.c:1216 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Nhánh nội bộ đã được cấu hình cho lệnh “git pull”:" msgstr[1] " Những nhánh nội bộ đã được cấu hình cho lệnh “git pull”:" -#: builtin/remote.c:1171 +#: builtin/remote.c:1224 msgid " Local refs will be mirrored by 'git push'" msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh “git push”" -#: builtin/remote.c:1178 +#: builtin/remote.c:1231 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" msgstr[1] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" -#: builtin/remote.c:1199 +#: builtin/remote.c:1252 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ" -#: builtin/remote.c:1201 +#: builtin/remote.c:1254 msgid "delete refs/remotes/<name>/HEAD" msgstr "xóa refs/remotes/<tên>/HEAD" -#: builtin/remote.c:1216 +#: builtin/remote.c:1269 msgid "Cannot determine remote HEAD" msgstr "Không thể xác định được HEAD máy chủ" -#: builtin/remote.c:1218 +#: builtin/remote.c:1271 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Nhiều nhánh HEAD máy chủ. Hãy chọn rõ ràng một:" -#: builtin/remote.c:1228 +#: builtin/remote.c:1281 #, c-format msgid "Could not delete %s" msgstr "Không thể xóa bỏ %s" -#: builtin/remote.c:1236 +#: builtin/remote.c:1289 #, c-format msgid "Not a valid ref: %s" -msgstr "Không phải là tham chiếu (ref) hợp lệ: %s" +msgstr "Không phải là tham chiếu hợp lệ: %s" -#: builtin/remote.c:1238 +#: builtin/remote.c:1291 #, c-format msgid "Could not setup %s" msgstr "Không thể cài đặt %s" -#: builtin/remote.c:1274 +#: builtin/remote.c:1307 #, c-format msgid " %s will become dangling!" msgstr " %s sẽ trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1275 +#: builtin/remote.c:1308 #, c-format msgid " %s has become dangling!" msgstr " %s đã trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1281 +#: builtin/remote.c:1314 #, c-format msgid "Pruning %s" msgstr "Đang xén bớt %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1315 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1295 +#: builtin/remote.c:1328 #, c-format msgid " * [would prune] %s" msgstr " * [nên xén bớt] %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1331 #, c-format msgid " * [pruned] %s" msgstr " *[đã bị xén] %s" -#: builtin/remote.c:1321 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "cắt máy chủ sau khi lấy về" -#: builtin/remote.c:1387 builtin/remote.c:1461 +#: builtin/remote.c:1440 builtin/remote.c:1514 #, c-format msgid "No such remote '%s'" msgstr "Không có máy chủ nào có tên “%s”" -#: builtin/remote.c:1407 +#: builtin/remote.c:1460 msgid "add branch" msgstr "thêm nhánh" -#: builtin/remote.c:1414 +#: builtin/remote.c:1467 msgid "no remote specified" msgstr "chưa chỉ ra máy chủ nào" -#: builtin/remote.c:1436 +#: builtin/remote.c:1489 msgid "manipulate push URLs" msgstr "đẩy các “URL” bằng tay" -#: builtin/remote.c:1438 +#: builtin/remote.c:1491 msgid "add URL" msgstr "thêm URL" -#: builtin/remote.c:1440 +#: builtin/remote.c:1493 msgid "delete URLs" msgstr "xóa URLs" -#: builtin/remote.c:1447 +#: builtin/remote.c:1500 msgid "--add --delete doesn't make sense" msgstr "--add --delete không hợp lý" -#: builtin/remote.c:1487 +#: builtin/remote.c:1540 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Kiểu mẫu URL cũ không hợp lệ: %s" -#: builtin/remote.c:1495 +#: builtin/remote.c:1548 #, c-format msgid "No such URL found: %s" msgstr "Không tìm thấy URL như vậy: %s" -#: builtin/remote.c:1497 +#: builtin/remote.c:1550 msgid "Will not delete all non-push URLs" msgstr "Sẽ không xóa những địa chỉ URL không-push" -#: builtin/remote.c:1569 +#: builtin/remote.c:1564 msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trước một lệnh-con" @@ -8753,6 +8820,10 @@ msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì k msgid "size of the window used for delta compression" msgstr "kích thước cửa sổ được dùng cho nén “delta”" +#: builtin/repack.c:162 builtin/repack.c:166 +msgid "bytes" +msgstr "byte" + #: builtin/repack.c:163 msgid "same as the above, but limit memory size instead of entries count" msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng" @@ -8765,7 +8836,7 @@ msgstr "giới hạn độ sâu tối đa của “delta”" msgid "maximum size of each packfile" msgstr "kcíh thước tối đa cho từng tập tin gói" -#: builtin/repack.c:345 +#: builtin/repack.c:343 #, c-format msgid "removing '%s' failed" msgstr "gặp lỗi khi xóa bỏ “%s”" @@ -8779,21 +8850,25 @@ msgid "git replace -d <object>..." msgstr "git replace -d <đối tượng>..." #: builtin/replace.c:19 -msgid "git replace -l [<pattern>]" -msgstr "git replace -l [<mẫu>]" +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<định_dạng>] [-l [<mẫu>]]" -#: builtin/replace.c:131 +#: builtin/replace.c:174 msgid "list replace refs" msgstr "liệt kê các refs thay thế" -#: builtin/replace.c:132 +#: builtin/replace.c:175 msgid "delete replace refs" msgstr "xóa tham chiếu (refs) thay thế" -#: builtin/replace.c:133 +#: builtin/replace.c:176 msgid "replace the ref if it exists" msgstr "thay thế tham chiếu (ref) nếu nó đã sẵn có" +#: builtin/replace.c:177 +msgid "use this format" +msgstr "dùng định dạng này" + #: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" @@ -8912,11 +8987,11 @@ msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn." #: builtin/reset.c:327 #, c-format msgid "%s reset is not allowed in a bare repository" -msgstr "%s reset không được phép trên kho bare (trên máy chủ)" +msgstr "%s reset không được phép trên kho thuần" #: builtin/reset.c:344 msgid "Unstaged changes after reset:" -msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:" +msgstr "Những thay đổi được đưa ra khỏi bệ phóng sau khi reset:" #: builtin/reset.c:350 #, c-format @@ -8927,19 +9002,23 @@ msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét msgid "Could not write new index file." msgstr "Không thể ghi tập tin lưu bảng mục lục mới." -#: builtin/rev-parse.c:345 +#: builtin/rev-parse.c:359 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [các-tùy-chọn] -- [<th.số>...]" -#: builtin/rev-parse.c:350 +#: builtin/rev-parse.c:364 msgid "keep the `--` passed as an arg" -msgstr "giữ “--“ chuyển qua làm tham số" +msgstr "giữ lại “--” chuyển sang làm tham số" -#: builtin/rev-parse.c:352 +#: builtin/rev-parse.c:366 msgid "stop parsing after the first non-option argument" msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn" -#: builtin/rev-parse.c:470 +#: builtin/rev-parse.c:369 +msgid "output in stuck long form" +msgstr "kết xuất trong định dạng gậy dài" + +#: builtin/rev-parse.c:486 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8948,8 +9027,8 @@ msgid "" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" "git rev-parse --parseopt [các-tùy-chọn] -- [<đ.số>...]\n" -" or: git rev-parse --sq-quote [<đ.số>...]\n" -" or: git rev-parse [các-tùy-chọn] [<đ.số>...]\n" +" hoặc: git rev-parse --sq-quote [<đ.số>...]\n" +" hoặc: git rev-parse [các-tùy-chọn] [<đ.số>...]\n" "\n" "Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin về cách dùng." @@ -9012,7 +9091,7 @@ msgstr "tùy chọn cho chiến lược hòa trộn" #: builtin/revert.c:102 msgid "append commit name" -msgstr "nối thêm tên lần chuyển giao (commit)" +msgstr "nối thêm tên lần chuyển giao" #: builtin/revert.c:103 msgid "allow fast-forward" @@ -9024,7 +9103,7 @@ msgstr "cấm khởi tạo lần chuyển giao trống rỗng" #: builtin/revert.c:105 msgid "allow commits with empty messages" -msgstr "chấp nhận chuyển giao (commit) mà không ghi chú gì" +msgstr "chấp nhận chuyển giao mà không ghi chú gì" #: builtin/revert.c:106 msgid "keep redundant, empty commits" @@ -9186,67 +9265,67 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<nền>]] [--list] [<ref>]" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" msgstr "hiển thị các nhánh remote-tracking và nội bộ" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show remote-tracking branches" msgstr "hiển thị các nhánh remote-tracking" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" msgstr "màu “*!+-” tương ứng với nhánh" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "synonym to more=-1" msgstr "đồng nghĩa với more=-1" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "suppress naming strings" msgstr "chặn các chuỗi đặt tên" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "include the current branch" msgstr "bao gồm nhánh hiện hành" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "name commits with their object names" msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show possible merge bases" msgstr "hiển thị mọi cơ sở có thể dùng để hòa trộn" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" msgstr "hiển thị các tham chiếu không thể được đọc bởi bất kỳ tham chiếu khác" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show commits in topological order" msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "hiển thị các lần hòa trộn có thể đọc được chỉ từ một đầu mút" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "topologically sort, maintaining date order where possible" msgstr "sắp xếp hình thái học, bảo trì thứ tự ngày nếu có thể" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:678 msgid "<n>[,<base>]" -msgstr "<n>[,<cơ sở>]" +msgstr "<n>[,<cơ_sở>]" -#: builtin/show-branch.c:680 +#: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (base)" @@ -9417,7 +9496,7 @@ msgstr "đầu thẻ (tag) quá lớn." #: builtin/tag.c:368 msgid "no tag message?" -msgstr "không có thông điệp (message) cho thẻ (tag)?" +msgstr "không có chú thích gì cho cho thẻ à?" #: builtin/tag.c:374 #, c-format @@ -9744,15 +9823,15 @@ msgstr "ngày hết hạn" msgid "no-op (backward compatibility)" msgstr "no-op (tương thích ngược)" -#: parse-options.h:238 +#: parse-options.h:235 msgid "be more verbose" msgstr "chi tiết hơn nữa" -#: parse-options.h:240 +#: parse-options.h:237 msgid "be more quiet" msgstr "im lặng hơn nữa" -#: parse-options.h:246 +#: parse-options.h:243 msgid "use <n> digits to display SHA-1s" msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" @@ -9970,7 +10049,7 @@ msgstr "" #: git-am.sh:776 msgid "Commit Body is:" -msgstr "Thân của lần chuyển giao (commit) là:" +msgstr "Thân của lần chuyển giao là:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English @@ -10061,8 +10140,8 @@ msgstr "" "<nhánh_hợp_lệ>”." #: git-bisect.sh:140 -msgid "won't bisect on seeked tree" -msgstr "sẽ không bisect trêm cây được seek" +msgid "won't bisect on cg-seek'ed tree" +msgstr "sẽ không bisect trêm cây được cg-seek" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" @@ -10095,8 +10174,7 @@ msgstr "“git bisect bad” có thể lấy chỉ một đối số." #. this is less optimum. #: git-bisect.sh:273 msgid "Warning: bisecting only with a bad commit." -msgstr "" -"Cảnh báo: chỉ thực hiện việc bisect với một lần chuyển giao (commit) sai." +msgstr "Cảnh báo: chỉ thực hiện việc bisect với một lần chuyển giao sai." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input @@ -10131,7 +10209,7 @@ msgstr "Chúng tôi không bisect." #: git-bisect.sh:370 #, sh-format msgid "'$invalid' is not a valid commit" -msgstr "”$invalid” không phải là lần chuyển giao (commit) hợp lệ" +msgstr "”$invalid” không phải là lần chuyển giao hợp lệ" #: git-bisect.sh:379 #, sh-format @@ -10212,7 +10290,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:255 +#: git-pull.sh:247 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10223,15 +10301,15 @@ msgstr "" "Cảnh báo: đang fast-forward cây làm việc của bạn từ\n" "Cảnh báo: commit $orig_head." -#: git-pull.sh:280 +#: git-pull.sh:272 msgid "Cannot merge multiple branches into empty head" msgstr "Không thể hòa trộn nhiều nhánh và trong một head trống rỗng" -#: git-pull.sh:284 +#: git-pull.sh:276 msgid "Cannot rebase onto multiple branches" msgstr "Không thể thực hiện lệnh rebase (cơ cấu lại) trên nhiều nhánh" -#: git-rebase.sh:54 +#: git-rebase.sh:55 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -10244,16 +10322,16 @@ msgstr "" "Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy \"git " "rebase --abort\"." -#: git-rebase.sh:156 +#: git-rebase.sh:158 msgid "Applied autostash." msgstr "Đã áp dụng autostash." -#: git-rebase.sh:159 +#: git-rebase.sh:161 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Không thể lưu $stash_sha1" -#: git-rebase.sh:160 +#: git-rebase.sh:162 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -10264,35 +10342,35 @@ msgstr "" "Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc " "nào.\n" -#: git-rebase.sh:199 +#: git-rebase.sh:201 msgid "The pre-rebase hook refused to rebase." msgstr "Móc (hook) pre-rebase từ chối rebase." -#: git-rebase.sh:204 +#: git-rebase.sh:206 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" "Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh " "rebase." -#: git-rebase.sh:338 +#: git-rebase.sh:346 msgid "The --exec option must be used with the --interactive option" msgstr "Tùy chọn --exec phải được sử dụng cùng với tùy chọn --interactive" -#: git-rebase.sh:343 +#: git-rebase.sh:351 msgid "No rebase in progress?" msgstr "Không có tiến trình rebase nào phải không?" -#: git-rebase.sh:354 +#: git-rebase.sh:362 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch " "sử) tương tác." -#: git-rebase.sh:361 +#: git-rebase.sh:369 msgid "Cannot read HEAD" msgstr "Không thể đọc HEAD" -#: git-rebase.sh:364 +#: git-rebase.sh:372 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -10300,12 +10378,12 @@ msgstr "" "Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n" "đó đánh dấu chúng là cần xử lý sử dụng lệnh git add" -#: git-rebase.sh:382 +#: git-rebase.sh:390 #, sh-format msgid "Could not move back to $head_name" msgstr "Không thể quay trở lại $head_name" -#: git-rebase.sh:401 +#: git-rebase.sh:409 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10328,66 +10406,66 @@ msgstr "" "\n" "TÔI: là lệnh bạn vừa gọi!" -#: git-rebase.sh:446 +#: git-rebase.sh:456 #, sh-format msgid "invalid upstream $upstream_name" msgstr "thượng nguồn không hợp lệ $upstream_name" -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ở đây có nhiều hơn một nền móng hòa trộn" -#: git-rebase.sh:473 git-rebase.sh:477 +#: git-rebase.sh:483 git-rebase.sh:487 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ở đây không có nền móng hòa trộn nào" -#: git-rebase.sh:482 +#: git-rebase.sh:492 #, sh-format msgid "Does not point to a valid commit: $onto_name" -msgstr "Không chỉ đến một lần chuyển giao (commit) không hợp lệ: $onto_name" +msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name" -#: git-rebase.sh:505 +#: git-rebase.sh:515 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "nghiêm trọng: không có nhánh như thế: $branch_name" -#: git-rebase.sh:528 +#: git-rebase.sh:548 msgid "Cannot autostash" msgstr "Không thể autostash" -#: git-rebase.sh:533 +#: git-rebase.sh:553 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Đã tạo autostash: $stash_abbrev" -#: git-rebase.sh:537 +#: git-rebase.sh:557 msgid "Please commit or stash them." msgstr "Xin hãy commit hoặc tạm cất (stash) chúng." -#: git-rebase.sh:557 +#: git-rebase.sh:577 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi." -#: git-rebase.sh:561 +#: git-rebase.sh:581 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc." -#: git-rebase.sh:572 +#: git-rebase.sh:592 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Thay đổi từ $mb thành $onto:" #. Detach HEAD and reset the tree -#: git-rebase.sh:581 +#: git-rebase.sh:601 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó..." -#: git-rebase.sh:591 +#: git-rebase.sh:611 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Fast-forward $branch_name thành $onto_name." @@ -10399,7 +10477,7 @@ msgstr "" #: git-stash.sh:74 msgid "You do not have the initial commit yet" -msgstr "Bạn chưa còn có lần chuyển giao (commit) khởi tạo" +msgstr "Bạn chưa còn có lần chuyển giao khởi tạo" #: git-stash.sh:89 msgid "Cannot save the current index state" @@ -10443,8 +10521,8 @@ msgid "" " To provide a message, use git stash save -- '$option'" msgstr "" "lỗi: không hiểu tùy chọn cho “stash save”: $option\n" -" Để dùng thông điệp có chứa -- ở đầu, sử dụng git stash save -- \"$option" -"\"" +" Để có thể dùng lời chú thích có chứa -- ở đầu,\n" +" dùng git stash save -- \"$option\"" #: git-stash.sh:258 msgid "No local changes to save" @@ -10464,7 +10542,7 @@ msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" #: git-stash.sh:383 msgid "No stash found." -msgstr "Không tìm thấy stash nào." +msgstr "Không tìm thấy lần chuyển giao cất đi (stash) nào." #: git-stash.sh:390 #, sh-format @@ -10479,7 +10557,7 @@ msgstr "$reference không phải là tham chiếu hợp lệ" #: git-stash.sh:424 #, sh-format msgid "'$args' is not a stash-like commit" -msgstr "”$args” không phải là lần chuyển giao (commit) kiểu-stash" +msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)" #: git-stash.sh:435 #, sh-format @@ -10504,7 +10582,7 @@ msgstr "Không thể ghi lại cây chỉ mục" #: git-stash.sh:491 msgid "Cannot unstage modified files" -msgstr "Không thể bỏ trạng thía của các tập tin đã được sửa chữa" +msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa" #: git-stash.sh:506 msgid "Index was not unstashed." @@ -10644,45 +10722,45 @@ msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path msgid "Entering '$prefix$displaypath'" msgstr "Đang vào “$prefix$displaypath”" -#: git-submodule.sh:554 +#: git-submodule.sh:559 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" "Dừng lại tại “$prefix$displaypath”; script trả về trạng thái khác không." -#: git-submodule.sh:600 +#: git-submodule.sh:605 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" "Không tìm thấy url cho đường dẫn mô-đun-con “$displaypath” trong .gitmodules" -#: git-submodule.sh:609 +#: git-submodule.sh:614 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:611 +#: git-submodule.sh:616 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "Mô-đun-con “$name” ($url) được đăng ký cho đường dẫn “$displaypath”" -#: git-submodule.sh:619 +#: git-submodule.sh:633 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:656 +#: git-submodule.sh:671 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "Dùng “.” nếu bạn thực sự muốn gỡ bỏ mọi mô-đun-con" -#: git-submodule.sh:673 +#: git-submodule.sh:688 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "Cây làm việc mô-đun-con “$displaypath” có chứa thư mục .git" -#: git-submodule.sh:674 +#: git-submodule.sh:689 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -10690,7 +10768,7 @@ msgstr "" "(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " "chúng)" -#: git-submodule.sh:680 +#: git-submodule.sh:695 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -10699,27 +10777,27 @@ msgstr "" "Cây làm việc mô-đun-con “$displaypath” chứa các thay đổi nội bộ; hãy dùng “-" "f” để loại bỏ chúng đi" -#: git-submodule.sh:683 +#: git-submodule.sh:698 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Đã tạo thư mục “$displaypath”" -#: git-submodule.sh:684 +#: git-submodule.sh:699 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “$displaypath”" -#: git-submodule.sh:687 +#: git-submodule.sh:702 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath”" -#: git-submodule.sh:696 +#: git-submodule.sh:711 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Mô-đun-con “$name” ($url) được bỏ đăng ký cho đường dẫn “$displaypath”" -#: git-submodule.sh:811 +#: git-submodule.sh:834 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" @@ -10728,45 +10806,45 @@ msgstr "" "Đường dẫn mô-đun-con “$displaypath” chưa được khởi tạo.\n" "Có lẽ bạn muốn sử dụng lệnh “update --init”?" -#: git-submodule.sh:824 +#: git-submodule.sh:847 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con " "“$displaypath”" -#: git-submodule.sh:833 +#: git-submodule.sh:856 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" -msgstr "Không thể lấy về (fetch) trong đường dẫn mô-đun-con “$sm_path”" +msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:857 +#: git-submodule.sh:880 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "Không thể lấy về (fetch) trong đường dẫn mô-đun-con “$displaypath”" +msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:871 +#: git-submodule.sh:894 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Không thể rebase “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:872 +#: git-submodule.sh:895 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”" -#: git-submodule.sh:877 +#: git-submodule.sh:900 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:878 +#: git-submodule.sh:901 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”" -#: git-submodule.sh:883 +#: git-submodule.sh:906 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" @@ -10774,69 +10852,82 @@ msgstr "" "Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con " "“$prefix$sm_path”" -#: git-submodule.sh:884 +#: git-submodule.sh:907 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "Đường dẫn mô-đun-con “$prefix$sm_path”: “$command $sha1”" -#: git-submodule.sh:889 +#: git-submodule.sh:912 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Không thể checkout “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:890 +#: git-submodule.sh:913 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”" -#: git-submodule.sh:917 +#: git-submodule.sh:940 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:1025 +#: git-submodule.sh:1048 msgid "The --cached option cannot be used with the --files option" msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files" #. unexpected type -#: git-submodule.sh:1073 +#: git-submodule.sh:1096 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:1093 +#: git-submodule.sh:1116 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr "" -" Cảnh báo: $display_name không chứa lần chuyển giao (commit) $sha1_src" +msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src" -#: git-submodule.sh:1096 +#: git-submodule.sh:1119 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr "" -" Cảnh báo: $display_name không chứa lần chuyển giao (commit) $sha1_dst" +msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst" -#: git-submodule.sh:1099 +#: git-submodule.sh:1122 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -" Cảnh báo: $display_name không chứa những lần chuyển giao (commit) " -"$sha1_src và $sha1_dst" +" Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và " +"$sha1_dst" -#: git-submodule.sh:1124 +#: git-submodule.sh:1147 msgid "blob" msgstr "blob" -#: git-submodule.sh:1238 +#: git-submodule.sh:1261 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:1302 +#: git-submodule.sh:1325 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" +#~ msgid "copied: %s -> %s" +#~ msgstr "đã sao chép: %s -> %s" + +#~ msgid "deleted: %s" +#~ msgstr "đã xóa: %s" + +#~ msgid "modified: %s" +#~ msgstr "đã sửa đổi: %s" + +#~ msgid "renamed: %s -> %s" +#~ msgstr "đã đổi tên: %s -> %s" + +#~ msgid "unmerged: %s" +#~ msgstr "chưa hòa trộn: %s" + #~ msgid "done\n" #~ msgstr "xong\n" @@ -10891,14 +10982,13 @@ msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" #~ msgstr "hiển thị tham chiếu của HEAD" #~ msgid "Unable to fetch in submodule path '$prefix$sm_path'" -#~ msgstr "" -#~ "Không thể lấy về (fetch) trong đường dẫn mô-đun-con “$prefix$sm_path”" +#~ msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$prefix$sm_path”" #~ msgid "Failed to recurse into submodule path '$prefix$sm_path'" #~ msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$prefix$sm_path”" #~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'" -#~ msgstr "Cần %.2f giây để đếm các tập tin chưa được theo vết. “status -uno”" +#~ msgstr "Cần %.2f giây để đếm các tập tin chưa được theo dõi. “status -uno”" #~ msgid "may speed it up, but you have to be careful not to forget to add" #~ msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index b701086e3b..0942835711 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-11-02 08:06+0800\n" -"PO-Revision-Date: 2013-11-02 08:14+0800\n" +"POT-Creation-Date: 2014-02-01 08:06+0800\n" +"PO-Revision-Date: 2014-02-03 10:53+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -60,7 +60,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本库> [--exec <命令>] --list" -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规则 '%s' 未匹配任何文件" @@ -81,8 +81,8 @@ msgstr "前缀" msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 @@ -261,64 +261,64 @@ msgstr "无法为更新锁定引用" msgid "Failed to write ref" msgstr "不能写引用" -#: bundle.c:36 +#: bundle.c:37 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' 不像是一个 v2 版本的包文件" -#: bundle.c:63 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:89 builtin/commit.c:706 +#: bundle.c:90 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:140 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: bundle.c:186 +#: bundle.c:187 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包中含有这个引用：" msgstr[1] "这个包中含有 %d 个引用：" -#: bundle.c:193 +#: bundle.c:194 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" -#: bundle.c:195 +#: bundle.c:196 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用：" msgstr[1] "这个包需要 %d 个引用：" -#: bundle.c:294 +#: bundle.c:296 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:335 +#: bundle.c:337 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:380 +#: bundle.c:382 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" @@ -353,16 +353,16 @@ msgstr "%s %s 不是一个提交!" msgid "memory exhausted" msgstr "内存耗尽" -#: connected.c:60 +#: connected.c:70 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" -#: connected.c:80 +#: connected.c:90 #, c-format msgid "failed write to rev-list: %s" msgstr "无法写入 rev-list：%s" -#: connected.c:88 +#: connected.c:98 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "无法关闭 rev-list 的标准输入：%s" @@ -434,24 +434,29 @@ msgid_plural "%lu years ago" msgstr[0] "%lu 年前" msgstr[1] "%lu 年前" +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "无法读取排序文件 '%s'" + # 译者：注意保持前导空格 -#: diff.c:112 +#: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 -#: diff.c:117 +#: diff.c:118 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" -#: diff.c:210 +#: diff.c:213 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" -#: diff.c:260 +#: diff.c:263 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -460,7 +465,7 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:3490 +#: diff.c:3509 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -469,7 +474,7 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:3504 +#: diff.c:3523 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" @@ -580,7 +585,7 @@ msgid "failed to read the cache" msgstr "无法读取缓存" #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 -#: builtin/clone.c:655 +#: builtin/clone.c:661 msgid "unable to write new index file" msgstr "无法写新的索引文件" @@ -629,7 +634,7 @@ msgstr "不能读取对象 %s '%s'" msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据（blob）对象" -#: merge-recursive.c:774 builtin/clone.c:311 +#: merge-recursive.c:774 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" @@ -679,7 +684,7 @@ msgstr "" msgid "rename" msgstr "重命名" -#: merge-recursive.c:1082 +#: merge-recursive.c:1082 wt-status.c:283 msgid "renamed" msgstr "重命名" @@ -742,7 +747,7 @@ msgstr "对象 %s 不是一个数据（blob）对象" msgid "modify" msgstr "修改" -#: merge-recursive.c:1565 +#: merge-recursive.c:1565 wt-status.c:281 msgid "modified" msgstr "修改" @@ -764,7 +769,7 @@ msgstr "略过 %s（已经做过相同合并）" msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1634 git-submodule.sh:1125 +#: merge-recursive.c:1634 git-submodule.sh:1148 msgid "submodule" msgstr "子模组" @@ -834,7 +839,7 @@ msgstr "合并未返回提交" msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2010 builtin/merge.c:672 +#: merge-recursive.c:2010 builtin/merge.c:665 msgid "Unable to write index." msgstr "不能写入索引。" @@ -890,46 +895,46 @@ msgstr " %s" msgid "-NUM" msgstr "-数字" -#: pathspec.c:118 +#: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容" -#: pathspec.c:128 +#: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容" -#: pathspec.c:158 +#: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路径规则包含无效的神奇前缀" -#: pathspec.c:164 +#: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" -#: pathspec.c:168 +#: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'" -#: pathspec.c:186 +#: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'" -#: pathspec.c:211 +#: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不兼容" -#: pathspec.c:222 +#: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s：'%s' 在版本库之外" -#: pathspec.c:278 +#: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "路径规则 '%s' 在子模组 '%.*s' 中" @@ -939,42 +944,74 @@ msgstr "路径规则 '%s' 在子模组 '%.*s' 中" #. * name. E.g. when add--interactive dies when running #. * "checkout -p" #. -#: pathspec.c:340 +#: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路径规则神奇前缀不被此命令支持：%s" -#: pathspec.c:415 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规则 '%s' 位于符号链接中" -#: remote.c:1833 +#: pathspec.c:442 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" +"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" +"添加 ':/' 或 '.' ？" + +#: remote.c:753 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "不能同时获取 %s 和 %s 至 %s" + +#: remote.c:757 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s 通常跟踪 %s，而非 %s" + +#: remote.c:761 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s 同时跟踪 %s 和 %s" + +#. +#. * This last possibility doesn't occur because +#. * FETCH_HEAD_IGNORE entries always appear at +#. * the end of the list. +#. +#: remote.c:769 +msgid "Internal error" +msgstr "内部错误" + +#: remote.c:1871 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:1837 +#: remote.c:1875 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:1840 +#: remote.c:1878 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:1844 +#: remote.c:1882 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:1850 +#: remote.c:1888 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:1853 +#: remote.c:1891 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -983,11 +1020,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:1861 +#: remote.c:1899 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:1864 +#: remote.c:1902 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1003,7 +1040,7 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:1874 +#: remote.c:1912 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" @@ -1016,14 +1053,14 @@ msgstr "不能打开 /dev/null" msgid "dup2(%d,%d) failed" msgstr "不能调用 dup2(%d,%d)" -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 -#: builtin/merge.c:1013 builtin/merge.c:1023 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 +#: builtin/merge.c:1006 builtin/merge.c:1016 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 -#: builtin/merge.c:1015 builtin/merge.c:1028 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 +#: builtin/merge.c:1008 builtin/merge.c:1021 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" @@ -1262,7 +1299,7 @@ msgstr "不能作为初始提交还原" msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" -#: sha1_name.c:440 +#: sha1_name.c:439 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1283,21 +1320,21 @@ msgstr "" "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关闭本消息通知。" -#: sha1_name.c:1112 +#: sha1_name.c:1070 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: sha1_name.c:1115 +#: sha1_name.c:1073 #, c-format msgid "No such branch: '%s'" msgstr "没有此分支：'%s'" -#: sha1_name.c:1117 +#: sha1_name.c:1075 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: sha1_name.c:1121 +#: sha1_name.c:1079 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" @@ -1405,371 +1442,358 @@ msgstr "无法在口令文件中查询到当前用户：%s" msgid "no such user" msgstr "无此用户" -#: wt-status.c:146 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:173 wt-status.c:200 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:175 wt-status.c:202 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:179 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " （使用 \"git add <file>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:181 wt-status.c:185 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:183 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <file>...\" 标记解决方案）" -#: wt-status.c:194 +#: wt-status.c:198 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:212 +#: wt-status.c:216 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:216 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:218 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:219 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:221 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" # 译者：注意保持前导空格 -#: wt-status.c:233 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）" -#: wt-status.c:250 +#: wt-status.c:254 msgid "bug" msgstr "bug" -#: wt-status.c:255 +#: wt-status.c:259 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:256 +#: wt-status.c:260 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:257 +#: wt-status.c:261 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:259 +#: wt-status.c:263 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:260 +#: wt-status.c:264 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:261 +#: wt-status.c:265 msgid "both modified:" msgstr "双方修改：" +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:275 +msgid "new file" +msgstr "新文件" + +#: wt-status.c:277 +msgid "copied" +msgstr "拷贝" + +#: wt-status.c:279 +msgid "deleted" +msgstr "删除" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:285 +msgid "typechange" +msgstr "类型变更" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:287 +msgid "unknown" +msgstr "未知" + +#: wt-status.c:289 +msgid "unmerged" +msgstr "未合并" + # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:291 +#: wt-status.c:336 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:293 +#: wt-status.c:338 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:295 +#: wt-status.c:340 msgid "untracked content, " msgstr "未跟踪的内容, " -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:312 -#, c-format -msgid "new file: %s" -msgstr "新文件： %s" - -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:315 -#, c-format -msgid "copied: %s -> %s" -msgstr "拷贝： %s -> %s" - -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:318 -#, c-format -msgid "deleted: %s" -msgstr "删除： %s" - -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:321 -#, c-format -msgid "modified: %s" -msgstr "修改： %s" - -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:324 -#, c-format -msgid "renamed: %s -> %s" -msgstr "重命名： %s -> %s" - -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:327 -#, c-format -msgid "typechange: %s" -msgstr "类型变更： %s" - -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:330 -#, c-format -msgid "unknown: %s" -msgstr "未知： %s" - -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:333 -#, c-format -msgid "unmerged: %s" -msgstr "未合并： %s" - -#: wt-status.c:336 +#: wt-status.c:357 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug：未处理的差异状态 %c" -#: wt-status.c:703 +#: wt-status.c:732 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:705 +#: wt-status.c:734 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:848 +#: wt-status.c:836 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" +"不要改动上面的一行。\n" +"下面的所有内容均将被删除。" + +#: wt-status.c:899 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:851 +#: wt-status.c:902 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:854 +#: wt-status.c:905 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:857 +#: wt-status.c:908 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:867 +#: wt-status.c:918 msgid "You are in the middle of an am session." -msgstr "您正处于一个 am 过程中。" +msgstr "您正处于 am 操作过程中。" -#: wt-status.c:870 +#: wt-status.c:921 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:874 +#: wt-status.c:925 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:876 +#: wt-status.c:927 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:878 +#: wt-status.c:929 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:938 wt-status.c:955 +#: wt-status.c:989 wt-status.c:1006 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "您正在将分支 '%s' 变基到 '%s'。" +msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:943 wt-status.c:960 +#: wt-status.c:994 wt-status.c:1011 msgid "You are currently rebasing." -msgstr "您正在变基。" +msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:946 +#: wt-status.c:997 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:948 +#: wt-status.c:999 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:950 +#: wt-status.c:1001 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:963 +#: wt-status.c:1014 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:967 +#: wt-status.c:1018 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." -msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。" +msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:972 +#: wt-status.c:1023 msgid "You are currently splitting a commit during a rebase." -msgstr "您正在变基过程中拆分一个提交。" +msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:975 +#: wt-status.c:1026 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:979 +#: wt-status.c:1030 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." -msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。" +msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:984 +#: wt-status.c:1035 msgid "You are currently editing a commit during a rebase." -msgstr "您正在变基过程中编辑一个提交。" +msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:987 +#: wt-status.c:1038 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:989 +#: wt-status.c:1040 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:999 +#: wt-status.c:1050 #, c-format msgid "You are currently cherry-picking commit %s." -msgstr "您正在做拣选提交 %s。" +msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1004 +#: wt-status.c:1055 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1007 +#: wt-status.c:1058 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1009 +#: wt-status.c:1060 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1018 +#: wt-status.c:1069 #, c-format msgid "You are currently reverting commit %s." -msgstr "您正在反转提交 %s 。" +msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1023 +#: wt-status.c:1074 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1026 +#: wt-status.c:1077 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1028 +#: wt-status.c:1079 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1039 +#: wt-status.c:1090 #, c-format msgid "You are currently bisecting, started from branch '%s'." -msgstr "您正在从分支 '%s' 开始做二分查找。" +msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1043 +#: wt-status.c:1094 msgid "You are currently bisecting." -msgstr "您正在做二分查找。" +msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1046 +#: wt-status.c:1097 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1221 +#: wt-status.c:1272 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1228 +#: wt-status.c:1279 msgid "rebase in progress; onto " -msgstr "变基正在进行中；至 " +msgstr "变基操作正在进行中；至 " -#: wt-status.c:1235 +#: wt-status.c:1286 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1237 +#: wt-status.c:1288 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1240 +#: wt-status.c:1291 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1257 +#: wt-status.c:1308 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1271 +#: wt-status.c:1322 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1273 +#: wt-status.c:1324 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1277 +#: wt-status.c:1328 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1779,94 +1803,94 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1283 +#: wt-status.c:1334 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1285 +#: wt-status.c:1336 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1291 +#: wt-status.c:1342 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1296 +#: wt-status.c:1347 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1299 +#: wt-status.c:1350 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1302 +#: wt-status.c:1353 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1305 +#: wt-status.c:1356 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1308 +#: wt-status.c:1359 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1311 wt-status.c:1316 +#: wt-status.c:1362 wt-status.c:1367 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1314 +#: wt-status.c:1365 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1318 +#: wt-status.c:1369 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1427 +#: wt-status.c:1478 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:1433 +#: wt-status.c:1484 msgid "Initial commit on " msgstr "初始提交于 " -#: wt-status.c:1463 +#: wt-status.c:1514 msgid "gone" msgstr "丢失" # 译者：注意保持句尾空格 -#: wt-status.c:1465 +#: wt-status.c:1516 msgid "behind " msgstr "落后 " # 译者：注意保持句尾空格 -#: wt-status.c:1468 wt-status.c:1471 +#: wt-status.c:1519 wt-status.c:1522 msgid "ahead " msgstr "领先 " # 译者：注意保持句尾空格 -#: wt-status.c:1473 +#: wt-status.c:1524 msgid ", behind " msgstr "，落后 " -#: compat/precompose_utf8.c:55 builtin/clone.c:350 +#: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" @@ -1995,15 +2019,15 @@ msgstr "不能应用 '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 #: builtin/rm.c:269 msgid "dry run" msgstr "演习" #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "冗长输出" @@ -2084,11 +2108,11 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -2417,7 +2441,7 @@ msgid "unable to read index file" msgstr "无法读取索引文件" #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 -#: builtin/fetch.c:77 +#: builtin/fetch.c:78 msgid "path" msgstr "路径" @@ -2615,95 +2639,95 @@ msgstr "git blame [选项] [版本选项] [版本] [--] 文件" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:2248 +#: builtin/blame.c:2249 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:2249 +#: builtin/blame.c:2250 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:2250 +#: builtin/blame.c:2251 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:2251 +#: builtin/blame.c:2252 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:2252 +#: builtin/blame.c:2253 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:2253 +#: builtin/blame.c:2254 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:2254 +#: builtin/blame.c:2255 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:2255 +#: builtin/blame.c:2256 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:2256 +#: builtin/blame.c:2257 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:2257 +#: builtin/blame.c:2258 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:2258 +#: builtin/blame.c:2259 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:2259 +#: builtin/blame.c:2260 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的SHA1提交号（默认：关闭）" -#: builtin/blame.c:2260 +#: builtin/blame.c:2261 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:2261 +#: builtin/blame.c:2262 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:2262 +#: builtin/blame.c:2263 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:2263 +#: builtin/blame.c:2264 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:2264 +#: builtin/blame.c:2265 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:2265 +#: builtin/blame.c:2266 msgid "Use <file>'s contents as the final image" msgstr "使用 <file> 的内容作为最终的图片" -#: builtin/blame.c:2266 builtin/blame.c:2267 +#: builtin/blame.c:2267 builtin/blame.c:2268 msgid "score" msgstr "得分" -#: builtin/blame.c:2266 +#: builtin/blame.c:2267 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:2267 +#: builtin/blame.c:2268 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" @@ -2809,285 +2833,285 @@ msgstr "已删除分支 %s（曾为 %s）。\n" msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指向一个提交" -#: builtin/branch.c:453 +#: builtin/branch.c:454 #, c-format msgid "[%s: gone]" msgstr "[%s: 丢失]" -#: builtin/branch.c:456 +#: builtin/branch.c:459 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s: behind %d]" msgstr "[%s：落后 %d]" -#: builtin/branch.c:461 +#: builtin/branch.c:466 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" -#: builtin/branch.c:465 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d]" msgstr "[%s：领先 %d]" -#: builtin/branch.c:467 +#: builtin/branch.c:472 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s：领先 %d，落后 %d]" -#: builtin/branch.c:473 +#: builtin/branch.c:478 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d，落后 %d]" -#: builtin/branch.c:496 +#: builtin/branch.c:502 msgid " **** invalid ref ****" msgstr " **** 无效引用 ****" -#: builtin/branch.c:588 +#: builtin/branch.c:594 #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" -#: builtin/branch.c:591 +#: builtin/branch.c:597 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（非分支，二分查找开始于 %s）" -#: builtin/branch.c:594 +#: builtin/branch.c:600 #, c-format msgid "(detached from %s)" msgstr "（分离自 %s）" -#: builtin/branch.c:597 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:643 +#: builtin/branch.c:649 #, c-format msgid "object '%s' does not point to a commit" msgstr "对象 '%s' 没有指向一个提交" -#: builtin/branch.c:675 +#: builtin/branch.c:681 msgid "some refs could not be read" msgstr "一些引用不能读取" -#: builtin/branch.c:688 +#: builtin/branch.c:694 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:698 +#: builtin/branch.c:704 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:713 +#: builtin/branch.c:719 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:717 +#: builtin/branch.c:723 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:721 +#: builtin/branch.c:727 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:728 +#: builtin/branch.c:734 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:743 +#: builtin/branch.c:749 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: builtin/branch.c:767 +#: builtin/branch.c:773 #, c-format msgid "could not write branch description template: %s" msgstr "不能写分支描述模版：%s" -#: builtin/branch.c:797 +#: builtin/branch.c:803 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:799 +#: builtin/branch.c:805 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:800 +#: builtin/branch.c:806 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:801 +#: builtin/branch.c:807 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/branch.c:803 +#: builtin/branch.c:809 msgid "change upstream info" msgstr "改变上游信息" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:808 +#: builtin/branch.c:814 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "提交" -#: builtin/branch.c:812 builtin/branch.c:818 +#: builtin/branch.c:818 builtin/branch.c:824 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:824 +#: builtin/branch.c:830 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:825 +#: builtin/branch.c:831 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:827 +#: builtin/branch.c:833 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:828 +#: builtin/branch.c:834 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:829 +#: builtin/branch.c:835 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:830 +#: builtin/branch.c:836 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:831 +#: builtin/branch.c:837 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:832 +#: builtin/branch.c:838 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:834 +#: builtin/branch.c:840 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:835 +#: builtin/branch.c:841 msgid "force creation (when already exists)" msgstr "强制创建（当已经存在）" -#: builtin/branch.c:838 +#: builtin/branch.c:844 msgid "print only not merged branches" msgstr "只打印没有合并的分支" -#: builtin/branch.c:844 +#: builtin/branch.c:850 msgid "print only merged branches" msgstr "只打印合并的分支" -#: builtin/branch.c:848 +#: builtin/branch.c:854 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:861 +#: builtin/branch.c:867 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:866 builtin/clone.c:629 +#: builtin/branch.c:872 builtin/clone.c:635 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:890 +#: builtin/branch.c:896 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:896 builtin/branch.c:935 +#: builtin/branch.c:902 builtin/branch.c:941 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:911 +#: builtin/branch.c:917 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:916 +#: builtin/branch.c:922 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:923 +#: builtin/branch.c:929 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:926 +#: builtin/branch.c:932 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:941 +#: builtin/branch.c:947 msgid "too many branches for a rename operation" msgstr "为重命名操作提供了太多的分支名" -#: builtin/branch.c:946 +#: builtin/branch.c:952 msgid "too many branches to set new upstream" msgstr "为设置新上游提供了太多的分支名" -#: builtin/branch.c:950 +#: builtin/branch.c:956 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" -#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:957 +#: builtin/branch.c:963 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:969 +#: builtin/branch.c:975 msgid "too many branches to unset upstream" msgstr "为取消上游设置操作提供了太多的分支名" -#: builtin/branch.c:973 +#: builtin/branch.c:979 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:979 +#: builtin/branch.c:985 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:994 +#: builtin/branch.c:999 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有意义" -#: builtin/branch.c:1000 +#: builtin/branch.c:1005 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" -#: builtin/branch.c:1003 +#: builtin/branch.c:1008 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3095,7 +3119,7 @@ msgid "" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:1020 +#: builtin/branch.c:1025 #, c-format msgid "" "\n" @@ -3106,12 +3130,12 @@ msgstr "" "如果你想用 '%s' 跟踪 '%s', 这么做：\n" "\n" -#: builtin/branch.c:1021 +#: builtin/branch.c:1026 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1022 +#: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3129,43 +3153,43 @@ msgstr "需要一个版本库来创建包。" msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: builtin/cat-file.c:312 +#: builtin/cat-file.c:328 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" -#: builtin/cat-file.c:313 +#: builtin/cat-file.c:329 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <对象列表>" -#: builtin/cat-file.c:350 +#: builtin/cat-file.c:366 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:351 +#: builtin/cat-file.c:367 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:352 +#: builtin/cat-file.c:368 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:354 +#: builtin/cat-file.c:370 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:355 +#: builtin/cat-file.c:371 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:357 +#: builtin/cat-file.c:373 msgid "for blob objects, run textconv on object's content" msgstr "对于数据（blob）对象，对其内容执行 textconv" -#: builtin/cat-file.c:359 +#: builtin/cat-file.c:375 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:362 +#: builtin/cat-file.c:378 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" @@ -3193,7 +3217,7 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -3483,7 +3507,7 @@ msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 -#: builtin/remote.c:169 builtin/remote.c:171 +#: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "分支" @@ -3531,11 +3555,11 @@ msgstr "强制检出（丢弃本地修改）" msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三路合并" -#: builtin/checkout.c:1106 builtin/merge.c:232 +#: builtin/checkout.c:1106 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 msgid "style" msgstr "风格" @@ -3732,7 +3756,7 @@ msgid "remove whole directories" msgstr "删除整个目录" #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "模式" @@ -3770,8 +3794,8 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [选项] [--] <版本库> [<路径>]" -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 -#: builtin/push.c:474 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 +#: builtin/push.c:521 msgid "force progress reporting" msgstr "强制显示进度报告" @@ -3813,7 +3837,7 @@ msgstr "模板目录将被使用" #: builtin/clone.c:85 msgid "reference repository" -msgstr "引用版本库" +msgstr "参考版本库" #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" @@ -3831,7 +3855,7 @@ msgstr "检出<分支>而不是远程HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 msgid "depth" msgstr "深度" @@ -3862,44 +3886,54 @@ msgstr "在新版本库中设置配置信息" #: builtin/clone.c:252 #, c-format msgid "reference repository '%s' is not a local repository." -msgstr "引用版本库 '%s' 不是一个本地版本库。" +msgstr "参考版本库 '%s' 不是一个本地版本库。" + +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "参考版本库 '%s' 是一个浅克隆" -#: builtin/clone.c:315 +#: builtin/clone.c:259 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "参考版本库 '%s' 已被嫁接" + +#: builtin/clone.c:321 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/clone.c:317 builtin/diff.c:77 +#: builtin/clone.c:323 builtin/diff.c:83 #, c-format msgid "failed to stat '%s'" msgstr "无法枚举 '%s' 状态" -#: builtin/clone.c:319 +#: builtin/clone.c:325 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:333 +#: builtin/clone.c:339 #, c-format msgid "failed to stat %s\n" msgstr "无法枚举 %s 状态\n" -#: builtin/clone.c:355 +#: builtin/clone.c:361 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c:359 +#: builtin/clone.c:365 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c:382 builtin/clone.c:559 +#: builtin/clone.c:388 builtin/clone.c:565 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:395 +#: builtin/clone.c:401 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -3909,99 +3943,108 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git checkout -f HEAD' 重试\n" -#: builtin/clone.c:474 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:554 +#: builtin/clone.c:560 #, c-format msgid "Checking connectivity... " msgstr "检查连接... " -#: builtin/clone.c:557 +#: builtin/clone.c:563 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必须的对象" -#: builtin/clone.c:620 +#: builtin/clone.c:626 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:651 +#: builtin/clone.c:657 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:759 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:763 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" -#: builtin/clone.c:774 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:777 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:790 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:795 +#: builtin/clone.c:802 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:797 +#: builtin/clone.c:805 +msgid "source repository is shallow, ignoring --local" +msgstr "源版本库是浅克隆，忽略 --local" + +#: builtin/clone.c:810 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:807 +#: builtin/clone.c:814 builtin/fetch.c:1119 +#, c-format +msgid "depth %s is not a positive number" +msgstr "深度 %s 不是一个正数" + +#: builtin/clone.c:824 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:817 +#: builtin/clone.c:834 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:830 builtin/clone.c:842 +#: builtin/clone.c:847 builtin/clone.c:859 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:833 +#: builtin/clone.c:850 #, c-format msgid "could not create work tree dir '%s'." msgstr "不能为 '%s' 创建工作区目录。" -#: builtin/clone.c:852 +#: builtin/clone.c:869 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" -#: builtin/clone.c:854 +#: builtin/clone.c:871 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:888 +#: builtin/clone.c:906 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:939 builtin/clone.c:947 +#: builtin/clone.c:957 builtin/clone.c:965 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:950 +#: builtin/clone.c:968 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" @@ -4348,7 +4391,7 @@ msgstr "以简洁的格式显示状态" msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 msgid "machine-readable output" msgstr "机器可读的输出" @@ -4429,7 +4472,7 @@ msgstr "作者" msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1458 builtin/gc.c:260 +#: builtin/commit.c:1458 builtin/gc.c:261 msgid "date" msgstr "日期" @@ -4437,7 +4480,7 @@ msgstr "日期" msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 #: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "说明" @@ -4491,11 +4534,11 @@ msgstr "设置如何删除提交说明里的空格和#注释" msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 msgid "key id" msgstr "key id" -#: builtin/commit.c:1471 builtin/merge.c:231 +#: builtin/commit.c:1471 builtin/merge.c:224 msgid "GPG sign commit" msgstr "GPG 提交签名" @@ -4552,7 +4595,7 @@ msgstr "允许空的提交说明" msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1567 builtin/merge.c:525 +#: builtin/commit.c:1567 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" @@ -4571,29 +4614,29 @@ msgstr "不能读取 MERGE_MODE" msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1614 +#: builtin/commit.c:1611 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1655 +#: builtin/commit.c:1652 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" -#: builtin/commit.c:1659 +#: builtin/commit.c:1656 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" -#: builtin/commit.c:1670 +#: builtin/commit.c:1667 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4854,7 +4897,7 @@ msgstr "考虑最近 <n> 个 tags（默认：10）" msgid "only consider tags matching <pattern>" msgstr "只考虑匹配 <模式> 的 tags" -#: builtin/describe.c:423 builtin/name-rev.c:322 +#: builtin/describe.c:423 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" @@ -4878,31 +4921,31 @@ msgstr "没有发现名称，无法描述任何东西。" msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 不能与提交同时使用" -#: builtin/diff.c:79 +#: builtin/diff.c:85 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:230 +#: builtin/diff.c:236 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:307 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "不是一个 git 版本库" -#: builtin/diff.c:350 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:359 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据（blob）对象：'%s'" -#: builtin/diff.c:366 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "提供了无法处理的对象 '%s'。" @@ -4963,146 +5006,155 @@ msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:74 +#: builtin/fetch.c:75 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:76 +#: builtin/fetch.c:77 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:78 +#: builtin/fetch.c:79 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:79 +#: builtin/fetch.c:80 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/fetch.c:81 +#: builtin/fetch.c:82 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:83 +#: builtin/fetch.c:84 msgid "fetch all tags and associated objects" msgstr "抓取所有的 tags 和关联对象" -#: builtin/fetch.c:85 +#: builtin/fetch.c:86 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何 tags (--no-tags)" -#: builtin/fetch.c:87 +#: builtin/fetch.c:88 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" # 译者：可选值，不能翻译 -#: builtin/fetch.c:88 +#: builtin/fetch.c:89 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:89 +#: builtin/fetch.c:90 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:93 +#: builtin/fetch.c:94 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:95 +#: builtin/fetch.c:96 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:98 +#: builtin/fetch.c:99 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:100 +#: builtin/fetch.c:101 msgid "convert to a complete repository" msgstr "转换为一个完整的版本库" -#: builtin/fetch.c:102 builtin/log.c:1197 +#: builtin/fetch.c:103 builtin/log.c:1197 msgid "dir" msgstr "目录" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:106 +#: builtin/fetch.c:107 msgid "default mode for recursion" msgstr "递归的默认模式" -#: builtin/fetch.c:236 +#: builtin/fetch.c:109 +msgid "accept refs that update .git/shallow" +msgstr "接受更新 .git/shallow 的引用" + +#: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:290 +#: builtin/fetch.c:411 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:295 +#: builtin/fetch.c:416 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:309 +#: builtin/fetch.c:430 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）" -#: builtin/fetch.c:310 builtin/fetch.c:396 +#: builtin/fetch.c:431 builtin/fetch.c:517 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:321 +#: builtin/fetch.c:442 msgid "[tag update]" msgstr "[tag更新]" # 译者：注意保持前导空格 -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 msgid " (unable to update local ref)" msgstr " （不能更新本地引用）" -#: builtin/fetch.c:341 +#: builtin/fetch.c:462 msgid "[new tag]" msgstr "[新tag]" -#: builtin/fetch.c:344 +#: builtin/fetch.c:465 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:347 +#: builtin/fetch.c:468 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:398 +#: builtin/fetch.c:519 msgid "(non-fast-forward)" msgstr "（非快进式）" -#: builtin/fetch.c:429 builtin/fetch.c:735 +#: builtin/fetch.c:552 builtin/fetch.c:785 #, c-format msgid "cannot open %s: %s\n" msgstr "无法打开 %s：%s\n" -#: builtin/fetch.c:438 +#: builtin/fetch.c:561 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:537 +#: builtin/fetch.c:579 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "拒绝 %s 因为浅克隆不允许被更新" + +#: builtin/fetch.c:667 builtin/fetch.c:750 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:548 +#: builtin/fetch.c:678 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5112,87 +5164,87 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:598 +#: builtin/fetch.c:730 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:599 +#: builtin/fetch.c:731 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:606 +#: builtin/fetch.c:755 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:607 builtin/remote.c:1055 +#: builtin/fetch.c:756 builtin/remote.c:1050 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:725 +#: builtin/fetch.c:775 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非裸版本库的当前分支 %s" -#: builtin/fetch.c:744 +#: builtin/fetch.c:794 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:747 +#: builtin/fetch.c:797 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:801 +#: builtin/fetch.c:853 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:976 +#: builtin/fetch.c:1015 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:978 builtin/remote.c:100 +#: builtin/fetch.c:1017 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1036 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" -#: builtin/fetch.c:1020 +#: builtin/fetch.c:1059 msgid "You need to specify a tag name." msgstr "您需要指定一个 tag 名称。" -#: builtin/fetch.c:1068 +#: builtin/fetch.c:1107 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1109 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的版本库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1089 +#: builtin/fetch.c:1132 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个版本库参数" -#: builtin/fetch.c:1091 +#: builtin/fetch.c:1134 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规则没有任何意义" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1145 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1110 +#: builtin/fetch.c:1153 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规则没有意义" @@ -5202,8 +5254,9 @@ msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 +#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446 +#: parse-options.h:135 parse-options.h:242 msgid "n" msgstr "n" @@ -5227,43 +5280,43 @@ msgstr "使用 <文本> 作为提交说明的开始" msgid "file to read from" msgstr "从文件中读取" -#: builtin/for-each-ref.c:995 +#: builtin/for-each-ref.c:1063 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [选项] [<模式>]" -#: builtin/for-each-ref.c:1010 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" -#: builtin/for-each-ref.c:1012 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" -#: builtin/for-each-ref.c:1014 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" -#: builtin/for-each-ref.c:1016 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for tcl" msgstr "引用占位符适用于 tcl" -#: builtin/for-each-ref.c:1019 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177 msgid "format" msgstr "格式" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "输出格式" -#: builtin/for-each-ref.c:1021 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "key" -#: builtin/for-each-ref.c:1022 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "排序的字段名" @@ -5307,41 +5360,41 @@ msgstr "启用更严格的检查" msgid "write dangling objects in .git/lost-found" msgstr "将摇摆对象写入 .git/lost-found 中" -#: builtin/fsck.c:623 builtin/prune.c:134 +#: builtin/fsck.c:623 builtin/prune.c:144 msgid "show progress" msgstr "显示进度" -#: builtin/gc.c:23 +#: builtin/gc.c:24 msgid "git gc [options]" msgstr "git gc [选项]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Invalid %s: '%s'" msgstr "无效的 %s：'%s'" -#: builtin/gc.c:106 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "不正常的长对象目录 %.*s" -#: builtin/gc.c:261 +#: builtin/gc.c:262 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:263 +#: builtin/gc.c:264 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:264 +#: builtin/gc.c:265 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:265 +#: builtin/gc.c:266 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:305 +#: builtin/gc.c:306 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -5351,14 +5404,14 @@ msgstr "" "参见 \"git help gc\" 以获取更多信息。\n" #. be quiet on --auto -#: builtin/gc.c:315 +#: builtin/gc.c:316 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）" -#: builtin/gc.c:340 +#: builtin/gc.c:341 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" @@ -5695,57 +5748,57 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" -#: builtin/help.c:349 +#: builtin/help.c:353 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:366 +#: builtin/help.c:370 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:374 +#: builtin/help.c:378 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:420 +#: builtin/help.c:424 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: builtin/help.c:421 +#: builtin/help.c:425 msgid "A Git glossary" msgstr "Git 词汇表" -#: builtin/help.c:422 +#: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: builtin/help.c:423 +#: builtin/help.c:427 msgid "Defining submodule properties" msgstr "定义子模组属性" -#: builtin/help.c:424 +#: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: builtin/help.c:425 +#: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "一个 Git 教程（针对 1.5.1 或更新版本）" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" -#: builtin/help.c:438 +#: builtin/help.c:442 msgid "The common Git guides are:\n" msgstr "最常用的 Git 向导有：\n" -#: builtin/help.c:460 builtin/help.c:476 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:492 +#: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" @@ -6155,21 +6208,21 @@ msgstr "权限" msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本库是多个用户之间共享的" -#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 msgid "be quiet" msgstr "保持安静" -#: builtin/init-db.c:522 builtin/init-db.c:529 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:533 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:555 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6178,11 +6231,11 @@ msgstr "" "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-" "dir=<directory>）" -#: builtin/init-db.c:579 +#: builtin/init-db.c:580 msgid "Cannot access current working directory" msgstr "不能访问当前工作目录" -#: builtin/init-db.c:586 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" @@ -6604,149 +6657,149 @@ msgstr "可用的策略有：" msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:198 +#: builtin/merge.c:191 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:201 +#: builtin/merge.c:194 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:202 +#: builtin/merge.c:195 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:204 +#: builtin/merge.c:197 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:207 +#: builtin/merge.c:200 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:209 +#: builtin/merge.c:202 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:211 +#: builtin/merge.c:204 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:212 +#: builtin/merge.c:205 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:214 +#: builtin/merge.c:207 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:218 +#: builtin/merge.c:211 msgid "Verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "策略" -#: builtin/merge.c:220 +#: builtin/merge.c:213 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:221 +#: builtin/merge.c:214 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:222 +#: builtin/merge.c:215 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:224 +#: builtin/merge.c:217 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c:228 +#: builtin/merge.c:221 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" -#: builtin/merge.c:257 +#: builtin/merge.c:250 msgid "could not run stash." msgstr "不能进行进度保存。" -#: builtin/merge.c:262 +#: builtin/merge.c:255 msgid "stash failed" msgstr "进度保存失败" -#: builtin/merge.c:267 +#: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:286 builtin/merge.c:303 +#: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 -#: builtin/merge.c:333 +#: builtin/merge.c:326 msgid " (nothing to squash)" msgstr " （无可压缩）" -#: builtin/merge.c:346 +#: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:378 +#: builtin/merge.c:371 msgid "Writing SQUASH_MSG" msgstr "写入 SQUASH_MSG" -#: builtin/merge.c:380 +#: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" msgstr "完成 SQUASH_MSG" -#: builtin/merge.c:403 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:453 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:565 +#: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:657 +#: builtin/merge.c:650 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/merge.c:685 +#: builtin/merge.c:678 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:699 +#: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:713 +#: builtin/merge.c:706 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:802 +#: builtin/merge.c:795 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:811 +#: builtin/merge.c:804 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:817 +#: builtin/merge.c:810 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6760,47 +6813,47 @@ msgstr "" "\n" "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:841 +#: builtin/merge.c:834 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:853 +#: builtin/merge.c:846 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:918 +#: builtin/merge.c:911 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:934 +#: builtin/merge.c:927 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:975 +#: builtin/merge.c:968 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:977 +#: builtin/merge.c:970 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程版本库。" -#: builtin/merge.c:979 +#: builtin/merge.c:972 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:984 +#: builtin/merge.c:977 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1140 +#: builtin/merge.c:1133 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1156 git-pull.sh:31 +#: builtin/merge.c:1149 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6808,11 +6861,11 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1159 git-pull.sh:34 +#: builtin/merge.c:1152 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: builtin/merge.c:1163 +#: builtin/merge.c:1156 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6820,137 +6873,145 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1166 +#: builtin/merge.c:1159 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1175 +#: builtin/merge.c:1168 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1184 +#: builtin/merge.c:1177 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1216 +#: builtin/merge.c:1209 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1219 +#: builtin/merge.c:1212 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1221 +#: builtin/merge.c:1214 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1226 +#: builtin/merge.c:1219 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1277 +#: builtin/merge.c:1270 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1280 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" #. 'N' -#: builtin/merge.c:1283 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有一个 GPG 签名。" -#: builtin/merge.c:1286 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: builtin/merge.c:1370 +#: builtin/merge.c:1363 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1409 +#: builtin/merge.c:1402 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1416 +#: builtin/merge.c:1409 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1448 +#: builtin/merge.c:1441 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1471 builtin/merge.c:1550 +#: builtin/merge.c:1464 builtin/merge.c:1543 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1468 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1534 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1543 +#: builtin/merge.c:1536 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1545 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1557 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" -#: builtin/merge-base.c:26 +#: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." msgstr "git merge-base [-a|--all] <提交> <提交>..." -#: builtin/merge-base.c:27 +#: builtin/merge-base.c:30 msgid "git merge-base [-a|--all] --octopus <commit>..." msgstr "git merge-base [-a|--all] --octopus <提交>..." -#: builtin/merge-base.c:28 +#: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <提交>..." -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <提交> <提交>" -#: builtin/merge-base.c:98 +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <提交> [<提交>]" + +#: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "输出所有共同的祖先" -#: builtin/merge-base.c:99 +#: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "查找一个多路合并的祖先提交" -#: builtin/merge-base.c:100 +#: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "显示不能被其他访问到的版本" -#: builtin/merge-base.c:102 +#: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先提交么？" +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "查找 <commit> 从<引用>日志的何处分支的" + #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " @@ -7010,122 +7071,126 @@ msgstr "允许创建一个以上的树" msgid "git mv [options] <source>... <destination>" msgstr "git mv [选项] <源>... <目标>" -#: builtin/mv.c:67 +#: builtin/mv.c:71 msgid "force move/rename even if target exists" msgstr "强制移动/重命令，即使目标存在" -#: builtin/mv.c:68 +#: builtin/mv.c:72 msgid "skip move/rename errors" msgstr "跳过移动/重命名错误" -#: builtin/mv.c:113 +#: builtin/mv.c:122 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" -#: builtin/mv.c:117 +#: builtin/mv.c:126 msgid "bad source" msgstr "坏的源" -#: builtin/mv.c:120 +#: builtin/mv.c:129 msgid "can not move directory into itself" msgstr "不能将目录移动到自身" -#: builtin/mv.c:123 +#: builtin/mv.c:132 msgid "cannot move directory over file" msgstr "不能将目录移动到文件" -#: builtin/mv.c:129 +#: builtin/mv.c:138 #, c-format msgid "Huh? Directory %s is in index and no submodule?" msgstr "嗯？目录 %s 在索引中并且不是子模组？" -#: builtin/mv.c:131 builtin/rm.c:318 +#: builtin/mv.c:140 builtin/rm.c:318 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" -#: builtin/mv.c:147 +#: builtin/mv.c:156 #, c-format msgid "Huh? %.*s is in index?" msgstr "嗯？%.*s 在索引中？" -#: builtin/mv.c:159 +#: builtin/mv.c:168 msgid "source directory is empty" msgstr "源目录为空" -#: builtin/mv.c:191 +#: builtin/mv.c:200 msgid "not under version control" msgstr "不在版本控制之下" -#: builtin/mv.c:193 +#: builtin/mv.c:202 msgid "destination exists" msgstr "目标已存在" -#: builtin/mv.c:201 +#: builtin/mv.c:210 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" -#: builtin/mv.c:204 +#: builtin/mv.c:213 msgid "Cannot overwrite" msgstr "不能覆盖" -#: builtin/mv.c:207 +#: builtin/mv.c:216 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" -#: builtin/mv.c:222 +#: builtin/mv.c:218 +msgid "destination directory does not exist" +msgstr "目标目录不存在" + +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" -#: builtin/mv.c:232 +#: builtin/mv.c:243 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [options] <commit>..." msgstr "git name-rev [选项] <提交>..." -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [options] --all" msgstr "git name-rev [选项] --all" -#: builtin/name-rev.c:261 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --stdin" msgstr "git name-rev [选项] --stdin" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "只打印名称（无 SHA-1）" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "只使用 tags 来命名提交" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "从标准输入读取" -#: builtin/name-rev.c:320 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" -#: builtin/name-rev.c:326 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的 tags（内部使用）" @@ -7440,7 +7505,7 @@ msgstr "注解引用" msgid "use notes from <notes_ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:974 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" @@ -7458,145 +7523,145 @@ msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表] msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2396 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2400 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2423 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2427 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "不能解析选项 %1$s 的值 '%2$s'" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2446 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2448 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2450 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2453 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2454 msgid "version[,offset]" msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2455 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2458 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2460 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从替代对象存储里借用对象" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2462 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2464 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2466 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2468 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2470 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2472 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2474 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2476 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2478 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2480 msgid "read revision arguments from standard input" msgstr "从标准输入读取修订号参数" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2482 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2485 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2488 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2491 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2493 msgid "include tag objects that refer to objects to be packed" msgstr "包括引用了打包对象的 tag" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2495 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2498 parse-options.h:143 +#: builtin/pack-objects.c:2496 parse-options.h:143 msgid "time" msgstr "时间" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2497 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2500 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2502 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2504 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2508 +#: builtin/pack-objects.c:2506 msgid "do not hide commits by grafts" -msgstr "不隐藏移植覆盖的提交" +msgstr "显示被嫁接隐藏的提交" #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" @@ -7618,15 +7683,15 @@ msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" -#: builtin/prune.c:132 +#: builtin/prune.c:142 msgid "do not remove, show only" msgstr "不删除，只显示" -#: builtin/prune.c:133 +#: builtin/prune.c:143 msgid "report pruned objects" msgstr "报告清除的对象" -#: builtin/prune.c:136 +#: builtin/prune.c:146 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" @@ -7634,15 +7699,15 @@ msgstr "使早于给定时间的对象过期" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<版本库> [<引用规则>...]]" -#: builtin/push.c:47 +#: builtin/push.c:86 msgid "tag shorthand without <tag>" msgstr "tag 简写没有跟 <tag> 参数" -#: builtin/push.c:66 +#: builtin/push.c:96 msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受简单的目标引用名" -#: builtin/push.c:101 +#: builtin/push.c:141 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -7650,7 +7715,7 @@ msgstr "" "\n" "为了永久地选择任一选项，参见 'git help config' 中的 push.default。" -#: builtin/push.c:104 +#: builtin/push.c:144 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7674,7 +7739,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:119 +#: builtin/push.c:159 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7688,7 +7753,7 @@ msgstr "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" -#: builtin/push.c:133 +#: builtin/push.c:173 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7701,12 +7766,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:141 +#: builtin/push.c:181 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:144 +#: builtin/push.c:184 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7717,7 +7782,7 @@ msgstr "" "而没有告诉我要推送什么、更新哪个远程分支。" # 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 -#: builtin/push.c:167 +#: builtin/push.c:207 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7729,13 +7794,20 @@ msgid "" "\n" " git config --global push.default simple\n" "\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"In Git 2.0, Git will default to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -"push.default 未设置，它的默认值将在 Git 2.0 由 'matching'\n" -"改变为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n" +"push.default 尚未设置，它的默认值在 Git 2.0 从 'matching'\n" +"变更为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n" "\n" " git config --global push.default matching\n" "\n" @@ -7743,16 +7815,22 @@ msgstr "" "\n" " git config --global push.default simple\n" "\n" +"当 push.default 设置为 'matching' 后，git 将推送和远程同名的所有\n" +"本地分支。\n" +"\n" +"从 Git 2.0 开始，Git 缺省采用更为保守的 'simple' 模式，只推送当前\n" +"分支到远程关联的同名分支，即 'git push' 推送当前分支。\n" +"\n" "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n" "为保持兼容，请用 'current' 代替 'simple'）" -#: builtin/push.c:227 +#: builtin/push.c:274 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推送指定任何引用规则，并且 push.default 为 \"nothing\"。" -#: builtin/push.c:234 +#: builtin/push.c:281 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7763,7 +7841,7 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:240 +#: builtin/push.c:287 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7775,7 +7853,7 @@ msgstr "" "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" "以便只推送当前分支。" -#: builtin/push.c:246 +#: builtin/push.c:293 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -7786,7 +7864,7 @@ msgstr "" "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:252 +#: builtin/push.c:299 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -7799,11 +7877,11 @@ msgstr "" "（如 'git pull ...'）。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:259 +#: builtin/push.c:306 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒绝因为 tag 在远程已经存在。" -#: builtin/push.c:262 +#: builtin/push.c:309 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -7812,22 +7890,22 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:328 +#: builtin/push.c:375 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:332 +#: builtin/push.c:379 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:365 +#: builtin/push.c:412 #, c-format msgid "bad repository '%s'" msgstr "坏的版本库 '%s'" -#: builtin/push.c:366 +#: builtin/push.c:413 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7848,95 +7926,95 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:381 +#: builtin/push.c:428 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:382 +#: builtin/push.c:429 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用规则同时使用" -#: builtin/push.c:387 +#: builtin/push.c:434 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:388 +#: builtin/push.c:435 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规则同时使用" -#: builtin/push.c:393 +#: builtin/push.c:440 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:453 +#: builtin/push.c:500 msgid "repository" msgstr "版本库" -#: builtin/push.c:454 +#: builtin/push.c:501 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:455 +#: builtin/push.c:502 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:457 +#: builtin/push.c:504 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:458 +#: builtin/push.c:505 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送 tags（不能使用 --all or --mirror）" -#: builtin/push.c:461 +#: builtin/push.c:508 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:463 +#: builtin/push.c:510 msgid "refname>:<expect" msgstr "引用名>:<期望值" -#: builtin/push.c:464 +#: builtin/push.c:511 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:466 +#: builtin/push.c:513 msgid "check" msgstr "检查" -#: builtin/push.c:467 +#: builtin/push.c:514 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:469 +#: builtin/push.c:516 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:470 builtin/push.c:471 +#: builtin/push.c:517 builtin/push.c:518 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:472 +#: builtin/push.c:519 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:475 +#: builtin/push.c:522 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:477 +#: builtin/push.c:524 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:478 +#: builtin/push.c:525 msgid "push missing but relevant tags" msgstr "推送缺失的有关的 tags" -#: builtin/push.c:488 +#: builtin/push.c:535 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:490 +#: builtin/push.c:537 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" @@ -8024,11 +8102,11 @@ msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一个有效的时间戳" -#: builtin/remote.c:11 +#: builtin/remote.c:12 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -8036,81 +8114,81 @@ msgstr "" "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <名称> <url>" -#: builtin/remote.c:13 builtin/remote.c:32 +#: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "git remote rename <旧名称> <新名称>" -#: builtin/remote.c:14 builtin/remote.c:37 +#: builtin/remote.c:15 builtin/remote.c:38 msgid "git remote remove <name>" msgstr "git remote remove <名称>" -#: builtin/remote.c:15 +#: builtin/remote.c:16 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <名称>" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <名称>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <名称> <分支>..." -#: builtin/remote.c:20 builtin/remote.c:68 +#: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <名称> <新的地址>" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <名称> <地址>" -#: builtin/remote.c:27 +#: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<选项>] <名称> <地址>" -#: builtin/remote.c:42 +#: builtin/remote.c:43 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" -#: builtin/remote.c:47 +#: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <名称> <分支>..." -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <名称> <分支>..." -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "git remote show [<选项>] <名称>" -#: builtin/remote.c:58 +#: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<选项>] <名称>" -#: builtin/remote.c:63 +#: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<选项>] [<组> | <远程>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "更新 %s 中" -#: builtin/remote.c:130 +#: builtin/remote.c:120 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -8118,101 +8196,101 @@ msgstr "" "--mirror 选项危险且过时，请使用 --mirror=fetch\n" "\t 或 --mirror=push" -#: builtin/remote.c:147 +#: builtin/remote.c:137 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的镜像参数：%s" -#: builtin/remote.c:163 +#: builtin/remote.c:153 msgid "fetch the remote branches" msgstr "抓取远程的分支" -#: builtin/remote.c:165 +#: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" msgstr "抓取时导入所有的 tags 和关联对象" -#: builtin/remote.c:168 +#: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" msgstr "或不抓取任何 tag（--no-tags）" -#: builtin/remote.c:170 +#: builtin/remote.c:160 msgid "branch(es) to track" msgstr "跟踪的分支" -#: builtin/remote.c:171 +#: builtin/remote.c:161 msgid "master branch" msgstr "主线分支" -#: builtin/remote.c:172 +#: builtin/remote.c:162 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:173 +#: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" msgstr "把远程设置为用以推送或抓取的镜像" -#: builtin/remote.c:185 +#: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" -#: builtin/remote.c:187 +#: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" -#: builtin/remote.c:195 builtin/remote.c:646 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "远程 %s 已经存在。" -#: builtin/remote.c:199 builtin/remote.c:650 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一个有效的远程名称" -#: builtin/remote.c:243 +#: builtin/remote.c:233 #, c-format msgid "Could not setup master '%s'" msgstr "无法设置 master '%s'" -#: builtin/remote.c:299 +#: builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "多于一个 %s" -#: builtin/remote.c:339 +#: builtin/remote.c:334 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "无法得到引用规则 %s 的获取列表" -#: builtin/remote.c:440 builtin/remote.c:448 +#: builtin/remote.c:435 builtin/remote.c:443 msgid "(matching)" msgstr "（匹配）" -#: builtin/remote.c:452 +#: builtin/remote.c:447 msgid "(delete)" msgstr "（删除）" -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "不能添加 '%s' 至 '%s'" -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 #, c-format msgid "No such remote: %s" msgstr "没有这样的远程：%s" -#: builtin/remote.c:656 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重命名配置小节 '%s' 到 '%s'" -#: builtin/remote.c:662 builtin/remote.c:799 +#: builtin/remote.c:657 builtin/remote.c:794 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除配置小节 '%s'" -#: builtin/remote.c:677 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8223,32 +8301,32 @@ msgstr "" "\t%s\n" "\t如果必要请手动更新配置。" -#: builtin/remote.c:683 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "不能追加 '%s'" -#: builtin/remote.c:694 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "不能设置 '%s'" -#: builtin/remote.c:716 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "删除 '%s' 失败" -#: builtin/remote.c:750 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" -#: builtin/remote.c:764 +#: builtin/remote.c:759 #, c-format msgid "Could not remove branch %s" msgstr "无法移除分支 %s" -#: builtin/remote.c:834 +#: builtin/remote.c:829 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8258,126 +8336,126 @@ msgid_plural "" msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" -#: builtin/remote.c:943 +#: builtin/remote.c:938 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次获取将存储于 remotes/%s）" -#: builtin/remote.c:946 +#: builtin/remote.c:941 msgid " tracked" msgstr " 已跟踪" -#: builtin/remote.c:948 +#: builtin/remote.c:943 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时（使用 'git remote prune' 来移除）" -#: builtin/remote.c:950 +#: builtin/remote.c:945 msgid " ???" msgstr " ???" -#: builtin/remote.c:991 +#: builtin/remote.c:986 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支" -#: builtin/remote.c:998 +#: builtin/remote.c:993 #, c-format msgid "rebases onto remote %s" msgstr "变基到远程 %s" -#: builtin/remote.c:1001 +#: builtin/remote.c:996 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s 合并" -#: builtin/remote.c:1002 +#: builtin/remote.c:997 msgid " and with remote" msgstr " 且有远程" -#: builtin/remote.c:1004 +#: builtin/remote.c:999 #, c-format msgid "merges with remote %s" msgstr "与远程 %s 合并" -#: builtin/remote.c:1005 +#: builtin/remote.c:1000 msgid " and with remote" msgstr " 且有远程" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 msgid "create" msgstr "创建" -#: builtin/remote.c:1054 +#: builtin/remote.c:1049 msgid "delete" msgstr "删除" -#: builtin/remote.c:1058 +#: builtin/remote.c:1053 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1061 +#: builtin/remote.c:1056 msgid "fast-forwardable" msgstr "可快进" -#: builtin/remote.c:1064 +#: builtin/remote.c:1059 msgid "local out of date" msgstr "本地已过时" -#: builtin/remote.c:1071 +#: builtin/remote.c:1066 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推送至 %-*s (%s)" -#: builtin/remote.c:1074 +#: builtin/remote.c:1069 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推送至 %s" -#: builtin/remote.c:1081 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1091 +#: builtin/remote.c:1144 msgid "do not query remotes" msgstr "不查询远程" -#: builtin/remote.c:1118 +#: builtin/remote.c:1171 #, c-format msgid "* remote %s" msgstr "* 远程 %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1172 #, c-format msgid " Fetch URL: %s" msgstr " 获取地址：%s" -#: builtin/remote.c:1120 builtin/remote.c:1285 +#: builtin/remote.c:1173 builtin/remote.c:1318 msgid "(no URL)" msgstr "(无 URL)" -#: builtin/remote.c:1129 builtin/remote.c:1131 +#: builtin/remote.c:1182 builtin/remote.c:1184 #, c-format msgid " Push URL: %s" msgstr " 推送地址：%s" -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 #, c-format msgid " HEAD branch: %s" msgstr " HEAD分支：%s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1192 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n" -#: builtin/remote.c:1151 +#: builtin/remote.c:1204 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -8385,138 +8463,138 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1154 builtin/remote.c:1181 +#: builtin/remote.c:1207 builtin/remote.c:1234 msgid " (status not queried)" msgstr "（状态未查询）" -#: builtin/remote.c:1163 +#: builtin/remote.c:1216 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 为 'git pull' 配置的本地分支：" msgstr[1] " 为 'git pull' 配置的本地分支：" -#: builtin/remote.c:1171 +#: builtin/remote.c:1224 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" -#: builtin/remote.c:1178 +#: builtin/remote.c:1231 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' 配置的本地引用%s：" msgstr[1] " 为 'git push' 配置的本地引用%s：" -#: builtin/remote.c:1199 +#: builtin/remote.c:1252 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根据远程设置 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1201 +#: builtin/remote.c:1254 msgid "delete refs/remotes/<name>/HEAD" msgstr "删除 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1216 +#: builtin/remote.c:1269 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" -#: builtin/remote.c:1218 +#: builtin/remote.c:1271 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1228 +#: builtin/remote.c:1281 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" -#: builtin/remote.c:1236 +#: builtin/remote.c:1289 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用：%s" -#: builtin/remote.c:1238 +#: builtin/remote.c:1291 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者：注意保持前导空格 -#: builtin/remote.c:1274 +#: builtin/remote.c:1307 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 -#: builtin/remote.c:1275 +#: builtin/remote.c:1308 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为摇摆状态！" -#: builtin/remote.c:1281 +#: builtin/remote.c:1314 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1315 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1295 +#: builtin/remote.c:1328 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1331 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" -#: builtin/remote.c:1321 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "抓取后清除远程" -#: builtin/remote.c:1387 builtin/remote.c:1461 +#: builtin/remote.c:1440 builtin/remote.c:1514 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" -#: builtin/remote.c:1407 +#: builtin/remote.c:1460 msgid "add branch" msgstr "添加分支" -#: builtin/remote.c:1414 +#: builtin/remote.c:1467 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1436 +#: builtin/remote.c:1489 msgid "manipulate push URLs" msgstr "操作推送 URLS" -#: builtin/remote.c:1438 +#: builtin/remote.c:1491 msgid "add URL" msgstr "添加 URL" -#: builtin/remote.c:1440 +#: builtin/remote.c:1493 msgid "delete URLs" msgstr "删除 URLS" -#: builtin/remote.c:1447 +#: builtin/remote.c:1500 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" -#: builtin/remote.c:1487 +#: builtin/remote.c:1540 #, c-format msgid "Invalid old URL pattern: %s" msgstr "无效的旧URL匹配模版：%s" -#: builtin/remote.c:1495 +#: builtin/remote.c:1548 #, c-format msgid "No such URL found: %s" msgstr "未找到此URL：%s" -#: builtin/remote.c:1497 +#: builtin/remote.c:1550 msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送URL地址" -#: builtin/remote.c:1569 +#: builtin/remote.c:1564 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" @@ -8564,6 +8642,10 @@ msgstr "使用 -A，不要将早于给定时间的对象过期" msgid "size of the window used for delta compression" msgstr "用于增量压缩的窗口值" +#: builtin/repack.c:162 builtin/repack.c:166 +msgid "bytes" +msgstr "字节" + #: builtin/repack.c:163 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制内存大小而非条目数" @@ -8576,7 +8658,7 @@ msgstr "限制最大增量深度" msgid "maximum size of each packfile" msgstr "每个包的最大尺寸" -#: builtin/repack.c:345 +#: builtin/repack.c:343 #, c-format msgid "removing '%s' failed" msgstr "删除 '%s' 失败" @@ -8590,21 +8672,25 @@ msgid "git replace -d <object>..." msgstr "git replace -d <对象>..." #: builtin/replace.c:19 -msgid "git replace -l [<pattern>]" -msgstr "git replace -l [<模式>]" +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<格式>] [-l [<模式>]]" -#: builtin/replace.c:131 +#: builtin/replace.c:174 msgid "list replace refs" msgstr "列出替换的引用" -#: builtin/replace.c:132 +#: builtin/replace.c:175 msgid "delete replace refs" msgstr "删除替换的引用" -#: builtin/replace.c:133 +#: builtin/replace.c:176 msgid "replace the ref if it exists" msgstr "如果存在则替换引用" +#: builtin/replace.c:177 +msgid "use this format" +msgstr "使用此格式" + #: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" @@ -8738,19 +8824,23 @@ msgstr "不能重置索引文件至版本 '%s'。" msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-parse.c:345 +#: builtin/rev-parse.c:359 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [选项] -- [<参数>...]" -#: builtin/rev-parse.c:350 +#: builtin/rev-parse.c:364 msgid "keep the `--` passed as an arg" msgstr "保持 `--` 作为一个参数传递" -#: builtin/rev-parse.c:352 +#: builtin/rev-parse.c:366 msgid "stop parsing after the first non-option argument" msgstr "遇到第一个非选项参数后停止解析" -#: builtin/rev-parse.c:470 +#: builtin/rev-parse.c:369 +msgid "output in stuck long form" +msgstr "以固定长格式输出" + +#: builtin/rev-parse.c:486 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8988,67 +9078,67 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" msgstr "着色 '*!+-' 到相应的分支" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" msgstr "显示共同祖先后的 <n> 个提交" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "synonym to more=-1" msgstr "和 more=-1 同义" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "suppress naming strings" msgstr "不显示字符串命名" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "include the current branch" msgstr "包括当前分支" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "name commits with their object names" msgstr "以对象名字命名提交" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show possible merge bases" msgstr "显示可能合并的基线" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show commits in topological order" msgstr "以拓扑顺序显示提交" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "只显示不在第一个分支上的提交" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支可访问的合并提交" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "topologically sort, maintaining date order where possible" msgstr "拓扑方式排序，并尽可能地保持日期顺序" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:678 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:680 +#: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" @@ -9533,15 +9623,15 @@ msgstr "逾期日期" msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:238 +#: parse-options.h:235 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:240 +#: parse-options.h:237 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:246 +#: parse-options.h:243 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" @@ -9833,8 +9923,8 @@ msgid "" msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。" #: git-bisect.sh:140 -msgid "won't bisect on seeked tree" -msgstr "不会在已查找过的树上二分查找" +msgid "won't bisect on cg-seek'ed tree" +msgstr "不会在做了 cg-seek 的树上做二分查找" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" @@ -9979,7 +10069,7 @@ msgstr "更新尚未诞生的分支，变更添加至索引" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:255 +#: git-pull.sh:247 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -9989,15 +10079,15 @@ msgstr "" "警告：fetch 更新了当前的分支。您的工作区\n" "警告：从原提交 $orig_head 快进。" -#: git-pull.sh:280 +#: git-pull.sh:272 msgid "Cannot merge multiple branches into empty head" msgstr "无法将多个分支合并到空分支" -#: git-pull.sh:284 +#: git-pull.sh:276 msgid "Cannot rebase onto multiple branches" msgstr "无法变基到多个分支" -#: git-rebase.sh:54 +#: git-rebase.sh:55 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -10008,16 +10098,16 @@ msgstr "" "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基，执行 \"git rebase --abort\"。" -#: git-rebase.sh:156 +#: git-rebase.sh:158 msgid "Applied autostash." msgstr "成功应用 autostash。" -#: git-rebase.sh:159 +#: git-rebase.sh:161 #, sh-format msgid "Cannot store $stash_sha1" msgstr "无法保存 $stash_sha1" -#: git-rebase.sh:160 +#: git-rebase.sh:162 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -10027,31 +10117,31 @@ msgstr "" "您的修改安全地保存在 stash 中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: git-rebase.sh:199 +#: git-rebase.sh:201 msgid "The pre-rebase hook refused to rebase." -msgstr "钩子 pre-rebase 拒绝变基。" +msgstr "钩子 pre-rebase 拒绝变基操作。" -#: git-rebase.sh:204 +#: git-rebase.sh:206 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" -#: git-rebase.sh:338 +#: git-rebase.sh:346 msgid "The --exec option must be used with the --interactive option" msgstr "选项 --exec 必须和选项 --interactive 同时使用" -#: git-rebase.sh:343 +#: git-rebase.sh:351 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: git-rebase.sh:354 +#: git-rebase.sh:362 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: git-rebase.sh:361 +#: git-rebase.sh:369 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: git-rebase.sh:364 +#: git-rebase.sh:372 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -10059,12 +10149,12 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: git-rebase.sh:382 +#: git-rebase.sh:390 #, sh-format msgid "Could not move back to $head_name" msgstr "无法移回 $head_name" -#: git-rebase.sh:401 +#: git-rebase.sh:409 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10076,72 +10166,72 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there." msgstr "" -"好像已有一个 $state_dir_base 目录，我怀疑您正处于另外一个变基过程中。\n" -"如果是这样，请尝试执行\n" +"好像已有 $state_dir_base 目录，我怀疑您正处于另外一个变基操作\n" +"过程中。 如果是这样，请执行\n" "\t$cmd_live_rebase\n" "如果不是这样，请执行\n" "\t$cmd_clear_stale_rebase\n" -"然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。" +"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。" -#: git-rebase.sh:446 +#: git-rebase.sh:456 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" -#: git-rebase.sh:473 git-rebase.sh:477 +#: git-rebase.sh:483 git-rebase.sh:487 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" -#: git-rebase.sh:482 +#: git-rebase.sh:492 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交：$onto_name" -#: git-rebase.sh:505 +#: git-rebase.sh:515 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误：无此分支：$branch_name" -#: git-rebase.sh:528 +#: git-rebase.sh:548 msgid "Cannot autostash" msgstr "无法 autostash" -#: git-rebase.sh:533 +#: git-rebase.sh:553 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "创建了 autostash: $stash_abbrev" -#: git-rebase.sh:537 +#: git-rebase.sh:557 msgid "Please commit or stash them." msgstr "请提交或为它们保存进度。" -#: git-rebase.sh:557 +#: git-rebase.sh:577 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" -#: git-rebase.sh:561 +#: git-rebase.sh:581 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的，强制变基。" -#: git-rebase.sh:572 +#: git-rebase.sh:592 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto：" #. Detach HEAD and reset the tree -#: git-rebase.sh:581 +#: git-rebase.sh:601 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先，重置头指针以便在上面重放您的工作..." -#: git-rebase.sh:591 +#: git-rebase.sh:611 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" @@ -10384,75 +10474,75 @@ msgstr "无法注册子模组 '$sm_path'" msgid "Entering '$prefix$displaypath'" msgstr "正在进入 '$prefix$displaypath'" -#: git-submodule.sh:554 +#: git-submodule.sh:559 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。" -#: git-submodule.sh:600 +#: git-submodule.sh:605 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" -#: git-submodule.sh:609 +#: git-submodule.sh:614 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "无法为子模组路径 '$displaypath' 注册 url" -#: git-submodule.sh:611 +#: git-submodule.sh:616 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:619 +#: git-submodule.sh:633 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "无法为子模组路径 '$displaypath' 注册更新模式" -#: git-submodule.sh:656 +#: git-submodule.sh:671 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" -#: git-submodule.sh:673 +#: git-submodule.sh:688 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" -#: git-submodule.sh:674 +#: git-submodule.sh:689 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" -#: git-submodule.sh:680 +#: git-submodule.sh:695 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们" -#: git-submodule.sh:683 +#: git-submodule.sh:698 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "已清除目录 '$displaypath'" -#: git-submodule.sh:684 +#: git-submodule.sh:699 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "无法移除子模组工作区 '$displaypath'" -#: git-submodule.sh:687 +#: git-submodule.sh:702 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "不能创建空的子模组目录 '$displaypath'" -#: git-submodule.sh:696 +#: git-submodule.sh:711 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:811 +#: git-submodule.sh:834 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" @@ -10461,109 +10551,159 @@ msgstr "" "子模组路径 '$displaypath' 没有初始化\n" "也许您想用 'update --init'？" -#: git-submodule.sh:824 +#: git-submodule.sh:847 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:833 +#: git-submodule.sh:856 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:857 +#: git-submodule.sh:880 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中获取" -#: git-submodule.sh:871 +#: git-submodule.sh:894 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:872 +#: git-submodule.sh:895 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:877 +#: git-submodule.sh:900 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:878 +#: git-submodule.sh:901 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:883 +#: git-submodule.sh:906 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:884 +#: git-submodule.sh:907 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" -#: git-submodule.sh:889 +#: git-submodule.sh:912 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:890 +#: git-submodule.sh:913 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:917 +#: git-submodule.sh:940 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:1025 +#: git-submodule.sh:1048 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" #. unexpected type -#: git-submodule.sh:1073 +#: git-submodule.sh:1096 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:1093 +#: git-submodule.sh:1116 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:1096 +#: git-submodule.sh:1119 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:1099 +#: git-submodule.sh:1122 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:1124 +#: git-submodule.sh:1147 msgid "blob" msgstr "数据对象" -#: git-submodule.sh:1238 +#: git-submodule.sh:1261 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:1302 +#: git-submodule.sh:1325 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' 同步子模组 url" +# 译者：为保证在输出中对齐，注意调整句中空格！ +#~ msgid "copied: %s -> %s" +#~ msgstr "拷贝： %s -> %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#~ msgid "deleted: %s" +#~ msgstr "删除： %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#~ msgid "modified: %s" +#~ msgstr "修改： %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#~ msgid "renamed: %s -> %s" +#~ msgstr "重命名： %s -> %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#~ msgid "unmerged: %s" +#~ msgstr "未合并： %s" + +# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 +#~ msgid "" +#~ "push.default is unset; its implicit value is changing in\n" +#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +#~ "and maintain the current behavior after the default changes, use:\n" +#~ "\n" +#~ " git config --global push.default matching\n" +#~ "\n" +#~ "To squelch this message and adopt the new behavior now, use:\n" +#~ "\n" +#~ " git config --global push.default simple\n" +#~ "\n" +#~ "See 'git help config' and search for 'push.default' for further " +#~ "information.\n" +#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +#~ "'current' instead of 'simple' if you sometimes use older versions of Git)" +#~ msgstr "" +#~ "push.default 未设置，它的默认值将在 Git 2.0 由 'matching'\n" +#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n" +#~ "\n" +#~ " git config --global push.default matching\n" +#~ "\n" +#~ "若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n" +#~ "\n" +#~ " git config --global push.default simple\n" +#~ "\n" +#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" +#~ "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n" +#~ "为保持兼容，请用 'current' 代替 'simple'）" + #~ msgid "done\n" #~ msgstr "完成\n" |