diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2015-04-03 08:13:24 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2015-04-03 08:13:24 +0800 |
| commit | bfcfc7d2735303baa67a922b09f4f27278f557e8 (patch) | |
| tree | a4c9db276a2d08160ac65b693e174ce95115ed1b | |
| parent | 6ae0d972664134b82a6dd164a01e8adbebeaffe3 (diff) | |
| parent | 918de7523dfbe450ca9a136e199b4cb76150a287 (diff) | |
| download | git-bfcfc7d2735303baa67a922b09f4f27278f557e8.tar.gz | |
Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung'
l10n: de.po: translate 99 new messages
l10n: de.po: fix messages with abbreviated hashs
l10n: de.po: add space before ellipsis
l10n: vi.po: Updated Vietnamese translation
l10n: zh_CN: translations for git v2.4.0-rc0
l10n: fr.po v2.4.0-rc0 round 1
l10n: ca.po: update translation
l10n: ru: updated Russian translation
l10n: sv.po: Update Swedish translation (2305t0f0u)
l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)
l10n: ru: added Russian translation
l10n: de.po: fix negation for commit -a with paths
| -rw-r--r-- | po/TEAMS | 5 | ||||
| -rw-r--r-- | po/ca.po | 1785 | ||||
| -rw-r--r-- | po/de.po | 1792 | ||||
| -rw-r--r-- | po/fr.po | 1798 | ||||
| -rw-r--r-- | po/git.pot | 1567 | ||||
| -rw-r--r-- | po/ru.po | 10633 | ||||
| -rw-r--r-- | po/sv.po | 1747 | ||||
| -rw-r--r-- | po/vi.po | 1784 | ||||
| -rw-r--r-- | po/zh_CN.po | 2120 |
9 files changed, 16883 insertions, 6348 deletions
@@ -36,6 +36,11 @@ Language: pt_PT (Portuguese - Portugal) Repository: https://github.com/marcomsousa/git-l10n-pt_PT/ Leader: Marco Sousa <marcomsousa AT gmail.com> +Language: ru (Russian) +Repository: https://github.com/DJm00n/git-po-ru/ +Leader: Dimitriy Ryazantcev <DJm00n AT mail.ru> +Members: insolor <insolor AT gmail.com> + Language: sv (Swedish) Repository: https://github.com/nafmo/git-l10n-sv/ Leader: Peter Krefting <peter@softwolves.pp.se> @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-18 11:24+0800\n" -"PO-Revision-Date: 2015-01-30 15:01-0700\n" +"POT-Creation-Date: 2015-03-27 13:33+0800\n" +"PO-Revision-Date: 2015-03-28 15:04-0700\n" "Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.7.3\n" +"X-Generator: Poedit 1.7.4\n" #: advice.c:55 #, c-format @@ -33,8 +33,8 @@ msgstr "" "resolució i feu una comissió." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [opcions] <arbre> [<camí>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<opcions>] <arbre> [<camí>...]" #: archive.c:12 msgid "git archive --list" @@ -42,9 +42,10 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <dipòsit> [--exec <ordre>] [opcions] <arbre> [<camí>...]" +"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> " +"[<camí>...]" #: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -71,10 +72,10 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camí en l'arxiu" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fitxer" @@ -123,7 +124,7 @@ msgstr "ordre" msgid "path to the remote git-upload-archive command" msgstr "camí a l'ordre git-upload-archive remot" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -260,7 +261,7 @@ msgstr "'%s' no sembla un fitxer de farcell v2" msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:764 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir '%s'" @@ -269,8 +270,8 @@ msgstr "no s'ha pogut obrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -311,25 +312,25 @@ msgstr "El rev-list s'ha mort" msgid "ref '%s' is excluded by the rev-list options" msgstr "les opcions de la llista de revisions exclouen la referència '%s'" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "paràmetre no reconegut: %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Refusant crear un farcell buit." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "no es pot crear '%s'" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "L'index-pack s'ha mort" -#: color.c:259 +#: color.c:260 #, c-format msgid "invalid color value: %.*s" msgstr "valor de color no vàlid: %.*s" @@ -348,55 +349,55 @@ msgstr "%s %s no és una comissió!" msgid "memory exhausted" msgstr "memòria esgotada" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "línia de fitxer de configuració dolenta %d en %s" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor de configuració numèrica dolent '%s' per '%s' en %s: %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor de configuració numèrica dolent '%s' per '%s': %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "s'ha fallat en expandir el directori d'usuari en '%s'" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "nivell de compressió de zlib dolent %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode de creació d'objecte no vàlid: %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "ha ocorregut un error desconegut en llegir els fitxers de configuració" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no s'ha pogut analitzar '%s' de la configuració de la línia d'ordres" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variable de configuració dolenta '%s' en el fitxer '%s' a la línia %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" @@ -488,7 +489,7 @@ msgstr[1] "fa %lu anys" msgid "failed to read orderfile '%s'" msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Realitzant detecció inexacta de canvis de nom" @@ -517,16 +518,16 @@ msgstr "" "Errors trobats en la variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "El diff external s'ha mort, aturant a %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camí" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -535,7 +536,7 @@ msgstr "" "S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s" @@ -1038,7 +1039,7 @@ msgstr "no s'ha pogut analitzar el format --pretty" msgid "done" msgstr "fet" -#: read-cache.c:1267 +#: read-cache.c:1273 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1047,7 +1048,7 @@ msgstr "" "index.version establert, però el valor no és vàlid.\n" "Usant la versió %i" -#: read-cache.c:1277 +#: read-cache.c:1283 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1135,23 +1136,31 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent és incompatible amb --bisect" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "s'ha fallat en obrir /dev/null" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) ha fallat" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "s'ha fallat en firmar el certificat de pujada" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "el destí receptor no admet pujar --signed" +#: send-pack.c:366 +msgid "server does not support --atomic push" +msgstr "el servidor no admet pujar --atomic" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1182,7 +1191,7 @@ msgstr "" "corregits amb 'git add <camins>' o 'git rm <camins>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "No s'ha pogut escriure a %s" @@ -1218,31 +1227,31 @@ msgstr "No s'ha pogut resoldre la comissió HEAD\n" msgid "Unable to update cache tree\n" msgstr "No s'ha pogut actualitzar l'arbre cau\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "No s'ha pogut analitzar la comissió %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "No s'ha pogut analitzar la comissió mare %s\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "El vostre fitxer d'índex està sense fusionar." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "La comissió %s és una fusió però no s'ha donat cap opció -m." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "La comissió %s no té mare %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1250,154 +1259,154 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió mare %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "No es pot obtenir el missatge de comissió de %s" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s...%s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s...%s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: s'ha fallat en llegir l'índex" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha fallat en actualitzar l'índex" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "No es pot %s durant un %s" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "No s'ha pogut analitzar la línia %d." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Cap comissió analitzada." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "No s'ha pogut obrir %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "No s'ha pogut llegir %s." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Full d'instruccions inusable: %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Clau no vàlida: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor no vàlid per a %s: %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Full d'opcions mal format: %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "un recull de cireres o una reversió ja està en curs" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "No s'ha pogut crear el directori de seqüenciador %s" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Error en finalitzar %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap recull de cireres ni cap reversió en curs" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nàixer" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4286 #, c-format msgid "cannot open %s: %s" msgstr "no es pot obrir %s: %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "no es pot llegir %s: %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és corrupte" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "No s'ha pogut formatar %s." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot recollir com a cirera un %s" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s: revisió dolenta" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "No es pot revertir com a comissió inicial" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "No es pot recollir cireres en un cap buit" @@ -1470,38 +1479,38 @@ msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" msgid "staging updated .gitmodules failed" msgstr "L'allistament del .gitmodules actualitzat ha fallat" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "No s'ha pogut crear l'enllaç de git %s" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "No s'ha pogut establir core.worktree en %s" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut '%s' per a la clau '%s'" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "més d'un %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "fitxa de remolc buida en el remolc '%.*s'" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "No s'ha pogut llegir des d'stdin" @@ -1538,26 +1547,26 @@ msgstr "número de port no vàlid" msgid "invalid '..' path segment" msgstr "segment de camí '..' no vàlid" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "no s'ha pogut accedir a '%s': %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "no s'ha pogut accedir a '%s'" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "no s'ha pogut trobar l'usuari actual en el fitxer passwd: %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "no hi ha tal usuari" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "no s'ha pogut obtenir el directori de treball actual" @@ -1588,11 +1597,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Canvis a cometre:" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Canvis no allistats per a cometre:" @@ -1703,15 +1712,15 @@ msgstr "contingut no seguit, " msgid "bug: unhandled diff status %c" msgstr "bug: estat de diferència no gestionat %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Submòduls canviats però no actualitzats:" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Canvis de submòdul a cometre:" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1719,191 +1728,191 @@ msgstr "" "No toqueu la línia de sobre.\n" "Tot el que hi ha a sota s'eliminarà." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Teniu camins sense fusionar." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregleu els conflictes i executeu \"git commit\")" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (useu \"git commit\" per a concloure la fusió)" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Esteu enmig d'una sessió am." -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "El pedaç actual està buit." -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (useu \"git am --abort\" per a restaurar la branca original)" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Actualment esteu rebasant la branca '%s' en '%s'." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Actualment esteu rebasant." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "Actualment esteu dividint una comissió durant una rebase." -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vegada que el vostre directori de treball sigui net, executeu \"git " "rebase --continue\")" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "Actualment esteu editant una comissió durant una rebase." -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (useu \"git rebase --continue\" una vegada que esteu satisfet amb els " "vostres canvis)" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Actualment esteu recollint com a cirera la comissió %s." -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de " "cireres)" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'." -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "rebase en progrés; en " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD separat a " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD separat de " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Actualment no en cap branca." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1915,31 +1924,31 @@ msgstr "" "oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n" "'git help status')." -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1948,47 +1957,47 @@ msgstr "" "no hi ha res afegit a cometre però fitxers no seguits estan presents (useu " "\"git add\" per a seguir-los)\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" "los)\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "no hi ha res a cometre, directori de treball net\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Comissió inicial en " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "no hi és" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "darrere " @@ -1998,8 +2007,8 @@ msgid "failed to unlink '%s'" msgstr "s'ha fallat en desenllaçar '%s'" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [opcions] [--] <especificació-de-camí>..." +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<opcions>] [--] <especificació-de-camí>..." #: builtin/add.c:65 #, c-format @@ -2051,14 +2060,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "sigues detallat" @@ -2136,78 +2145,78 @@ msgstr "Res especificat, res afegit.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Potser volíeu dir 'git add .'?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "fitxer d'índex malmès" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [opcions] [<pedaç>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<opcions>] [<pedaç>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opció d'espai en blanc '%s' no reconeguda" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No es pot preparar l'expressió regular de marca de temps %s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec ha retornat %d per l'entrada: %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recompte: línia inesperada: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2222,77 +2231,77 @@ msgstr[1] "" "a la capçalera de git diff li manca informació de nom de fitxer en eliminar " "%d components de nom de camí inicial (línia %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "el fitxer nou depèn dels continguts antics" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "el fitxer suprimit encara té continguts" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "el pedaç és malmès a la línia %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "el fitxer nou %s depèn dels continguts antics" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara té continguts" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** avís: el fitxer %s queda buit però no es suprimeix" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "pedaç binari malmès a la línia %d: %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaç binari no reconegut a la línia %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "pedaç amb només escombraries a la línia %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "no s'ha pogut obrir o llegir %s" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "inici de línia no vàlid: '%c'" -#: builtin/apply.c:2872 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "El tros #%d ha tingut éxit a %d (desplaçament %d línia)." msgstr[1] "El tros #%d ha tingut éxit a %d (desplaçament %d línies)." -#: builtin/apply.c:2884 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d" -#: builtin/apply.c:2890 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" @@ -2301,324 +2310,343 @@ msgstr "" "tot cercant:\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2933 #, c-format msgid "missing binary patch data for '%s'" msgstr "manquen les dades de pedaç binari de '%s'" -#: builtin/apply.c:3010 +#: builtin/apply.c:3034 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a '%s'" -#: builtin/apply.c:3016 +#: builtin/apply.c:3040 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3061 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3185 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286 #, c-format msgid "read of %s failed" msgstr "la lectura de %s ha fallat" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3238 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "llegint de '%s' més enllà d'un enllaç simbòlic" + +#: builtin/apply.c:3266 builtin/apply.c:3488 #, c-format msgid "path %s has been renamed/deleted" msgstr "el camí %s s'ha canviat de nom / s'ha suprimit" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3347 builtin/apply.c:3502 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'índex" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3356 builtin/apply.c:3510 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'índex" -#: builtin/apply.c:3432 +#: builtin/apply.c:3458 msgid "removal patch leaves file contents" msgstr "el pedaç de supressió deixa els continguts dels fitxers" -#: builtin/apply.c:3501 +#: builtin/apply.c:3527 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: builtin/apply.c:3503 +#: builtin/apply.c:3529 #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, s'esperava %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3688 builtin/apply.c:3690 +#, c-format +msgid "invalid path '%s'" +msgstr "camí no vàlid: %s" + +#: builtin/apply.c:3745 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'índex" -#: builtin/apply.c:3607 +#: builtin/apply.c:3748 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: builtin/apply.c:3627 +#: builtin/apply.c:3768 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3793 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic" + +#: builtin/apply.c:3797 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no aplica" -#: builtin/apply.c:3653 +#: builtin/apply.c:3811 #, c-format msgid "Checking patch %s..." msgstr "Comprovant el pedaç %s..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camí '%s'" -#: builtin/apply.c:3889 +#: builtin/apply.c:4047 #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'índex" -#: builtin/apply.c:3918 +#: builtin/apply.c:4076 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç corrupte per al submòdul %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4080 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'" -#: builtin/apply.c:3927 +#: builtin/apply.c:4085 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat " "%s" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4088 builtin/apply.c:4196 #, c-format msgid "unable to add cache entry for %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: builtin/apply.c:3963 +#: builtin/apply.c:4121 #, c-format msgid "closing file '%s'" msgstr "tancant el fitxer '%s'" -#: builtin/apply.c:4012 +#: builtin/apply.c:4170 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer '%s' mode %o" -#: builtin/apply.c:4099 +#: builtin/apply.c:4257 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: builtin/apply.c:4107 +#: builtin/apply.c:4265 msgid "internal error" msgstr "error intern" -#: builtin/apply.c:4110 +#: builtin/apply.c:4268 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Aplicant el pedaç %%s amb %d rebuig" msgstr[1] "Aplicant el pedaç %%s amb %d rebuitjos" -#: builtin/apply.c:4120 +#: builtin/apply.c:4278 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncant el nom del fitxer .rej a %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4299 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: builtin/apply.c:4144 +#: builtin/apply.c:4302 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: builtin/apply.c:4234 +#: builtin/apply.c:4392 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: builtin/apply.c:4245 +#: builtin/apply.c:4403 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "camí" -#: builtin/apply.c:4363 +#: builtin/apply.c:4521 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: builtin/apply.c:4366 +#: builtin/apply.c:4524 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camí donat" -#: builtin/apply.c:4368 +#: builtin/apply.c:4526 msgid "num" msgstr "número" -#: builtin/apply.c:4369 +#: builtin/apply.c:4527 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "elimina <nombre> barres obliqües inicials dels camins de diferència " "tradicionals" -#: builtin/apply.c:4372 +#: builtin/apply.c:4530 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: builtin/apply.c:4374 +#: builtin/apply.c:4532 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada" -#: builtin/apply.c:4378 +#: builtin/apply.c:4536 msgid "show number of added and deleted lines in decimal notation" msgstr "mostra el nombre de línies afegides i suprimides en notació decimal" -#: builtin/apply.c:4380 +#: builtin/apply.c:4538 msgid "instead of applying the patch, output a summary for the input" msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada" -#: builtin/apply.c:4382 +#: builtin/apply.c:4540 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" -#: builtin/apply.c:4384 +#: builtin/apply.c:4542 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: builtin/apply.c:4386 +#: builtin/apply.c:4544 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: builtin/apply.c:4388 +#: builtin/apply.c:4546 +msgid "accept a patch that touches outside the working area" +msgstr "accepta un pedaç que toqui fora de l'àrea de treball" + +#: builtin/apply.c:4548 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4550 msgid "attempt three-way merge if a patch does not apply" msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" -#: builtin/apply.c:4392 +#: builtin/apply.c:4552 msgid "build a temporary index based on embedded index information" msgstr "construeix un índex temporal basat en la informació d'índex incrustada" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "els camins es separen amb el caràcter NUL" -#: builtin/apply.c:4397 +#: builtin/apply.c:4557 msgid "ensure at least <n> lines of context match" msgstr "assegura't que almenys <n> línies de context coincideixin" -#: builtin/apply.c:4398 +#: builtin/apply.c:4558 msgid "action" msgstr "acció" -#: builtin/apply.c:4399 +#: builtin/apply.c:4559 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detecta les línies noves o modificades que tinguin errors d'espai en blanc" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4562 builtin/apply.c:4565 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: builtin/apply.c:4408 +#: builtin/apply.c:4568 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: builtin/apply.c:4410 +#: builtin/apply.c:4570 msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: builtin/apply.c:4412 +#: builtin/apply.c:4572 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents" -#: builtin/apply.c:4414 +#: builtin/apply.c:4574 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: builtin/apply.c:4417 +#: builtin/apply.c:4577 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolera una línia nova incorrectament detectada al final del fitxer" -#: builtin/apply.c:4420 +#: builtin/apply.c:4580 msgid "do not trust the line counts in the hunk headers" msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos" -#: builtin/apply.c:4422 +#: builtin/apply.c:4582 msgid "root" msgstr "arrel" -#: builtin/apply.c:4423 +#: builtin/apply.c:4583 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" -#: builtin/apply.c:4445 +#: builtin/apply.c:4605 msgid "--3way outside a repository" msgstr "--3way fora d'un dipòsit" -#: builtin/apply.c:4453 +#: builtin/apply.c:4613 msgid "--index outside a repository" msgstr "--index fora d'un dipòsit" -#: builtin/apply.c:4456 +#: builtin/apply.c:4616 msgid "--cached outside a repository" msgstr "--cached fora d'un dipòsit" -#: builtin/apply.c:4472 +#: builtin/apply.c:4635 #, c-format msgid "can't open patch '%s'" msgstr "no es pot obrir el pedaç '%s'" -#: builtin/apply.c:4486 +#: builtin/apply.c:4649 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error d'espai en blanc omès" msgstr[1] "%d errors d'espai en blanc omesos" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4655 builtin/apply.c:4665 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2673,108 +2701,108 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [opcions] [opcions-de-revisió] [revisió] [--] fitxer" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "les [opcions-de-revisió] estan documentades en git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " "desactivat)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Mostra les estadístiques de preu de treball" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Mostra la puntuació de sortida de les entrades de culpa" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de línia original (Per defecte: desactivat)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per màquina" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "Mostra el format de porcellana amb informació de comissió per línia" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "" "Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per " "defecte: desactivat)" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Ignora les diferencies d'espai en blanc" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Usa els continguts de <fitxer> com a la imatge final" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "puntuació" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "Troba còpies de línia dins i a través dels fitxers" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "Troba moviments de línia dins i a través dels fitxers" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "Processa només el rang de línies n,m, comptant des de 1" @@ -2784,25 +2812,25 @@ msgstr "Processa només el rang de línies n,m, comptant des de 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [opcions] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [opcions] [-l] [-f] <nom-de-branca> [<punt-inicial>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [opcions] [-r] (-d | -D) <nom-de-branca>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [opcions] (-m | -M) [<branca-antiga>] <branca-nova>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>" #: builtin/branch.c:152 #, c-format @@ -2944,237 +2972,242 @@ msgstr "(cap branca, rebasant %s)" msgid "(no branch, bisect started on %s)" msgstr "(cap branca, bisecció començada en %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "(separat de %s)" +msgid "(HEAD detached at %s)" +msgstr "(HEAD separat a %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD separat de %s)" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(cap branca)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objecte '%s' no assenyala cap comissió" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "no s'han pogut llegir algunes referències" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap." -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branca no vàlid: '%s'" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "El canvi de nom de branca ha fallat" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "S'ha canviat el nom de la branca malanomenada '%s'" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branca està canviada de nom, però l'actualització del fitxer de " "configuració ha fallat" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "no s'ha pogut escriure la plantilla de descripció de branca: %s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Opcions genèriques" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "mostra el hash i el tema, doneu dues vegades per la branca font" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "omet els missatges informatius" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "configura el mode de seguiment (vegeu git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "usa sortida colorada" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "actua en branques amb seguiment remot" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "comissió" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "imprimeix només les branques que continguin la comissió" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Accions de git-branch específiques:" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "llista les branques amb seguiment remot i les locals" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "suprimeix la branca si és completament fusionada" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "suprimeix la branca (encara que no estigui fusionada)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "mou/canvia de nom una branca i el seu registre de referència" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una branca, encara que el destí existeixi" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "llista els noms de branca" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "crea el registre de referència de la branca" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "edita la descripció de la branca" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "força creació, moviment/canvi de nom, supressió" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "imprimeix només les branques sense fusionar" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "imprimeix només les branques fusionades" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "llista les branques en columnes" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha fallat en resoldre HEAD com a referència vàlida." -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "--column i --verbose són incompatibles" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripció a un HEAD separat" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Encara no hi ha comissió en la branca '%s'." -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "No hi ha branca amb nom '%s'." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "hi ha massa branques per a una operació de canvi de nom" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "hi ha massa branques per a establir una nova font" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "no hi ha tal branca '%s'" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "la branca '%s' no existeix" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "hi ha massa branques per a desestablir la font" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca." -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branca '%s' no té informació de font" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "no té sentit crear 'HEAD' manualment" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3183,7 +3216,7 @@ msgstr "" "La bandera --set-upstream està desaprovada i s'eliminarà. Considereu usar --" "track o --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3194,12 +3227,12 @@ msgstr "" "Si volíeu fer '%s' seguir '%s', feu això:\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3217,55 +3250,55 @@ msgstr "Cal un dipòsit per a fer un farcell." msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/cat-file.c:328 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" -msgstr "git cat-file (-t|-s|-e|-p|<tipus>|--textconv) <objecte>" +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | <tipus> | --textconv) <objecte>" -#: builtin/cat-file.c:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "git cat-file (--batch|--batch-check) < <llista_de_objectes>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <llista-d'objectes>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipus> pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | atribut...] [--] nom-de-camí..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "" -"git check-attr --stdin [-z] [-a | --all | atribut...] < <llista-de-camins>" +"git check-attr --stdin [-z] [-a | --all | <atribut>...] < <llista-de-camins>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3320,8 +3353,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching és vàlid només amb --verbose" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [opcions] <contacte>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<opcions>] <contacte>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3337,8 +3370,8 @@ msgid "no contacts specified" msgstr "no hi ha contactes especificats" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [opcions] [--] [<fitxer>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3381,12 +3414,12 @@ msgid "copy out the files from named stage" msgstr "copia els fitxers des de l'etapa anomenada" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [opcions] <branca>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<opcions>] <branca>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [opcions] [<branca>] -- <fitxer>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3516,13 +3549,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" -"Si els voleu retenir per a crear una branca nova, ara pot ser un bon moment\n" -"per a fer-ho amb:\n" +"Si les voleu retenir creant una branca nova, ara pot ser un bon moment per\n" +"a fer-ho amb:\n" "\n" -" git branch nom_de_branca_nova %s\n" +" git branch <nom-de-branca-nova> %s\n" "\n" #: builtin/checkout.c:777 @@ -3638,8 +3671,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades escasses" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "dubta 'git checkout cap-branca-així'" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "dubta 'git checkout <cap-branca-així>'" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3761,16 +3794,17 @@ msgstr "AVÍS: No es pot trobar ítems que coincideixin amb: %s" msgid "Select items to delete" msgstr "Selecciona els ítems a suprimir" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "eliminar %s? " +msgid "Remove %s [y/N]? " +msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Adéu." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3788,62 +3822,62 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció de l'avís" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Ordres ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Què ara" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminaria l'ítem següent:" msgstr[1] "Eliminaria els ítems següents:" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "No hi ha més fitxers a netejar; sortint." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "força" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "patró" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "afegiu <patró> per a ignorar les regles" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, també" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "elimina només els fitxers ignorats" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x i -X no es poden usar junts" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3851,7 +3885,7 @@ msgstr "" "clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; " "refusant netejar" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3860,11 +3894,11 @@ msgstr "" "refusant netejar" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [opcions] [--] <dipòsit> [<directori>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "força l'informe de progrés" @@ -3924,7 +3958,7 @@ msgstr "agafa <branca> en lloc del HEAD del remot" msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "profunditat" @@ -4070,7 +4104,7 @@ msgstr "--bare i --separate-git-dir són incompatibles." msgid "repository '%s' does not exist" msgstr "el dipòsit '%s' no existeix" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" @@ -4085,59 +4119,59 @@ msgstr "el camí destí '%s' ja existeix i no és un directori buit." msgid "working tree '%s' already exists." msgstr "l'arbre de treball '%s' ja existeix." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'ha pogut crear els directoris inicials de '%s'" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'." +msgid "could not create work tree dir '%s'" +msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonant al dipòsit nu '%s'...\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonant a '%s'...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "s'ha donat --dissociate, però no hi ha --reference" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, ignorant --local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "No es sap com clonar %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branca remota %s no es troba en la font %s" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [opcions]" +msgid "git column [<options>]" +msgstr "git column [<opcions>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4168,12 +4202,12 @@ msgid "--command must be the first argument" msgstr "--command ha de ser el primer paràmetre" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [opcions] [--] <especificació-de-camí>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<opcions>] [--] <especificació-de-camí>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [opcions] [--] <especificació-de-camí>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<opcions>] [--] <especificació-de-camí>..." #: builtin/commit.c:47 msgid "" @@ -4317,26 +4351,26 @@ msgstr "no es pot llegir l'índex" msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'índex temporal" -#: builtin/commit.c:584 +#: builtin/commit.c:578 #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissió '%s' li manca la capçalera d'autor" -#: builtin/commit.c:586 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissió '%s' té una línia d'autor mal formada" -#: builtin/commit.c:605 +#: builtin/commit.c:599 msgid "malformed --author parameter" msgstr "paràmetre --author mal format" -#: builtin/commit.c:613 +#: builtin/commit.c:607 #, c-format msgid "invalid date format: %s" msgstr "format de data no vàlid: %s" -#: builtin/commit.c:657 +#: builtin/commit.c:651 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4344,43 +4378,43 @@ msgstr "" "no es pot seleccionar un caràcter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:700 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(llegint el missatge de registre de l'entrada estàndard)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:702 msgid "could not read log from standard input" msgstr "no s'ha pogut llegir de l'entrada estàndard" -#: builtin/commit.c:712 +#: builtin/commit.c:706 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre '%s'" -#: builtin/commit.c:734 +#: builtin/commit.c:728 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:732 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogur llegir SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:736 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir '%s'" -#: builtin/commit.c:789 +#: builtin/commit.c:783 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:807 +#: builtin/commit.c:801 #, c-format msgid "" "\n" @@ -4395,7 +4429,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:806 #, c-format msgid "" "\n" @@ -4410,7 +4444,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:819 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4420,7 +4454,7 @@ msgstr "" "S'ignoraran les línies començant amb '%c', i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:826 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4431,146 +4465,148 @@ msgstr "" "Es retindran les línies començants amb '%c'; podeu eliminar-les per vós\n" "mateix si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:846 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:854 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:867 +#: builtin/commit.c:861 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:879 msgid "Cannot read index" msgstr "No es pot llegir l'índex" -#: builtin/commit.c:942 +#: builtin/commit.c:936 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:951 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1053 #, c-format -msgid "No existing author found with '%s'" -msgstr "Cap autor existent trobat amb '%s'" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n" +"cap autor existent" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1068 builtin/commit.c:1308 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vàlid '%s'" -#: builtin/commit.c:1111 +#: builtin/commit.c:1105 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1141 +#: builtin/commit.c:1135 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambdós --reset-author i --author no té sentit" -#: builtin/commit.c:1150 +#: builtin/commit.c:1144 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1153 +#: builtin/commit.c:1147 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1155 +#: builtin/commit.c:1149 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar." -#: builtin/commit.c:1158 +#: builtin/commit.c:1152 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1168 +#: builtin/commit.c:1162 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Només un de -c/-C/-F/--fixup es pot usar." -#: builtin/commit.c:1170 +#: builtin/commit.c:1164 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup." -#: builtin/commit.c:1178 +#: builtin/commit.c:1172 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author només es pot usar amb -C, -c o --amend." -#: builtin/commit.c:1195 +#: builtin/commit.c:1189 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar." -#: builtin/commit.c:1197 +#: builtin/commit.c:1191 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only no té sentit sense camí." -#: builtin/commit.c:1199 +#: builtin/commit.c:1193 msgid "Clever... amending the last one with dirty index." msgstr "Intel·ligent... esmenant l'últim amb índex brut." -#: builtin/commit.c:1201 +#: builtin/commit.c:1195 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "S'han especificat camins explícits sense -i o -o; presumint camins --only..." -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1207 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1212 msgid "Paths with -a does not make sense." msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1322 builtin/commit.c:1602 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1329 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1332 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1335 builtin/commit.c:1614 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostra els fitxers no seguits, modes opcional: all, normal, no. (Per " "defecte: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1338 msgid "show ignored files" msgstr "mostra els fitxers ignorats" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1339 parse-options.h:153 msgid "when" msgstr "quan" -#: builtin/commit.c:1346 +#: builtin/commit.c:1340 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4578,210 +4614,210 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1342 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1435 +#: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: builtin/commit.c:1437 +#: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: builtin/commit.c:1482 +#: builtin/commit.c:1476 msgid "detached HEAD" msgstr "HEAD separat" -#: builtin/commit.c:1485 +#: builtin/commit.c:1479 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1579 +#: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1581 +#: builtin/commit.c:1575 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1576 builtin/tag.c:601 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "author" msgstr "autor" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1578 builtin/gc.c:275 msgid "date" msgstr "data" -#: builtin/commit.c:1584 +#: builtin/commit.c:1578 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "missatge" -#: builtin/commit.c:1585 +#: builtin/commit.c:1579 msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit.c:1586 +#: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1587 +#: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1588 +#: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a arreglar la comissió " "especificada" -#: builtin/commit.c:1589 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a aixafar la comissió " "especificada" -#: builtin/commit.c:1590 +#: builtin/commit.c:1584 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (usat amb -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1592 +#: builtin/commit.c:1586 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1593 +#: builtin/commit.c:1587 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1594 +#: builtin/commit.c:1588 msgid "default" msgstr "per defecte" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1588 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "com despullar els espais i #comentaris del missatge" -#: builtin/commit.c:1595 +#: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "ID de clau" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "firma la comissió amb GPG" -#: builtin/commit.c:1600 +#: builtin/commit.c:1594 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1601 +#: builtin/commit.c:1595 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1602 +#: builtin/commit.c:1596 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1603 +#: builtin/commit.c:1597 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1604 +#: builtin/commit.c:1598 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1605 +#: builtin/commit.c:1599 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1606 +#: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "evita el ganxo de precomissió" -#: builtin/commit.c:1607 +#: builtin/commit.c:1601 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1618 +#: builtin/commit.c:1612 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1619 +#: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "evita el ganxo de postreescriure" -#: builtin/commit.c:1624 +#: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1626 +#: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1655 +#: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1688 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir '%s' per a lectura" -#: builtin/commit.c:1701 +#: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD corrupte (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1732 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avortant la comissió; no heu editat el missatge.\n" -#: builtin/commit.c:1743 +#: builtin/commit.c:1737 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avortant la comissió a causa d'un missatge de comissió buit.\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "s'ha fallat en escriure l'objecte de comissió" -#: builtin/commit.c:1791 +#: builtin/commit.c:1785 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4793,8 +4829,8 @@ msgstr "" "\"git reset HEAD\" per a recuperar." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [opcions]" +msgid "git config [<options>]" +msgstr "git config [<opcions>]" #: builtin/config.c:53 msgid "Config file location" @@ -4950,12 +4986,12 @@ msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible per humans" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [opcions] <comissió>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [opcions] [<comissió>...]" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [opcions] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<opcions>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5170,178 +5206,178 @@ msgstr "Aplica l'especificació de referència a les referències exportades" msgid "anonymize output" msgstr "anonimitza la sortida" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opcions>] <grup>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opcions>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "obtén de tots els remots" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" -msgstr "camí al qual pujar el paquet en el costat remot" +msgstr "camí al qual pujar el paquet al costat remot" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "força la sobreescriptura de la branca local" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "obtén de múltiples remots" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "obtén totes les etiquetes i tots els objectes associats" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "no obtinguis les etiquetes (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "sota demanda" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "controla l'obteniment recursiu de submòduls" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "desa el paquet baixat" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "permet l'actualització de la referència HEAD" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "aprofundeix la història d'un clon superficial" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "converteix en un dipòsit complet" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "directori" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camí del submòdul" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "mode de recursivitat per defecte" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "accepta les referències que actualitzin .git/shallow" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "mapa de referències" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "mostra el mapa de referències d'obteniment" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (no es pot obtenir en la branca actual)" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (no s'ha pogut actualitzar la referència local)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(sense avanç ràpid)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "no es pot obrir %s: %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5351,55 +5387,55 @@ msgstr "" " intenteu executar 'git remote prune %s' per a eliminar\n" " qualsevulla branca antiga o conflictiva" -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refusant obtenir en la branca actual %s d'un dipòsit no nu" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció \"%s\" per a %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "No es sap com obtenir de %s" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Obtenint %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5407,39 +5443,40 @@ msgstr "" "Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "No hi ha tal remot ni tal grup remot: %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <missatge>] [--log[=<n>]|--no-log] [--file <fitxer>]" +"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5468,52 +5505,52 @@ msgstr "usa <text> com a inici de missatge" msgid "file to read from" msgstr "fitxer del qual llegir" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "no s'ha pogut analitzar el format" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [opcions] [<patró>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<opcions>] [<patró>]" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "" "posa els marcadors de posició entre cometes adequades per als terminals" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "posa els marcadors de posició entre cometes adequades per a perl" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "posa els marcadors de posició entre cometes adequades per a python" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "posa els marcadors de posició entre cometes adequades per a Tcl" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "mostra només <n> referències coincidents" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "clau" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "nom de camp en el qual ordenar" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Comprovant connectivitat" @@ -5522,8 +5559,8 @@ msgid "Checking object directories" msgstr "Comprovant els directoris d'objecte" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [opcions] [<objecte>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<opcions>] [<objecte>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5570,8 +5607,8 @@ msgid "Checking objects" msgstr "Comprovant els objectes" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [opcions]" +msgid "git gc [<options>]" +msgstr "git gc [<opcions>]" #: builtin/gc.c:79 #, c-format @@ -5630,8 +5667,8 @@ msgstr "" "los." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [opcions] [-e] <patró> [<revisió>...] [[--] <camí>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]" #: builtin/grep.c:218 #, c-format @@ -5671,8 +5708,8 @@ msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "cerca en els fitxers ignorats també" +msgid "ignore files specified via '.gitignore'" +msgstr "ignora els fitxers especificats mitjançant '.gitignore'" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5860,17 +5897,17 @@ msgstr "s'han donat ambdós --caches i arbres." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <tipus>] [-w] [--path=<fitxer>|--no-filters] [--stdin] " +"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] " "[--] <fitxer>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <llista-de-camins>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "tipus" @@ -5922,8 +5959,8 @@ msgid "show info page" msgstr "mostra la pàgina d'informació" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [ordre]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]" #: builtin/help.c:64 #, c-format @@ -6131,8 +6168,8 @@ msgstr "hi ha una inconsistència seriosa d'inflació" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" @@ -6219,97 +6256,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "El paquet té %d delta no resolta" msgstr[1] "El paquet té %d deltes no resoltes" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és corrupte" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "error en tancar el fitxer de paquet" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "no es pot escriure el fitxer a retenir '%s'" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "no es pot tancar el fitxer escrit a retenir '%s'" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer de paquet" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> dolent" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, ignorant %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer de paquet existent '%s'" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No es pot obrir el fitxer d'índex de paquets existent de '%s'" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "sense delta: %d objecte" msgstr[1] "sense delta: %d objectes" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longitud de cadena = %d: %lu objecte" msgstr[1] "longitud de cadena = %d: %lu objectes" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "%s dolent" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom de fitxer de paquet '%s' no acaba amb '.pack'" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" @@ -6421,10 +6458,10 @@ msgstr " compartit" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--" -"shared[=<permisos>]] [directori]" +"shared[=<permisos>]] [<directori>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6487,8 +6524,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<opcions>] [<rang de revisions>] [[--] <camí>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [opcions] <objecte>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<opcions>] <objecte>..." #: builtin/log.c:81 #, c-format @@ -6501,7 +6538,7 @@ msgstr "omet la sortida de diferències" #: builtin/log.c:128 msgid "show source" -msgstr "mostra el fons" +msgstr "mostra el font" #: builtin/log.c:129 msgid "Use mail map file" @@ -6566,8 +6603,8 @@ msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [opcions] [<des de> | <rang de revisions>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6767,97 +6804,97 @@ msgstr "" msgid "Unknown commit %s" msgstr "Comissió desconeguda %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [opcions] [<fitxer>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<opcions>] [<fitxer>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "identifica l'estat de fitxer amb etiquetes" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usa lletres minúscules per als fitxers 'assume unchanged'" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "" "mostra en la sortida els fitxers desats en la memòria cau (per defecte)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "mostra en la sortida els fitxers suprimits" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "mostra en la sortida els fitxers modificats" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "mostra en la sortida els altres fitxers" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "mostra en la sortida els fitxers ignorats" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "mostra en la sortida el nom d'objecte dels continguts allistats" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "mostra només els noms dels directoris 'other'" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "no mostris els directoris buits" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "mostra en la sortida els fitxers sense fusionar" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "mostra la informació de resolució de desfet" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "salta els fitxers coincidents amb el patró" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "els patrons d'exclusió es llegeixen de <fitxer>" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "afegeix les exclusions estàndards de git" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "fes que la sortida sigui relativa al directori superior del projecte" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "si qualsevol <fitxer> no és en l'índex, tracta això com a error" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "arbre" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "pretén que els camins eliminats després de <arbre> encara estiguin presents" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "mostra les dades de depuració" @@ -6899,12 +6936,12 @@ msgstr "" "llista l'arbre sencer; no només el directori actual (implica --full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [opcions] [<comissió>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<opcions>] [<comissió>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [opcions] <missatge> HEAD <comissió>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<opcions>] <missatge> HEAD <comissió>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7254,12 +7291,12 @@ msgstr "" "s'havia demanat\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <comissió> <comissió>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <comissió> <comissió>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <comissió>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <comissió>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7296,11 +7333,11 @@ msgstr "" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [opcions] [-L nom1 [-L original [-L nom2]]] fitxer1 " -"fitxer_original fitxer2" +"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> " +"<fitxer-original> <fitxer2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7331,8 +7368,8 @@ msgid "do not warn about conflicts" msgstr "no avisis de conflictes" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "estableix les etiquetes per a fitxer1/fitxer_original/fitxer2" +msgid "set labels for file1/orig-file/file2" +msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7351,8 +7388,8 @@ msgid "allow creation of more than one tree" msgstr "permet la creació de més d'un arbre" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [opcions] <font>... <destí>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<opcions>] <font>... <destí>" #: builtin/mv.c:69 #, c-format @@ -7439,22 +7476,22 @@ msgstr "%s, origen=%s, destí=%s" msgid "Renaming %s to %s\n" msgstr "Canviant el nom de %s a %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de '%s' ha fallat" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [opcions] <comissió>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<opcions>] <comissió>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [opcions] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<opcions>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [opcions] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<opcions>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7485,45 +7522,45 @@ msgid "dereference tags in the input (internal use)" msgstr "dereferencia les etiquetes en l'entrada (ús intern)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" -msgstr "git notes [--ref <referència_de_notes>] [llista [<objecte>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <referència_de_notes>] add [-f] [--allow-empty] [-m " +"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m " "<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" -"git notes [--ref <referència_de_notes>] copy [-f] <d'objecte> <a-objecte>" +"git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <referència_de_notes>] append [--allow-empty] [-m " +"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m " "<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" -"git notes [--ref <referència_de_notes>] edit [--allow-empty] [<objecte>]" +"git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "git notes [--ref <referència_de_notes>] show [<objecte>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <referència_de_notes>] merge [-v | -q] [-s <estratègia> ] " -"<referència_de_notes>" +"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] " +"<referència-de-notes>" #: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" @@ -7534,16 +7571,16 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" -msgstr "git notes [--ref <referència_de_notes>] remove [<objecte>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" -msgstr "git notes [--ref <referència_de_notes>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgstr "git notes [--ref <referència-de-notes>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" -msgstr "git notes [--ref <referència_de_notes>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "git notes [--ref <referència-de-notes>] get-ref" #: builtin/notes.c:40 msgid "git notes [list [<object>]]" @@ -7574,8 +7611,8 @@ msgid "git notes show [<object>]" msgstr "git notes show [<objecte>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" -msgstr "git notes merge [<opcions>] <referència_de_notes>" +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<opcions>] <referència-de-notes>" #: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" @@ -7814,8 +7851,8 @@ msgid "notes-ref" msgstr "referència de notes" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" -msgstr "usa les notes de <referència de notes>" +msgid "use notes from <notes-ref>" +msgstr "usa les notes de <referència-de-notes>" #: builtin/notes.c:989 builtin/remote.c:1621 #, c-format @@ -7834,197 +7871,197 @@ msgstr "" "git pack-objects [opcions...] nom-base [< llista-de-referències | < llista-" "de-objectes]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Escrivint els objectes" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " "s'estan empaquetant" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Comprimint objectes" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex dolenta '%s'" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "l'opció %s no accepta la forma negativa" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "no s'ha pogut analitzar el valor '%s' per a l'opció %s" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress quan l'indicador de progrés es mostra" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" "escriu el fitxer d'índex de paquet en la versió de format d'índex " "especificada" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "" "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra d'empaquetament per memòria a més del límit d'objectes" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultant" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "reusa les deltes existents" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de delta" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als que encara no s'hagin empaquetat" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevulla referència" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "" "inclou els objectes als quals facin referència les entrades del registre de " "referències" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "" "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "hora" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per als obteniments superficials" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un índex de mapa de bits, si està disponible, per a accelerar el " "recompte d'objectes" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Comptant els objectes" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [opcions]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<opcions>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -8035,8 +8072,8 @@ msgid "prune loose refs (default)" msgstr "poda les referències soltes (per defecte)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8315,75 +8352,79 @@ msgstr "--mirror no es pot combinar amb especificacions de referència" msgid "--all and --mirror are incompatible" msgstr "--all i --mirror són incompatibles" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "dipòsit" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "envia totes les referències" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "reflecteix totes les referències" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "suprimeix les referències" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "envia les etiquetes (no es pot usar amb --all o --mirror)" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "força les actualitzacions" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "nom-de-referència>:<esperat" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "controla la pujada recursiva dels submòduls" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "usa el paquet prim" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "programa que rep els paquets" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "estableix la font per a git pull/status" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "poda les referències eliminades localment" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "evita el ganxo de prepujada" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "puja les etiquetes absents però rellevants" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "firma la pujada amb GPG" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "demana una transacció atòmica al costat remot" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete és incompatible amb --all, --mirror i --tags" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "--delete no té sentit sense referències" @@ -8461,12 +8502,12 @@ msgstr "salta l'aplicació del filtre d'agafament escàs" msgid "debug unpack-trees" msgstr "depura unpack-trees" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "%s' per a '%s' no és una marca de temps vàlida" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no és una marca de temps vàlida" @@ -8477,10 +8518,10 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8491,9 +8532,9 @@ msgstr "git remote rename <antic> <nou>" msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: 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 |<branca>)" +#: builtin/remote.c:16 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 | <branca>)" #: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" @@ -8529,10 +8570,6 @@ msgstr "git remote set-url --delete <nom> <url>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opcions>] <nom> <url>" -#: 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 | <branca>)" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branca>..." @@ -8972,8 +9009,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [opcions]" +msgid "git repack [<options>]" +msgstr "git repack [<opcions>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -9041,7 +9078,7 @@ msgstr "mida màxima de cada fitxer de paquet" msgid "repack objects in packs marked with .keep" msgstr "reempaqueta els objectes en paquets marcats amb .keep" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "la supressió de '%s' ha fallat" @@ -9133,8 +9170,8 @@ msgid "use this format" msgstr "usa aquest format" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget camí... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9274,8 +9311,8 @@ msgid "Could not write new index file." msgstr "No s'ha pogut escriure el fitxer d'índex nou." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [opcions] -- [<paràmetres>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9291,30 +9328,30 @@ msgstr "emet en forma llarga enganxada" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [opcions] -- [<paràmetres>...]\n" +"git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]\n" " or: git rev-parse --sq-quote [<paràmetre>...]\n" -" or: git rev-parse [opcions] [<paràmetre>...]\n" +" or: git rev-parse [<opcions>] [<paràmetre>...]\n" "\n" "Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús " "inicial." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [opcions] <comissió>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<opcions>] <comissió>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <subordre>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [opcions] <comissió>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<opcions>] <comissió>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9394,8 +9431,8 @@ msgid "cherry-pick failed" msgstr "el recull de cireres ha fallat" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [opcions] [--] <fitxer>..." +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<opcions>] [--] <fitxer>..." #: builtin/rm.c:65 msgid "" @@ -9498,8 +9535,8 @@ msgid "git rm: unable to remove %s" msgstr "git rm: no s'ha pogut eliminar %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" -msgstr "git shortlog [<opcions>] [<rang de revisions>] [[--] [<camí>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]" #: builtin/shortlog.c:131 #, c-format @@ -9529,19 +9566,19 @@ msgstr "Ajusta les línies de la sortida" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" -"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n" -"\t\t [--more=<n> | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t [--current] [--color[=<quan>] | --no-color] [--sparse]\n" "\t\t [--more=<n> | --list | --independent | --merge-base]\n" "\t\t [--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<referència>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9609,11 +9646,11 @@ msgstr "mostra les <n> entrades més recents començant a la base" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [patró*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9654,12 +9691,12 @@ msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències d'stdin que no siguin en el dipòsit local" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [opcions] nom [referència]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] nom" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <nom>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9683,9 +9720,10 @@ msgstr "raó de l'actualització" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a|-s|-u <id-de-clau>] [-f] [-m <missatge>|-F <fitxer>] <nom-" +"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-" "d'etiqueta> [<cap>]" #: builtin/tag.c:23 @@ -9694,10 +9732,10 @@ msgstr "git tag -d <nom-d'etiqueta>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<nombre>]] [--contains <comissió>] \n" +"git tag -l [-n[<nombre>]] [--contains <comissió>]\n" "\t\t[--points-at <objecte>] [<patró>...]" #: builtin/tag.c:26 @@ -9841,18 +9879,18 @@ msgstr "usa una altra clau per a firmar l'etiqueta" msgid "replace the tag if exists" msgstr "reemplaça l'etiqueta si existeix" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Opcions de llistat d'etiquetes" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "mostra la llista d'etiquetes en columnes" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "ordena les etiquetes" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Opcions de llistat d'etiquetes" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "imprimeix només les etiquetes que continguin la comissió" @@ -9909,8 +9947,8 @@ msgid "Unpacking objects" msgstr "Desempaquetant objectes" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [opcions] [--] [<fitxer>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<opcions>] [--] [<fitxer>...]" #: builtin/update-index.c:756 msgid "continue refresh even when index needs update" @@ -10030,17 +10068,17 @@ msgid "enable or disable split index" msgstr "habilita o inhabilita l'índex dividit" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [opcions] -d <nom-de-referència> [<valor-antic>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<opcions>] -d <nom-de-referència> [<valor-antic>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" -"git update-ref [opcions] <nom-de-referència> <valor-nou> [<valor-antic>]" +"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-antic>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [opcions] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<opcions>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -10067,16 +10105,16 @@ msgid "update the info files from scratch" msgstr "actualitza els fitxers d'informació des de zero" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <comissió>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <comissió>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "imprimeix els continguts de la comissió" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paquet>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquet>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -10087,8 +10125,8 @@ msgid "show statistics only" msgstr "mostra només estadístiques" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <etiqueta>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <etiqueta>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10373,7 +10411,8 @@ msgstr "El cos de la comissió és:" #. input at this point. #: git-am.sh:807 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -msgstr "Aplica? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots " +msgstr "" +"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots " #: git-am.sh:843 #, sh-format @@ -10448,7 +10487,7 @@ msgstr "HEAD dolent - Cal un HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" "L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-" "vàlida>'." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" +"POT-Creation-Date: 2015-03-27 13:33+0800\n" "PO-Revision-Date: 2015-01-21 15:01+0800\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" @@ -32,8 +32,8 @@ msgstr "" "und zu committen." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [Optionen] <Commit-Referenz> [<Pfad>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]" #: archive.c:12 msgid "git archive --list" @@ -41,10 +41,10 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <Repository> [--exec <Programm>] [Optionen] <Commit-" -"Referenz> [Pfad...]" +"git archive --remote <Repository> [--exec <Programm>] [<Optionen>] <Commit-" +"Referenz> [<Pfad>...]" #: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -71,10 +71,10 @@ msgstr "Präfix" msgid "prepend prefix to each pathname in the archive" msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "Datei" @@ -123,7 +123,7 @@ msgstr "Programm" msgid "path to the remote git-upload-archive command" msgstr "Pfad zum externen \"git-upload-archive\"-Programm" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -257,7 +257,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:764 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" @@ -266,8 +266,8 @@ msgstr "Konnte '%s' nicht öffnen" msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -308,21 +308,21 @@ msgstr "\"rev-list\" abgebrochen" msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurückgewiesen." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" @@ -345,59 +345,59 @@ msgstr "%s %s ist kein Commit!" msgid "memory exhausted" msgstr "Speicher verbraucht" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "Zeile %d in Konfigurationsdatei %s ist ungültig." -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "ungültiger zlib Komprimierungsgrad %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "Ungültiger Modus für Objekterstellung: %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Kommandozeile angegebene Konfiguration nicht parsen." -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "Konnte Wert '%s' aus der über die Kommandozeile angegebenen\n" "Konfiguration nicht parsen." -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" @@ -489,7 +489,7 @@ msgstr[1] "vor %lu Jahren" msgid "failed to read orderfile '%s'" msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" @@ -518,16 +518,16 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -536,7 +536,7 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" @@ -616,7 +616,7 @@ msgstr "" #: help.c:373 #, c-format msgid "in %0.1f seconds automatically..." -msgstr "Automatische Ausführung in %0.1f Sekunden..." +msgstr "Automatische Ausführung in %0.1f Sekunden ..." #: help.c:380 #, c-format @@ -710,7 +710,7 @@ msgstr "Fehler beim Öffnen von '%s'" #: merge-recursive.c:797 #, c-format msgid "failed to symlink '%s'" -msgstr "Fehler beim Erstellen eines symbolischen Verweises für '%s'" +msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'" #: merge-recursive.c:800 #, c-format @@ -1025,7 +1025,7 @@ msgstr "" #: pathspec.c:432 #, c-format msgid "pathspec '%s' is beyond a symbolic link" -msgstr "Pfadspezifikation '%s' ist hinter einem symbolischen Verweis" +msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung" #: pathspec.c:441 msgid "" @@ -1043,7 +1043,7 @@ msgstr "Konnte --pretty Format nicht parsen." msgid "done" msgstr "Fertig" -#: read-cache.c:1267 +#: read-cache.c:1273 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1052,7 +1052,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1277 +#: read-cache.c:1283 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1141,24 +1141,33 @@ msgstr "" " (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " "zusammenzuführen)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "Öffnen von /dev/null fehlgeschlagen" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) fehlgeschlagen" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "Fehler beim Signieren des \"push\"-Zertifikates" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "" "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")" +#: send-pack.c:366 +msgid "server does not support --atomic push" +msgstr "" +"die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1189,7 +1198,7 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "Konnte nicht nach %s schreiben" @@ -1227,184 +1236,184 @@ msgstr "Konnte Commit von HEAD nicht auflösen\n" msgid "Unable to update cache tree\n" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "Konnte Commit %s nicht parsen\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Konnte Eltern-Commit %s nicht parsen\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "Ihre Staging-Area-Datei ist nicht zusammengeführt." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Commit %s hat keinen Elternteil %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "Kann keine Commit-Beschreibung für %s bekommen" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" -msgstr "Konnte \"revert\" nicht auf %s ausführen... %s" +msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" -msgstr "Konnte %s nicht anwenden... %s" +msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "leere Menge von Commits übergeben" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen der Staging-Area" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren der Staging-Area" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "Kann %s nicht während eines %s durchführen" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Konnte Zeile %d nicht parsen." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Konnte %s nicht öffnen" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "Konnte %s nicht lesen." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Unbenutzbares Instruktionsblatt: %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Fehlerhaftes Optionsblatt: %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Fehler beim Einpacken von %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4286 #, c-format msgid "cannot open %s: %s" msgstr "Kann %s nicht öffnen: %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "Kann %s nicht lesen: %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Konnte %s nicht formatieren." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen." @@ -1477,38 +1486,38 @@ msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen" msgid "staging updated .gitmodules failed" msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Konnte git-Verweis %s nicht erstellen" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "Konnte core.worktree in '%s' nicht setzen." -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "unbekannter Wert '%s' für Schlüssel %s" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "mehr als ein %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "leerer Anhang-Token in Anhang '%.*s'" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "Konnte Eingabe-Datei '%s' nicht lesen" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "konnte nicht von der Standard-Eingabe lesen" @@ -1545,26 +1554,26 @@ msgstr "ungültige Portnummer" msgid "invalid '..' path segment" msgstr "ungültiges '..' Pfadsegment" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "konnte nicht auf '%s' zugreifen: %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "konnte nicht auf '%s' zugreifen" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "kein solcher Benutzer" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." @@ -1601,11 +1610,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "zum Commit vorgemerkte Änderungen:" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" @@ -1723,15 +1732,15 @@ msgstr "unversionierter Inhalt, " msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1739,75 +1748,75 @@ msgstr "" "Ändern Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird entfernt." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:956 +#: wt-status.c:972 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:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:960 +#: wt-status.c:976 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:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1028 +#: wt-status.c:1044 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:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1032 +#: wt-status.c:1048 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:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1815,130 +1824,130 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:1057 +#: wt-status.c:1073 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:1061 +#: wt-status.c:1077 #, 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:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\", um den aktuellen Commit " "nachzubessern)" -#: wt-status.c:1071 +#: wt-status.c:1087 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:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1086 +#: wt-status.c:1102 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:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1091 +#: wt-status.c:1107 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:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade an einem Revert von Commit '%s'." -#: wt-status.c:1105 +#: wt-status.c:1121 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:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, 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:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1128 +#: wt-status.c:1144 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:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1949,32 +1958,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:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder " "\"git commit -a\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1983,48 +1992,48 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen " "Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git " "add\" zum Versionieren)\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien " "anzuzeigen)\n" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Initialer Commit auf " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "entfernt" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "hinterher " @@ -2034,8 +2043,8 @@ msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [Optionen] [--] [<Pfadspezifikation>...]" +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." #: builtin/add.c:65 #, c-format @@ -2089,14 +2098,14 @@ msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "erweiterte Ausgaben" @@ -2176,79 +2185,79 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Wollten Sie vielleicht 'git add .' sagen?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "Staging-Area-Datei beschädigt" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Konnte neue Staging-Area-Datei nicht schreiben." -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [Optionen] [<Patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<Optionen>] [<Patch>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "nicht erkannte Whitespace-Option: '%s'" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " "%d" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2263,65 +2272,65 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" -msgstr "konnte symbolischen Verweis %s nicht lesen" +msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: builtin/apply.c:2872 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -2329,12 +2338,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" msgstr[1] "" "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" -#: builtin/apply.c:2884 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden" -#: builtin/apply.c:2890 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" @@ -2343,335 +2352,354 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2933 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: builtin/apply.c:3010 +#: builtin/apply.c:3034 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:3016 +#: builtin/apply.c:3040 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3061 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3185 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3238 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "'%s' ist hinter einer symbolischen Verknüpfung" + +#: builtin/apply.c:3266 builtin/apply.c:3488 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3347 builtin/apply.c:3502 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht in der Staging-Area" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3356 builtin/apply.c:3510 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version in der Staging-Area" -#: builtin/apply.c:3432 +#: builtin/apply.c:3458 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: builtin/apply.c:3501 +#: builtin/apply.c:3527 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3503 +#: builtin/apply.c:3529 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3688 builtin/apply.c:3690 +#, c-format +msgid "invalid path '%s'" +msgstr "Ungültiger Pfad '%s'" + +#: builtin/apply.c:3745 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3607 +#: builtin/apply.c:3748 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: builtin/apply.c:3627 +#: builtin/apply.c:3768 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3793 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung" + +#: builtin/apply.c:3797 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3653 +#: builtin/apply.c:3811 #, c-format msgid "Checking patch %s..." -msgstr "Prüfe Patch %s..." +msgstr "Prüfe Patch %s ..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" -#: builtin/apply.c:3889 +#: builtin/apply.c:4047 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus der Staging-Area entfernen" -#: builtin/apply.c:3918 +#: builtin/apply.c:4076 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch für Submodul %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4080 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:3927 +#: builtin/apply.c:4085 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4088 builtin/apply.c:4196 #, c-format msgid "unable to add cache entry for %s" msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" -#: builtin/apply.c:3963 +#: builtin/apply.c:4121 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: builtin/apply.c:4012 +#: builtin/apply.c:4170 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:4099 +#: builtin/apply.c:4257 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:4107 +#: builtin/apply.c:4265 msgid "internal error" msgstr "interner Fehler" -#: builtin/apply.c:4110 +#: builtin/apply.c:4268 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..." msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." -#: builtin/apply.c:4120 +#: builtin/apply.c:4278 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4299 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:4144 +#: builtin/apply.c:4302 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurückgewiesen." -#: builtin/apply.c:4234 +#: builtin/apply.c:4392 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:4245 +#: builtin/apply.c:4403 msgid "unable to read index file" msgstr "Konnte Staging-Area-Datei nicht lesen" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "Pfad" -#: builtin/apply.c:4363 +#: builtin/apply.c:4521 msgid "don't apply changes matching the given path" msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: builtin/apply.c:4366 +#: builtin/apply.c:4524 msgid "apply changes matching the given path" msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: builtin/apply.c:4368 +#: builtin/apply.c:4526 msgid "num" msgstr "Anzahl" -#: builtin/apply.c:4369 +#: builtin/apply.c:4527 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " "entfernen" -#: builtin/apply.c:4372 +#: builtin/apply.c:4530 msgid "ignore additions made by the patch" msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: builtin/apply.c:4374 +#: builtin/apply.c:4532 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " "ausgegeben" -#: builtin/apply.c:4378 +#: builtin/apply.c:4536 msgid "show number of added and deleted lines in decimal notation" msgstr "" "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen" -#: builtin/apply.c:4380 +#: builtin/apply.c:4538 msgid "instead of applying the patch, output a summary for the input" msgstr "" "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe " "ausgeben" -#: builtin/apply.c:4382 +#: builtin/apply.c:4540 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: builtin/apply.c:4384 +#: builtin/apply.c:4542 msgid "make sure the patch is applicable to the current index" msgstr "" "sicherstellen, dass der Patch in der aktuellen Staging-Area angewendet " "werden kann" -#: builtin/apply.c:4386 +#: builtin/apply.c:4544 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: builtin/apply.c:4388 +#: builtin/apply.c:4546 +msgid "accept a patch that touches outside the working area" +msgstr "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt" + +#: builtin/apply.c:4548 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4550 msgid "attempt three-way merge if a patch does not apply" msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" -#: builtin/apply.c:4392 +#: builtin/apply.c:4552 msgid "build a temporary index based on embedded index information" msgstr "" "eine temporäre Staging-Area, basierend auf den integrierten Staging-Area-" "Informationen, erstellen" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4397 +#: builtin/apply.c:4557 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: builtin/apply.c:4398 +#: builtin/apply.c:4558 msgid "action" msgstr "Aktion" -#: builtin/apply.c:4399 +#: builtin/apply.c:4559 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4562 builtin/apply.c:4565 msgid "ignore changes in whitespace when finding context" msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: builtin/apply.c:4408 +#: builtin/apply.c:4568 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: builtin/apply.c:4410 +#: builtin/apply.c:4570 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: builtin/apply.c:4412 +#: builtin/apply.c:4572 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: builtin/apply.c:4414 +#: builtin/apply.c:4574 msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: builtin/apply.c:4417 +#: builtin/apply.c:4577 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: builtin/apply.c:4420 +#: builtin/apply.c:4580 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: builtin/apply.c:4422 +#: builtin/apply.c:4582 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/apply.c:4423 +#: builtin/apply.c:4583 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" -#: builtin/apply.c:4445 +#: builtin/apply.c:4605 msgid "--3way outside a repository" msgstr "" "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4453 +#: builtin/apply.c:4613 msgid "--index outside a repository" msgstr "" "Die Option --index kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4456 +#: builtin/apply.c:4616 msgid "--cached outside a repository" msgstr "" "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4472 +#: builtin/apply.c:4635 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht öffnen" -#: builtin/apply.c:4486 +#: builtin/apply.c:4649 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "unterdrückte %d Whitespace-Fehler" msgstr[1] "unterdrückte %d Whitespace-Fehler" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4655 builtin/apply.c:4665 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2726,105 +2754,105 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [Optionen] [rev-opts] [rev] [--] Datei" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] Datei" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[rev-opts] sind dokumentiert in git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "" "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" @@ -2834,25 +2862,25 @@ msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren, und 11 Monaten" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [Optionen] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [Optionen] [-l] [-f] <Branchname> [<Startpunkt>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [Optionen] [-r] (-d | -D) <Branchname>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [Optionen] (-m | -M) [<alterBranch>] <neuerBranch>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>" #: builtin/branch.c:152 #, c-format @@ -2994,199 +3022,204 @@ msgstr "(kein Branch, Rebase von Branch %s im Gange)" msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "(losgelöst von %s)" +msgid "(HEAD detached at %s)" +msgstr "(HEAD losgelöst bei %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD losgelöst von %s)" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(kein Branch)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "Objekt '%s' zeigt auf keinen Commit" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "Konnte einige Referenzen nicht lesen" -#: builtin/branch.c:704 +#: builtin/branch.c:711 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:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, 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:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "den Übernahmemodus einstellen (siehe git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "Commit" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, welche diesen Commit beinhalten" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "nur Branches ausgeben, die nicht zusammengeführt sind" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "nur Branches ausgeben, die zusammengeführt sind" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "zu viele Branches für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3194,43 +3227,43 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "" "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen" -#: builtin/branch.c:991 +#: builtin/branch.c:998 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:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD' darf nicht manuell erstellt werden" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " "Branchnamen verwendet werden." -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3239,7 +3272,7 @@ msgstr "" "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" "track oder --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3250,12 +3283,12 @@ msgstr "" "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen " "Sie aus:\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3273,57 +3306,57 @@ 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: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:326 +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: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:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <Liste-von-Objekten>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "Objektart anzeigen" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "Objektgröße anzeigen" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 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:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "" "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | Attribut...] [--] Pfadname..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "" -"git check-attr --stdin [-z] [-a | --all | Attribut...] < <Liste-von-Pfaden>" +"git check-attr --stdin [-z] [-a | --all | <Attribut>...] < <Liste-von-Pfaden>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3379,8 +3412,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching ist nur mit --verbose zulässig" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [Optionen] <Kontakt>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<Optionen>] <Kontakt>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3396,8 +3429,8 @@ msgid "no contacts specified" msgstr "keine Kontakte angegeben" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [Optionen] [--] [<Datei>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3443,12 +3476,12 @@ msgid "copy out the files from named stage" msgstr "Dateien von dem benannten Stand kopieren" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [Optionen] <Branch>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<Optionen>] <Branch>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [Optionen] [<Branch>] -- <Datei>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3578,13 +3611,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" "Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n" "ein guter Zeitpunkt sein dies zu tun mit:\n" "\n" -" git branch neuer_branch_name %s\n" +" git branch <neuer-Branchname> %s\n" "\n" #: builtin/checkout.c:777 @@ -3700,8 +3733,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "second guess 'git checkout no-such-branch'" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "second guess 'git checkout <no-such-branch>'" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3824,16 +3857,17 @@ msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s" msgid "Select items to delete" msgstr "Wählen Sie Einträge zum Löschen" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "'%s' löschen? " +msgid "Remove %s [y/N]? " +msgstr "'%s' löschen [y/N]? " -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Tschüss." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3851,62 +3885,62 @@ msgstr "" "help - diese Meldung anzeigen\n" "? - Hilfe zur Auswahl mittels Eingabe anzeigen" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Kommandos ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Was nun" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Würde das folgende Element entfernen:" msgstr[1] "Würde die folgenden Elemente entfernen:" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Keine Dateien mehr zum Löschen, beende." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "keine Namen von gelöschten Dateien ausgeben" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "Aktion erzwingen" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "interaktives Clean" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "Muster" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "auch ignorierte Dateien löschen" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "nur ignorierte Dateien löschen" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3914,7 +3948,7 @@ msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " "\"clean\" verweigert" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3923,11 +3957,11 @@ msgstr "" "f gegeben; \"clean\" verweigert" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [Optionen] [--] <Repository> [<Verzeichnis>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" @@ -3987,7 +4021,7 @@ msgstr "<Branch> auschecken, 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:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "Tiefe" @@ -4091,7 +4125,7 @@ msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." #: builtin/clone.c:561 #, c-format msgid "Checking connectivity... " -msgstr "Prüfe Konnektivität... " +msgstr "Prüfe Konnektivität ... " #: builtin/clone.c:564 msgid "remote did not send all necessary objects" @@ -4137,7 +4171,7 @@ msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" @@ -4152,63 +4186,63 @@ msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen." +msgid "could not create work tree dir '%s'" +msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" -msgstr "Klone in Bare-Repository '%s'...\n" +msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" -msgstr "Klone nach '%s'...\n" +msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate ohne --reference angegeben" -#: builtin/clone.c:912 +#: builtin/clone.c:913 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:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --" "local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [Optionen]" +msgid "git column [<options>]" +msgstr "git column [<Optionen>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4239,12 +4273,12 @@ msgid "--command must be the first argument" msgstr "Die Option --command muss an erster Stelle stehen." #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [Optionen] [--] <Pfadspezifikation>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [Optionen] [--] <Pfadspezifikation>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..." #: builtin/commit.c:47 msgid "" @@ -4390,26 +4424,26 @@ msgstr "Kann Staging-Area nicht lesen" msgid "unable to write temporary index file" msgstr "Konnte temporäre Staging-Area-Datei nicht schreiben." -#: builtin/commit.c:584 +#: builtin/commit.c:578 #, c-format msgid "commit '%s' lacks author header" msgstr "Commit '%s' fehlt Autor-Kopfbereich" -#: builtin/commit.c:586 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' has malformed author line" msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:605 +#: builtin/commit.c:599 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:613 +#: builtin/commit.c:607 #, c-format msgid "invalid date format: %s" msgstr "Ungültiges Datumsformat: %s" -#: builtin/commit.c:657 +#: builtin/commit.c:651 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4417,43 +4451,43 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:700 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:702 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:712 +#: builtin/commit.c:706 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:734 +#: builtin/commit.c:728 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:738 +#: builtin/commit.c:732 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:742 +#: builtin/commit.c:736 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: builtin/commit.c:789 +#: builtin/commit.c:783 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:807 +#: builtin/commit.c:801 #, c-format msgid "" "\n" @@ -4468,7 +4502,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:806 #, c-format msgid "" "\n" @@ -4483,7 +4517,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:819 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4493,7 +4527,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:826 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4506,155 +4540,155 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:846 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:854 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:867 +#: builtin/commit.c:861 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:879 msgid "Cannot read index" msgstr "Kann Staging-Area nicht lesen" -#: builtin/commit.c:942 +#: builtin/commit.c:936 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:951 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1053 #, c-format -msgid "No existing author found with '%s'" -msgstr "Kein existierender Autor mit '%s' gefunden." +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem vorhandenen Autor überein" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1068 builtin/commit.c:1308 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unversionierte Dateien" -#: builtin/commit.c:1111 +#: builtin/commit.c:1105 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1141 +#: builtin/commit.c:1135 msgid "Using both --reset-author and --author does not make sense" msgstr "" "Die Optionen --reset-author und --author können nicht gemeinsam verwendet " "werden." -#: builtin/commit.c:1150 +#: builtin/commit.c:1144 msgid "You have nothing to amend." msgstr "Sie haben nichts für \"--amend\"." -#: builtin/commit.c:1153 +#: builtin/commit.c:1147 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1155 +#: builtin/commit.c:1149 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1158 +#: builtin/commit.c:1152 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1168 +#: builtin/commit.c:1162 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1170 +#: builtin/commit.c:1164 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden." -#: builtin/commit.c:1178 +#: builtin/commit.c:1172 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." -#: builtin/commit.c:1195 +#: builtin/commit.c:1189 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Es kann nur eine Option von --include/--only/--all/--interactive/--patch " "verwendet werden." -#: builtin/commit.c:1197 +#: builtin/commit.c:1191 msgid "No paths with --include/--only does not make sense." msgstr "" "Die Optionen --include und --only können nur mit der Angabe von Pfaden " "verwendet werden." -#: builtin/commit.c:1199 +#: builtin/commit.c:1193 msgid "Clever... amending the last one with dirty index." msgstr "" -"Klug... den letzten Commit mit einer geänderten Staging-Area nachbessern." +"Klug ... den letzten Commit mit einer geänderten Staging-Area nachbessern." -#: builtin/commit.c:1201 +#: builtin/commit.c:1195 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an" -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1207 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1212 msgid "Paths with -a does not make sense." -msgstr "Die Option -a kann nur mit der Angabe von Pfaden verwendet werden." +msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1322 builtin/commit.c:1602 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1329 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1332 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1335 builtin/commit.c:1614 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: " "all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1338 msgid "show ignored files" msgstr "ignorierte Dateien anzeigen" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1339 parse-options.h:153 msgid "when" msgstr "wann" -#: builtin/commit.c:1346 +#: builtin/commit.c:1340 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4662,211 +4696,211 @@ msgstr "" "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1342 msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1435 +#: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: builtin/commit.c:1437 +#: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellten Commit nicht analysieren." -#: builtin/commit.c:1482 +#: builtin/commit.c:1476 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: builtin/commit.c:1485 +#: builtin/commit.c:1479 msgid " (root-commit)" msgstr " (Basis-Commit)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken" -#: builtin/commit.c:1579 +#: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1581 +#: builtin/commit.c:1575 msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1576 builtin/tag.c:601 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "author" msgstr "Autor" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1578 builtin/gc.c:275 msgid "date" msgstr "Datum" -#: builtin/commit.c:1584 +#: builtin/commit.c:1578 msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "Beschreibung" -#: builtin/commit.c:1585 +#: builtin/commit.c:1579 msgid "commit message" msgstr "Commit-Beschreibung" -#: builtin/commit.c:1586 +#: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1587 +#: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1588 +#: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1589 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1590 +#: builtin/commit.c:1584 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufügen" -#: builtin/commit.c:1592 +#: builtin/commit.c:1586 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1593 +#: builtin/commit.c:1587 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1594 +#: builtin/commit.c:1588 msgid "default" msgstr "Standard" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1588 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: builtin/commit.c:1595 +#: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" -#: builtin/commit.c:1600 +#: builtin/commit.c:1594 msgid "Commit contents options" msgstr "Optionen für Commit-Inhalt" -#: builtin/commit.c:1601 +#: builtin/commit.c:1595 msgid "commit all changed files" msgstr "alle geänderten Dateien committen" -#: builtin/commit.c:1602 +#: builtin/commit.c:1596 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken" -#: builtin/commit.c:1603 +#: builtin/commit.c:1597 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1604 +#: builtin/commit.c:1598 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1605 +#: builtin/commit.c:1599 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1606 +#: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "\"pre-commit hook\" umgehen" -#: builtin/commit.c:1607 +#: builtin/commit.c:1601 msgid "show what would be committed" msgstr "anzeigen, was committet werden würde" -#: builtin/commit.c:1618 +#: builtin/commit.c:1612 msgid "amend previous commit" msgstr "vorherigen Commit ändern" -#: builtin/commit.c:1619 +#: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1624 +#: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren Änderung erlauben" -#: builtin/commit.c:1626 +#: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1655 +#: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1688 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: builtin/commit.c:1701 +#: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1727 +#: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1732 #, 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:1743 +#: builtin/commit.c:1737 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: builtin/commit.c:1791 +#: builtin/commit.c:1785 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4878,8 +4912,8 @@ msgstr "" "anschließend \"git reset HEAD\" zu Wiederherstellung aus." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [Optionen]" +msgid "git config [<options>]" +msgstr "git config [<Optionen>]" #: builtin/config.c:53 msgid "Config file location" @@ -5034,12 +5068,12 @@ msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [Optionen] <commit-ish>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<Optionen>] [<Commit-Angabe>...]" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [Optionen] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<Optionen>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5178,7 +5212,7 @@ msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." #: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" -msgstr "'%s': keine reguläre Datei oder symbolischer Verweis" +msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung" #: builtin/diff.c:237 #, c-format @@ -5256,183 +5290,183 @@ msgstr "Refspec auf exportierte Referenzen anwenden" msgid "anonymize output" msgstr "Ausgabe anonymisieren" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<Optionen>] <Gruppe>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "das Überschreiben von lokalen Branches erzwingen" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "nicht alle Tags anfordern (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "" "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " "befinden" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "Verzeichnis" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "Standard-Modus für Rekursion" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, 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:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (kann lokale Referenz nicht aktualisieren)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(kein Vorspulen)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "kann %s nicht öffnen: %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit " "unvollständiger Historie (shallow) nicht aktualisiert werden dürfen." -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5441,57 +5475,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:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, 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:837 +#: builtin/fetch.c:838 #, 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:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "Weiß nicht wie von %s angefordert wird." -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5500,44 +5534,45 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "" "Die Option --unshallow kann nicht in einem Repository mit unvollständiger " "Historie verwendet werden." -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 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" "von Refspecs verwendet werden." #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>]|--no-log] [--file <Datei>]" +"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file <Datei>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5566,51 +5601,51 @@ msgstr "<Text> als Beschreibungsanfang verwenden" msgid "file to read from" msgstr "Datei zum Einlesen" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "Konnte Format nicht parsen." -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [Optionen] [<Muster>]" +#: 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:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "Platzhalter als Shell-String formatieren" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "Platzhalter als Perl-String formatieren" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "Platzhalter als Python-String formatieren" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "Platzhalter als Tcl-String formatieren" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "Format" -#: builtin/for-each-ref.c:1089 +#: 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:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "Schüssel" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" @@ -5619,8 +5654,8 @@ msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [Optionen] [<Objekt>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<Optionen>] [<Objekt>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5667,8 +5702,8 @@ msgid "Checking objects" msgstr "Prüfe Objekte" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [Optionen]" +msgid "git gc [<options>]" +msgstr "git gc [<Optionen>]" #: builtin/gc.c:79 #, c-format @@ -5733,8 +5768,8 @@ msgstr "" "diese zu löschen." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [Optionen] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" #: builtin/grep.c:218 #, c-format @@ -5774,8 +5809,8 @@ msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "auch in ignorierten Dateien suchen" +msgid "ignore files specified via '.gitignore'" +msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5971,17 +6006,17 @@ msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <Art>] [-w] [--path=<Datei>|--no-filters] [--stdin] [--] " +"git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] [--] " "<Datei>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <Liste-von-Pfaden>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "Art" @@ -6033,8 +6068,8 @@ msgid "show info page" msgstr "Info-Seite anzeigen" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [Kommando]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<Kommando>]" #: builtin/help.c:64 #, c-format @@ -6243,8 +6278,8 @@ msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" @@ -6331,97 +6366,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelöste Unterschied" msgstr[1] "Paket hat %d unaufgelöste Unterschiede" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "kein Unterschied: %d Objekt" msgstr[1] "kein Unterschied: %d Objekte" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt" msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." @@ -6458,12 +6493,12 @@ msgstr "kann Verweis '%s' nicht lesen" #: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" -msgstr "zu langer symbolischer Verweis %s" +msgstr "zu lange symbolische Verknüpfung %s" #: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" -msgstr "kann symbolischen Verweis '%s' auf '%s' nicht erstellen" +msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen" #: builtin/init-db.c:106 #, c-format @@ -6533,10 +6568,10 @@ msgstr " gemeinsames" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" -"shared[=<Berechtigungen>]] [Verzeichnis]" +"shared[=<Berechtigungen>]] [<Verzeichnis>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6599,8 +6634,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [Optionen] <Objekt>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<Optionen>] <Objekt>..." #: builtin/log.c:81 #, c-format @@ -6678,8 +6713,8 @@ msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [Optionen] [<seit> | <Commitbereich>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6880,102 +6915,102 @@ msgstr "" msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [Optionen] [<Datei>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<Optionen>] [<Datei>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "den Dateistatus mit Tags anzeigen" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "entfernte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "geänderte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "sonstige Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "ignorierte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "" "Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe " "anzeigen" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "keine leeren Verzeichnisse anzeigen" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "'resolve-undo' Informationen anzeigen" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "Dateien auslassen, die einem Muster entsprechen" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "Muster, gelesen von <Datei>, ausschließen" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "Ausgabe relativ zum Projektverzeichnis" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "" "als Fehler behandeln, wenn sich eine <Datei> nicht in der Staging-Area " "befindet" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "Commit-Referenz" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch " "vorhanden sind" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "Ausgaben zur Fehlersuche anzeigen" @@ -7018,12 +7053,12 @@ msgstr "" "(impliziert --full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [Optionen] [<Commit>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<Optionen>] [<Commit>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [Optionen] <Beschreibung> HEAD <Commit>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7335,7 +7370,7 @@ msgstr "Aktualisiere %s..%s\n" #: builtin/merge.c:1388 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "Probiere wirklich trivialen \"in-index\"-Merge...\n" +msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" #: builtin/merge.c:1395 #, c-format @@ -7349,12 +7384,12 @@ msgstr "Vorspulen nicht möglich, breche ab." #: builtin/merge.c:1450 builtin/merge.c:1529 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "Rücklauf des Verzeichnisses bis zum Ursprung...\n" +msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" #: builtin/merge.c:1454 #, c-format msgid "Trying merge strategy %s...\n" -msgstr "Probiere Merge-Strategie %s...\n" +msgstr "Probiere Merge-Strategie %s ...\n" #: builtin/merge.c:1520 #, c-format @@ -7378,12 +7413,12 @@ msgstr "" "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <Commit> <Commit>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <Commit> <Commit>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <Commit>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <Commit>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7419,11 +7454,11 @@ msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [Optionen] [-L Name1 [-L orig [-L Name2]]] Datei1 orig_Datei " -"Datei2" +"git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> " +"<orig-Datei> <Datei2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7454,8 +7489,8 @@ msgid "do not warn about conflicts" msgstr "keine Warnung bei Konflikten" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "Beschriftung für Datei1/orig_Datei/Datei2 setzen" +msgid "set labels for file1/orig-file/file2" +msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7474,8 +7509,8 @@ msgid "allow creation of more than one tree" msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [Optionen] <Quelle>... <Ziel>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<Optionen>] <Quelle>... <Ziel>" #: builtin/mv.c:69 #, c-format @@ -7563,22 +7598,22 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [Optionen] <Commit>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<Optionen>] <Commit>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [Optionen] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<Optionen>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [Optionen] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<Optionen>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7609,43 +7644,43 @@ msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <Notiz-Referenz>] [list [<Objekt>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <Notiz-Referenz>] add [-f] [--allow-empty] [-m " "<Beschreibung> | -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <Notiz-Referenz>] copy [-f] <von-Objekt> <nach-Objekt>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <Notiz-Referenz>] append [--allow-empty] [-m <Beschreibung> " "| -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <Notiz-Referenz>] edit [--allow-empty] [<Objekt>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <Notiz-Referenz>] show [<Objekt>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie> ] <Notiz-" +"git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie>] <Notiz-" "Referenz>" #: builtin/notes.c:31 @@ -7657,15 +7692,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <Notiz-Referenz>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <Notiz-Referenz>] get-ref" #: builtin/notes.c:40 @@ -7697,7 +7732,7 @@ msgid "git notes show [<object>]" msgstr "git notes show [<Objekt>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<Optionen>] <Notiz-Referenz>" #: builtin/notes.c:72 @@ -7939,7 +7974,7 @@ msgid "notes-ref" msgstr "Notiz-Referenz" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" +msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" #: builtin/notes.c:989 builtin/remote.c:1621 @@ -7957,197 +7992,197 @@ msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" "git pack-objects [Optionen...] Basis-Name [< Referenzliste | < Objektliste]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "Deaktiviere Schreiben des Bitmap-Index, da einige Objekte nicht in\n" "eine Pack-Datei geschrieben wurden" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Staging-Area-Version %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Staging-Area-Version '%s'" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "Option %s akzeptiert keine negative Form" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, 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:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "" "Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 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:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "" "Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden " "verwenden" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die von der Staging-Area referenziert werden" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "Zeit" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Zähle Objekte" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [Optionen]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<Optionen>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -8158,8 +8193,8 @@ msgid "prune loose refs (default)" msgstr "lose Referenzen entfernen (Standard)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8452,75 +8487,79 @@ msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." msgid "--all and --mirror are incompatible" msgstr "Die Optionen --all und --mirror sind inkompatibel." -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "Repository" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "alle Referenzen versenden" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "alle Referenzen spiegeln" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "Referenzen löschen" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "Aktualisierung erzwingen" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "Referenzname>:<Erwartungswert" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "Referenz muss sich auf dem angegebenen Wert befinden" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "rekursiven \"push\" von Submodulen steuern" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "kleinere Pakete verwenden" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "'receive pack' Programm" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "Upstream für \"git pull/status\" setzen" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "lokal gelöschte Referenzen entfernen" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "\"pre-push hook\" umgehen" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "fehlende, aber relevante Tags versenden" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "signiert \"push\" mit GPG" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "Referenzen atomar versenden" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." @@ -8599,12 +8638,12 @@ msgstr "Anwendung des Filters für spärliches Auschecken überspringen" msgid "debug unpack-trees" msgstr "Entpacken der Bäume protokollieren" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "'%s' für '%s' ist kein gültiger Zeitstempel" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel" @@ -8615,10 +8654,10 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <Branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <Name> <URL>" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8629,8 +8668,8 @@ msgstr "git remote rename <alt> <neu>" msgid "git remote remove <name>" msgstr "git remote remove <Name>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" #: builtin/remote.c:17 @@ -8667,10 +8706,6 @@ msgstr "git remote set-url --delete <Name> <URL>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<Optionen>] <Name> <URL>" -#: 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:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <Name> <Branch>..." @@ -9116,8 +9151,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterkommando angegeben werden" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [Optionen]" +msgid "git repack [<options>]" +msgstr "git repack [<Optionen>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -9186,7 +9221,7 @@ msgid "repack objects in packs marked with .keep" msgstr "" "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "Löschen von '%s' fehlgeschlagen" @@ -9278,8 +9313,8 @@ msgid "use this format" msgstr "das angegebene Format benutzen" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "git rerere [clean | forget path... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9419,8 +9454,8 @@ msgid "Could not write new index file." msgstr "Konnte neue Staging-Area-Datei nicht schreiben." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [Optionen] -- [<Argumente>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9437,30 +9472,30 @@ msgstr "" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [Optionen] -- [<Argumente>...]\n" +"git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]\n" " oder: git rev-parse --sq-quote [<Argumente>...]\n" -" oder: git rev-parse [Optionen] [<Argumente>...]\n" +" oder: git rev-parse [<Optionen>] [<Argumente>...]\n" "\n" "Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei " "erster Verwendung aus." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [Optionen] <Commit-Angabe>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<Optionen>] <Commit-Angabe>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <Unterkommando>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [Optionen] <Commit-Angabe>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<Optionen>] <Commit-Angabe>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9540,8 +9575,8 @@ msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [Optionen] [--] [<Datei>...]" +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<Optionen>] [--] <Datei>..." #: builtin/rm.c:65 msgid "" @@ -9648,8 +9683,8 @@ msgid "git rm: unable to remove %s" msgstr "git rm: konnte %s nicht löschen" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" -msgstr "git shortlog [<Optionen>] [Commitbereich] [[--] <Pfad>...]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] [<Pfad>...]]" #: builtin/shortlog.c:131 #, c-format @@ -9678,19 +9713,19 @@ msgstr "Ausgabe mit Zeilenumbrüchen" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<Wann>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9759,11 +9794,11 @@ msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<Muster>...] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9806,12 +9841,12 @@ msgstr "" "Repository befinden" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [Optionen] name [ref]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] name" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <Name>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9836,9 +9871,10 @@ msgstr "Grund für die Aktualisierung" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a|-s|-u <Schlüssel-id>] [-f] [-m <Beschreibung>|-F <Datei>] " +"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>] " "<Tagname> [<Commit>]" #: builtin/tag.c:23 @@ -9847,10 +9883,10 @@ msgstr "git tag -d <Tagname>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--points-at <Objekt>] \n" +"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--points-at <Objekt>]\n" "\t\t[<Muster>...]" #: builtin/tag.c:26 @@ -9994,18 +10030,18 @@ msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren" msgid "replace the tag if exists" msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Optionen für Auflistung der Tags" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "Tags sortieren" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Optionen für Auflistung der Tags" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "nur Tags ausgeben, die diesen Commit beinhalten" @@ -10062,8 +10098,8 @@ msgid "Unpacking objects" msgstr "Entpacke Objekte" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [Optionen] [--] [<Datei>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<Optionen>] [--] [<Datei>...]" #: builtin/update-index.c:756 msgid "continue refresh even when index needs update" @@ -10186,16 +10222,16 @@ msgid "enable or disable split index" msgstr "Aktivierung oder Deaktivierung des Splittings der Staging-Area" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [Optionen] -d <Referenzname> [<alterWert>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<Optionen>] -d <Referenzname> [<alter-Wert>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "git update-ref [Optionen] <Referenzname> <neuerWert> [<alterWert>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<Optionen>] <Referenzname> <neuer-Wert> [<alter-Wert>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [Optionen] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<Optionen>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -10222,16 +10258,16 @@ msgid "update the info files from scratch" msgstr "die Informationsdateien von Grund auf aktualisieren" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <Commit>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <Commit>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "Commit-Inhalte ausgeben" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <Paket>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <Paket>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -10242,8 +10278,8 @@ msgid "show statistics only" msgstr "nur Statistiken anzeigen" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <Tag>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <Tag>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10334,7 +10370,7 @@ msgstr "zwei oder mehr Entwicklungszweige zusammenführen" #: common-cmds.h:20 msgid "Move or rename a file, a directory, or a symlink" msgstr "" -"eine Datei, ein Verzeichnis, oder einen symbolischen Verweis verschieben " +"eine Datei, ein Verzeichnis, oder eine symbolische Verknüpfung verschieben " "oder umbenennen" #: common-cmds.h:21 @@ -10450,7 +10486,7 @@ msgstr "" #: git-am.sh:166 msgid "Falling back to patching base and 3-way merge..." -msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges..." +msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..." #: git-am.sh:182 msgid "Failed to merge in the changes." @@ -10614,10 +10650,10 @@ msgstr "Ungültiger HEAD - HEAD wird benötigt" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" "Auschecken von '$start_head' fehlgeschlagen. Versuchen Sie 'git bisect reset " -"<gueltigerbranch>'." +"<gültiger-Branch>'." #: git-bisect.sh:140 msgid "won't bisect on cg-seek'ed tree" @@ -10943,7 +10979,7 @@ msgstr "Änderungen von $mb zu $onto:" 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..." +"darauf neu anzuwenden ..." #: git-rebase.sh:620 #, sh-format @@ -11397,6 +11433,18 @@ msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisiere Submodul-URL für '$displaypath'" +#~ msgid "(detached from %s)" +#~ msgstr "(losgelöst von %s)" + +#~ msgid "search also in ignored files" +#~ msgstr "auch in ignorierten Dateien suchen" + +#~ msgid "No existing author found with '%s'" +#~ msgstr "Kein existierender Autor mit '%s' gefunden." + +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#~ msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" + #~ msgid "no files added" #~ msgstr "keine Dateien hinzugefügt" @@ -73,8 +73,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" -"PO-Revision-Date: 2015-01-21 14:57+0800\n" +"POT-Creation-Date: 2015-03-27 13:33+0800\n" +"PO-Revision-Date: 2015-03-30 10:53+0200\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" @@ -98,8 +98,8 @@ msgstr "" "nécessaire pour marquer la résolution et valider." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [options] <arbre ou apparenté> [<chemin>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]" #: archive.c:12 msgid "git archive --list" @@ -107,10 +107,8 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" -msgstr "" -"git archive --remote <dépôt> [--exec <commande>] [options] <arbre ou " -"apparenté> [<chemin>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" +msgstr "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou apparenté> [<chemin>...]" #: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -137,10 +135,10 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fichier" @@ -189,7 +187,7 @@ msgstr "commande" msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -325,7 +323,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:764 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -334,8 +332,8 @@ msgstr "impossible d'ouvrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -376,21 +374,21 @@ msgstr "rev-list a disparu" 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:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "l'index de groupe a disparu" @@ -413,58 +411,58 @@ msgstr "%s %s n'est pas un commit !" msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "ligne %d de fichier de config incorrecte dans %s" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" @@ -556,7 +554,7 @@ msgstr[1] "il y a %lu ans" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -586,16 +584,16 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -604,7 +602,7 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" @@ -1109,7 +1107,7 @@ msgstr "impossible d'analyser le format --pretty" msgid "done" msgstr "fait" -#: read-cache.c:1267 +#: read-cache.c:1273 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1118,7 +1116,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1277 +#: read-cache.c:1283 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1207,23 +1205,31 @@ 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" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent est incompatible avec --bisect" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "échec de dup2(%d,%d)" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" +#: send-pack.c:366 +msgid "server does not support --atomic push" +msgstr "le serveur ne gère pas push --atomic" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1254,7 +1260,7 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "Impossible d'écrire dans %s" @@ -1290,31 +1296,31 @@ msgstr "Impossible de résoudre le commit HEAD\n" msgid "Unable to update cache tree\n" msgstr "Impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "Impossible d'analyser le commit %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Impossible d'analyser le commit parent %s\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "Votre fichier d'index n'est pas fusionné." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Le commit %s n'a pas le parent %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1323,153 +1329,153 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "Impossible d'obtenir un message de validation pour %s" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "Impossible de %s pendant un %s" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Impossible d'analyser la ligne %d." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Aucun commit analysé." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Impossible d'ouvrir %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "Impossible de lire %s." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Feuille d'instruction inutilisable : %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Clé invalide: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Feuille d'options malformée : %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4286 #, c-format msgid "cannot open %s: %s" msgstr "impossible d'ouvrir %s : %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" @@ -1543,38 +1549,38 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Impossible de créer le lien git %s" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "Impossible de paramétrer core.worktree dans %s" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "symbole vide dans la ligne de fin '%.*s'" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrée '%s'" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" @@ -1611,28 +1617,28 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" "impossible de rechercher l'utilisateur actuel dans le fichier de mots de " "passe : %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "utilisateur inconnu" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" @@ -1663,11 +1669,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" @@ -1782,15 +1788,15 @@ msgstr "contenu non suivi, " msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1798,68 +1804,68 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus\n" "Tout se qui suit sera éliminé." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:936 +#: wt-status.c:952 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:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1032 +#: wt-status.c:1048 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:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1867,120 +1873,120 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1054 +#: wt-status.c:1070 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:1057 +#: wt-status.c:1073 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:1061 +#: wt-status.c:1077 #, 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:1066 +#: wt-status.c:1082 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:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1071 +#: wt-status.c:1087 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:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1089 +#: wt-status.c:1105 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:1091 +#: wt-status.c:1107 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:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, 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:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1128 +#: wt-status.c:1144 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:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1992,32 +1998,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2026,49 +2032,49 @@ 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:1387 +#: wt-status.c:1403 #, 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:1390 +#: wt-status.c:1406 #, 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:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, 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:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Validation initiale sur " # à priori on parle d'une branche ici -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "disparue" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "derrière " @@ -2078,8 +2084,8 @@ msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [options] [--] <chemin>..." +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<options>] [--] <chemin>..." #: builtin/add.c:65 #, c-format @@ -2131,14 +2137,14 @@ 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:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "mode verbeux" @@ -2218,82 +2224,82 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [options] [<patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<options>] [<patch>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2308,77 +2314,77 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: builtin/apply.c:2872 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: builtin/apply.c:2884 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: builtin/apply.c:2890 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" @@ -2387,328 +2393,347 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2933 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: builtin/apply.c:3010 +#: builtin/apply.c:3034 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: builtin/apply.c:3016 +#: builtin/apply.c:3040 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3061 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3185 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286 #, c-format msgid "read of %s failed" msgstr "échec de la lecture de %s" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3238 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "lecture depuis '%s' au-delà d'un lien symbolique" + +#: builtin/apply.c:3266 builtin/apply.c:3488 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3347 builtin/apply.c:3502 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3356 builtin/apply.c:3510 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: builtin/apply.c:3432 +#: builtin/apply.c:3458 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: builtin/apply.c:3501 +#: builtin/apply.c:3527 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: builtin/apply.c:3503 +#: builtin/apply.c:3529 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: builtin/apply.c:3604 +#: builtin/apply.c:3688 builtin/apply.c:3690 +#, c-format +msgid "invalid path '%s'" +msgstr "chemin invalide '%s'" + +#: builtin/apply.c:3745 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: builtin/apply.c:3607 +#: builtin/apply.c:3748 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: builtin/apply.c:3627 +#: builtin/apply.c:3768 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3793 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" + +#: builtin/apply.c:3797 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: builtin/apply.c:3653 +#: builtin/apply.c:3811 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: builtin/apply.c:3889 +#: builtin/apply.c:4047 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: builtin/apply.c:3918 +#: builtin/apply.c:4076 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4080 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: builtin/apply.c:3927 +#: builtin/apply.c:4085 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4088 builtin/apply.c:4196 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: builtin/apply.c:3963 +#: builtin/apply.c:4121 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: builtin/apply.c:4012 +#: builtin/apply.c:4170 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: builtin/apply.c:4099 +#: builtin/apply.c:4257 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: builtin/apply.c:4107 +#: builtin/apply.c:4265 msgid "internal error" msgstr "erreur interne" -#: builtin/apply.c:4110 +#: builtin/apply.c:4268 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: builtin/apply.c:4120 +#: builtin/apply.c:4278 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4299 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: builtin/apply.c:4144 +#: builtin/apply.c:4302 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: builtin/apply.c:4234 +#: builtin/apply.c:4392 msgid "unrecognized input" msgstr "entrée non reconnue" -#: builtin/apply.c:4245 +#: builtin/apply.c:4403 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "chemin" -#: builtin/apply.c:4363 +#: builtin/apply.c:4521 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4366 +#: builtin/apply.c:4524 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4368 +#: builtin/apply.c:4526 msgid "num" msgstr "num" -#: builtin/apply.c:4369 +#: builtin/apply.c:4527 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: builtin/apply.c:4372 +#: builtin/apply.c:4530 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: builtin/apply.c:4374 +#: builtin/apply.c:4532 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: builtin/apply.c:4378 +#: builtin/apply.c:4536 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: builtin/apply.c:4380 +#: builtin/apply.c:4538 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée" -#: builtin/apply.c:4382 +#: builtin/apply.c:4540 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: builtin/apply.c:4384 +#: builtin/apply.c:4542 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: builtin/apply.c:4386 +#: builtin/apply.c:4544 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: builtin/apply.c:4388 +#: builtin/apply.c:4546 +msgid "accept a patch that touches outside the working area" +msgstr "accepter un patch qui touche hors de la copie de travail" + +#: builtin/apply.c:4548 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4550 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: builtin/apply.c:4392 +#: builtin/apply.c:4552 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: builtin/apply.c:4397 +#: builtin/apply.c:4557 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: builtin/apply.c:4398 +#: builtin/apply.c:4558 msgid "action" msgstr "action" -#: builtin/apply.c:4399 +#: builtin/apply.c:4559 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4562 builtin/apply.c:4565 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: builtin/apply.c:4408 +#: builtin/apply.c:4568 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: builtin/apply.c:4410 +#: builtin/apply.c:4570 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: builtin/apply.c:4412 +#: builtin/apply.c:4572 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: builtin/apply.c:4414 +#: builtin/apply.c:4574 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: builtin/apply.c:4417 +#: builtin/apply.c:4577 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: builtin/apply.c:4420 +#: builtin/apply.c:4580 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: builtin/apply.c:4422 +#: builtin/apply.c:4582 msgid "root" msgstr "racine" -#: builtin/apply.c:4423 +#: builtin/apply.c:4583 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" -#: builtin/apply.c:4445 +#: builtin/apply.c:4605 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: builtin/apply.c:4453 +#: builtin/apply.c:4613 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: builtin/apply.c:4456 +#: builtin/apply.c:4616 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: builtin/apply.c:4472 +#: builtin/apply.c:4635 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" -#: builtin/apply.c:4486 +#: builtin/apply.c:4649 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4655 builtin/apply.c:4665 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2763,107 +2788,107 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [options] [options-de-révision] [rev] [--] fichier" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] fichier" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[options-de-révision] sont documentés dans git-rev-list(1)" +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:2501 +#: builtin/blame.c:2500 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:2502 +#: builtin/blame.c:2501 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:2503 +#: builtin/blame.c:2502 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:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 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:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 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:2514 +#: builtin/blame.c:2513 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:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 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:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "score" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 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" @@ -2874,25 +2899,25 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [options] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [options] [-l] [-f] <nomdebranche> [<point-de-départ>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [options] [-r] (-d | -D) <nomdebranche>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [options] (-m | -M) [<anciennebranche>] <nouvellebranche>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" #: builtin/branch.c:152 #, c-format @@ -3033,197 +3058,202 @@ msgstr "(aucune branche, rebasage de %s)" msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "(détaché de %s)" +msgid "(HEAD detached at %s)" +msgstr "(HEAD détachée sur %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD détachée depuis %s)" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objet '%s' ne pointe pas sur un commit" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "des références n'ont pas pu être lues" -#: builtin/branch.c:704 +#: builtin/branch.c:711 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:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, 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:744 +#: builtin/branch.c:751 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:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, 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:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:815 +#: builtin/branch.c:822 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:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "commit" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "afficher seulement les branches non fusionnées" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "afficher seulement les branches fusionnées" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3231,41 +3261,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:991 +#: builtin/branch.c:998 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:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3274,7 +3304,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:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3285,12 +3315,12 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3308,55 +3338,54 @@ 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: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:326 +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: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:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <liste-d-objets>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 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:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 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:375 +#: builtin/cat-file.c:373 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:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr...] [--] chemin..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" -msgstr "" -"git check-attr --stdin [-z] [-a | --all | attr...] < <liste-de-chemins>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...] < <liste-de-chemins>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3412,8 +3441,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching n'est valide qu'avec --verbose" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [options] <contact>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<options>] <contact>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3429,8 +3458,8 @@ msgid "no contacts specified" msgstr "aucun contact spécifié" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [options] [--] [<fichier>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<options>] [--] [<fichier>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3475,12 +3504,12 @@ msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [options] <branche>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<options>] <branche>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [options] [<branche>] -- <fichier>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<options>] [<branche>] -- <fichier>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3611,14 +3640,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" -"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon " -"moment\n" +"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon moment\n" "pour le faire avec :\n" "\n" -"git branch nouvelle_branche %s\n" +"git branch <nouvelle-branche> %s\n" "\n" #: builtin/checkout.c:777 @@ -3734,8 +3762,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "deuxième chance 'git checkout branche-inexistante'" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3858,16 +3886,17 @@ msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "supprimer %s ? " +msgid "Remove %s [y/N]? " +msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Au revoir." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3885,62 +3914,62 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "forcer" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "motif" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3948,7 +3977,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3957,11 +3986,11 @@ msgstr "" "nettoyer" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [options] [--] <dépôt> [<répertoire>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" @@ -4021,7 +4050,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:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "profondeur" @@ -4167,7 +4196,7 @@ msgstr "--bare et --separate-git-dir sont incompatibles." msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" @@ -4183,60 +4212,60 @@ msgstr "" msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "impossible de créer le répertoire de la copie de travail '%s'." +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:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate est spécifié, mais --reference est absent" -#: builtin/clone.c:912 +#: builtin/clone.c:913 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:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [options]" +msgid "git column [<options>]" +msgstr "git column [<options>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4267,12 +4296,12 @@ msgid "--command must be the first argument" msgstr "--command doit être le premier argument" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [options] [--] <spécification-de-chemin>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<options>] [--] <spécification-de-chemin>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [options] [--] <spécification-de-chemin>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<options>] [--] <spécification-de-chemin>..." #: builtin/commit.c:47 msgid "" @@ -4417,26 +4446,26 @@ msgstr "impossible de lire l'index" msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:584 +#: builtin/commit.c:578 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:586 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:605 +#: builtin/commit.c:599 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:613 +#: builtin/commit.c:607 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: builtin/commit.c:657 +#: builtin/commit.c:651 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4444,43 +4473,43 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:700 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:702 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:712 +#: builtin/commit.c:706 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:734 +#: builtin/commit.c:728 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:732 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:736 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: builtin/commit.c:789 +#: builtin/commit.c:783 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:807 +#: builtin/commit.c:801 #, c-format msgid "" "\n" @@ -4495,7 +4524,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:806 #, c-format msgid "" "\n" @@ -4510,7 +4539,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:819 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4520,7 +4549,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:826 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4531,147 +4560,147 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:846 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:854 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:867 +#: builtin/commit.c:861 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:879 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:942 +#: builtin/commit.c:936 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:951 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1053 #, c-format -msgid "No existing author found with '%s'" -msgstr "Aucun auteur existant trouvé avec '%s'" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun auteur existant" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1068 builtin/commit.c:1308 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1111 +#: builtin/commit.c:1105 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1141 +#: builtin/commit.c:1135 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1150 +#: builtin/commit.c:1144 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1153 +#: builtin/commit.c:1147 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1155 +#: builtin/commit.c:1149 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1158 +#: builtin/commit.c:1152 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1168 +#: builtin/commit.c:1162 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1170 +#: builtin/commit.c:1164 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." -#: builtin/commit.c:1178 +#: builtin/commit.c:1172 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1195 +#: builtin/commit.c:1189 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1197 +#: builtin/commit.c:1191 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." -#: builtin/commit.c:1199 +#: builtin/commit.c:1193 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." -#: builtin/commit.c:1201 +#: builtin/commit.c:1195 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1207 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1212 msgid "Paths with -a does not make sense." msgstr "Spécifier des chemins avec l'option -a n'a pas de sens." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1322 builtin/commit.c:1602 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1329 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1332 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1335 builtin/commit.c:1614 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1338 msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1339 parse-options.h:153 msgid "when" msgstr "quand" -#: builtin/commit.c:1346 +#: builtin/commit.c:1340 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4679,209 +4708,209 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1342 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1435 +#: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1437 +#: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1482 +#: builtin/commit.c:1476 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1485 +#: builtin/commit.c:1479 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1579 +#: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1581 +#: builtin/commit.c:1575 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1576 builtin/tag.c:601 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "author" msgstr "auteur" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1578 builtin/gc.c:275 msgid "date" msgstr "date" -#: builtin/commit.c:1584 +#: builtin/commit.c:1578 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "message" -#: builtin/commit.c:1585 +#: builtin/commit.c:1579 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1586 +#: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1587 +#: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1588 +#: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1589 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1590 +#: builtin/commit.c:1584 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1592 +#: builtin/commit.c:1586 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1593 +#: builtin/commit.c:1587 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1594 +#: builtin/commit.c:1588 msgid "default" msgstr "défaut" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1588 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1595 +#: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "id de clé" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1600 +#: builtin/commit.c:1594 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1601 +#: builtin/commit.c:1595 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1602 +#: builtin/commit.c:1596 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1603 +#: builtin/commit.c:1597 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1604 +#: builtin/commit.c:1598 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1605 +#: builtin/commit.c:1599 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1606 +#: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "éviter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1607 +#: builtin/commit.c:1601 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1618 +#: builtin/commit.c:1612 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1619 +#: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1624 +#: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1626 +#: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1655 +#: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1688 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: builtin/commit.c:1701 +#: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1732 #, 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:1743 +#: builtin/commit.c:1737 #, 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:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/commit.c:1791 +#: builtin/commit.c:1785 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4892,8 +4921,8 @@ msgstr "" "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [options]" +msgid "git config [<options>]" +msgstr "git config [<options>]" #: builtin/config.c:53 msgid "Config file location" @@ -5049,12 +5078,12 @@ msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [options] <commit ou apparenté>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<options>] <commit ou apparenté>*" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [options] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<options>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5272,180 +5301,180 @@ msgstr "Appliquer le spécificateur de référence aux références exportées" msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "récupérer depuis tous le dépôts distants" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 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:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "dir" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "mode par défaut pour la récursion" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, 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:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (impossible de mettre à jour la référence locale)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s : %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, 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:622 +#: builtin/fetch.c:623 #, 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:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5454,55 +5483,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:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, 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:837 +#: builtin/fetch.c:838 #, 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:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "Je ne sais pas récupérer depuis %s" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5510,41 +5539,41 @@ 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:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 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:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 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:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 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 " "sens" #: 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 <message>] [--log[=<n>]|--no-log] [--file <fichier>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5573,51 +5602,51 @@ msgstr "utiliser <texte> comme début de message" msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "impossible d'analyser le format" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [options] [<motif>]" +#: 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:1079 +#: 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:1081 +#: 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:1083 +#: 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:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "échapper les champs réservés pour compatibilité avec Tcl" -#: builtin/for-each-ref.c:1088 +#: 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:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "clé" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -5626,8 +5655,8 @@ msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [options] [<objet>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<options>] [<objet>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5675,8 +5704,8 @@ msgid "Checking objects" msgstr "Vérification des objets" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [options]" +msgid "git gc [<options>]" +msgstr "git gc [<options>]" #: builtin/gc.c:79 #, c-format @@ -5739,8 +5768,8 @@ msgstr "" "supprimer." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [options] [-e] <motif> [<révision>...] [[--] <chemin>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" #: builtin/grep.c:218 #, c-format @@ -5780,8 +5809,8 @@ msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "rechercher aussi dans les fichiers ignorés" +msgid "ignore files specified via '.gitignore'" +msgstr "ignorer les fichiers spécifiés via '.gitignore'" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5974,17 +6003,15 @@ msgstr "--cached et des arbres sont fournis en même temps." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." -msgstr "" -"git hash-object [-t <type>] [-w] [--path=<fichier>|--no-filters] [--stdin] " -"[--] <fichier>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." +msgstr "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] [--] <fichier>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <liste-de-chemins>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "type" @@ -6036,8 +6063,8 @@ msgid "show info page" msgstr "afficher la page info" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [commande]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]" #: builtin/help.c:64 #, c-format @@ -6246,8 +6273,8 @@ msgstr "grave incohérence dans la décompression (inflate)" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" @@ -6335,97 +6362,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -6538,10 +6565,8 @@ msgstr " partagé" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" -msgstr "" -"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" -"shared[=<permissions>]] [répertoire]" +"shared[=<permissions>]] [<directory>]" +msgstr "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--shared[=<permissions>]] [<répertoire>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6604,8 +6629,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [options] <objet>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<options>] <objet>..." #: builtin/log.c:81 #, c-format @@ -6685,8 +6710,8 @@ msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [options] [<depuis> | <plage de révisions>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6887,98 +6912,98 @@ msgstr "" msgid "Unknown commit %s" msgstr "Commit inconnu %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [options] [<fichier>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "identifier le statut de fichier avec les étiquettes" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "" "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "afficher en relatif par rapport au répertoire racine du projet" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "considérer que les chemins supprimés depuis <arbre ou apparenté> sont " "toujours présents" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "afficher les données de débogage" @@ -7021,12 +7046,12 @@ msgstr "" "full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [options] [<commit>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<options>] [<commit>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [options] <message> HEAD <commit>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<options>] <message> HEAD <commit>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7378,12 +7403,12 @@ msgstr "" "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <validation> <validation>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <commit> <commit>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <validation>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <commit>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7419,11 +7444,9 @@ 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 " -"file2" -msgstr "" -"git merge-file [options] [-L nom1 [-L orig [-L nom2]]] fichier1 orig_file " -"fichier2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> <fichier-orig> <fichier2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7454,8 +7477,8 @@ msgid "do not warn about conflicts" msgstr "ne pas avertir à propos des conflits" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "définir les labels pour fichier1/orig_file/fichier2" +msgid "set labels for file1/orig-file/file2" +msgstr "définir les labels pour fichier1/fichier-orig/fichier2" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7474,8 +7497,8 @@ msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [options] <source>... <destination>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<options>] <source>... <destination>" #: builtin/mv.c:69 #, c-format @@ -7562,22 +7585,22 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [options] <validation>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<options>] <validation>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [options] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<options>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [options] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<options>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7609,44 +7632,37 @@ msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" -msgstr "git notes [--ref <références_notes>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "git notes [--ref <références-notes>] [list [<object>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" -msgstr "" -"git notes [--ref <références_notes>] add [-f] [--allow-empty] [-m <message> " -"| -F <fichier> | (-c | -C) <objet>] [<objet>]" +msgstr "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" -msgstr "" -"git notes [--ref <références_notes>] copy [-f] <depuis-objet> <vers-objet>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" +msgstr "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" -msgstr "" -"git notes [--ref <références_notes>] append [--allow-empty] [-m <message> | -" -"F <fichier> | (-c | -C) <objet>] [<objet>]" +msgstr "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" -msgstr "git notes [--ref <références_notes>] edit [--allow-empty] [<objet>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "git notes [--ref <références_notes>] show [<objet>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <références-notes>] show [<objet>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" -msgstr "" -"git notes [--ref <références_notes>] merge [-v | -q] [-s <stratégie> ] " -"<références_notes>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" +msgstr "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] <références-notes>" #: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" @@ -7657,16 +7673,16 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" -msgstr "git notes [--ref <références_notes>] remove [<objet>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "git notes [--ref <références-notes>] remove [<objet>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" -msgstr "git notes [--ref <références_notes>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgstr "git notes [--ref <références-notes>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" -msgstr "git notes [--ref <références_notes>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "git notes [--ref <références-notes>] get-ref" #: builtin/notes.c:40 msgid "git notes [list [<object>]]" @@ -7697,8 +7713,8 @@ msgid "git notes show [<object>]" msgstr "git notes show [<objet>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" -msgstr "git notes merge [<options>] <références_notes>" +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<options>] <références-notes>" #: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" @@ -7936,8 +7952,8 @@ msgid "notes-ref" msgstr "références-notes" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" -msgstr "utiliser les notes depuis <références_notes>" +msgid "use notes from <notes-ref>" +msgstr "utiliser les notes depuis <références-notes>" #: builtin/notes.c:989 builtin/remote.c:1621 #, c-format @@ -7954,196 +7970,196 @@ msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" "git pack-objects [options...] base-name [< liste-références | < liste-objets]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, 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:2603 +#: builtin/pack-objects.c:2601 #, 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:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 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:2630 +#: builtin/pack-objects.c:2628 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:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 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:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 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:2645 +#: builtin/pack-objects.c:2643 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:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 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:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 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:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 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:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 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:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Décompte des objets" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [options]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<options>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -8154,8 +8170,8 @@ msgid "prune loose refs (default)" msgstr "éliminer les références perdues (défaut)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8450,76 +8466,80 @@ msgstr "--mirror ne peut pas être combiné avec des spécifications de référe msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "dépôt" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:498 +#: builtin/push.c:507 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:501 +#: builtin/push.c:510 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "nom de référence>:<attendu" -#: builtin/push.c:504 +#: builtin/push.c:513 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:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "demande une transaction atomique sur le serveur distant" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" @@ -8598,12 +8618,12 @@ msgstr "sauter l'application du filtre d'extraction creuse" msgid "debug unpack-trees" msgstr "déboguer unpack-trees" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "%s' pour '%s' n'est pas un horodatage valide" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" @@ -8614,11 +8634,9 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" -msgstr "" -"git remote add [-t <branche>] [-m <maîtresse>] [-f] [--tags|--no-tags] [--" -"mirror=<fetch|push>] <nom> <URL>" +msgstr "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <nom> <url>" #: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" @@ -8628,9 +8646,9 @@ msgstr "git remote rename <ancienne> <nouvelle>" msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: 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: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:17 msgid "git remote [-v | --verbose] show [-n] <name>" @@ -8667,10 +8685,6 @@ msgstr "git remote set-url --delete <nom> <URL>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: 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:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." @@ -9114,8 +9128,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [options]" +msgid "git repack [<options>]" +msgstr "git repack [<options>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -9182,7 +9196,7 @@ msgstr "taille maximum de chaque fichier paquet" msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "la suppression de '%s' a échoué" @@ -9274,8 +9288,8 @@ 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]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <chemin>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9417,8 +9431,8 @@ msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [options] -- [<arguments>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9434,30 +9448,29 @@ msgstr "sortie en forme longue fixée" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [options] -- [<arguments>...]\n" +"git rev-parse --parseopt [<options>] -- [<arguments>...]\n" " ou : git rev-parse --sq-quote [<argument>...]\n" " ou : git rev-parse [options] [<argument>...]\n" "\n" -"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur " -"l'utilisation principale." +"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur l'utilisation principale." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [options] <commit ou apparenté>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<options>] <commit ou apparenté>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <sous-commande>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [options] <commit ou apparenté>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<options>] <commit ou apparenté>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9537,8 +9550,8 @@ msgid "cherry-pick failed" msgstr "le picorage a échoué" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [options] [--] <fichier>..." +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<options>] [--] <fichier>..." #: builtin/rm.c:65 msgid "" @@ -9642,8 +9655,8 @@ msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" -msgstr "git shortlog [<options>] [<intervalle révisions>] [[--] [<chemin>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]" #: builtin/shortlog.c:131 #, c-format @@ -9674,19 +9687,19 @@ msgstr "Couper les lignes" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r|--remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<référence>]" +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:652 msgid "show remote-tracking and local branches" @@ -9756,11 +9769,9 @@ msgstr "" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " -msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [motif*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9804,12 +9815,12 @@ msgstr "" "local" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [options] nom [référence]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<options>] nom [<référence>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] nom" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <nom>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9834,10 +9845,9 @@ msgstr "raison de la mise à jour" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" -msgstr "" -"git tag [-a|-s|-u <id-clé>] [-f] [-m <message>|-F <file>] <nométiquette> " +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" +msgstr "git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-étiquette> [<head>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -9845,10 +9855,10 @@ msgstr "git tag -d <nométiquette>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>]\n" "\t\t[<motif>...]" #: builtin/tag.c:26 @@ -9992,18 +10002,18 @@ msgstr "utiliser une autre clé pour signer l'étiquette" msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Options d'affichage des étiquettes" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "trier les étiquettes" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Options d'affichage des étiquettes" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" @@ -10060,8 +10070,8 @@ msgid "Unpacking objects" msgstr "Dépaquetage des objets" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [options] [--] [<fichier>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<options>] [--] [<fichier>...]" #: builtin/update-index.c:756 msgid "continue refresh even when index needs update" @@ -10180,18 +10190,16 @@ msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [options] -d <nomréférence> [<anciennevaleur>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "" -"git update-ref [options] <nomréférence> <nouvellevaleur> " -"[<anciennevaleur>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-valeur>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [options] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<options>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -10218,16 +10226,16 @@ msgid "update the info files from scratch" msgstr "mettre à jour les fichiers d'information à partir de zéro" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <commit>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <commit>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "afficher le contenu du commit" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -10238,8 +10246,8 @@ msgid "show statistics only" msgstr "afficher seulement les statistiques" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <étiquette>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <étiquette>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10600,10 +10608,8 @@ msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." -msgstr "" -"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset " -"<branchevalide>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." +msgstr "L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-valide>'." #: git-bisect.sh:140 msgid "won't bisect on cg-seek'ed tree" @@ -11381,6 +11387,18 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" +#~ msgid "(detached from %s)" +#~ msgstr "(détaché de %s)" + +#~ msgid "No existing author found with '%s'" +#~ msgstr "Aucun auteur existant trouvé avec '%s'" + +#~ msgid "search also in ignored files" +#~ msgstr "rechercher aussi dans les fichiers ignorés" + +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#~ msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)" + #~ msgid "no files added" #~ msgstr "aucun fichier ajouté" diff --git a/po/git.pot b/po/git.pot index 91fa5a1be6..0d828a7d43 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" +"POT-Creation-Date: 2015-03-27 13:33+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,7 +30,7 @@ msgid "" msgstr "" #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" #: archive.c:12 @@ -39,7 +39,7 @@ msgstr "" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" #: archive.c:14 @@ -67,10 +67,10 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "" @@ -119,7 +119,7 @@ msgstr "" msgid "path to the remote git-upload-archive command" msgstr "" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -236,7 +236,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:764 #, c-format msgid "could not open '%s'" msgstr "" @@ -245,8 +245,8 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -287,21 +287,21 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "" @@ -324,55 +324,55 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "" @@ -464,7 +464,7 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "" @@ -490,23 +490,23 @@ msgid "" "%s" msgstr "" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" @@ -984,14 +984,14 @@ msgstr "" msgid "done" msgstr "" -#: read-cache.c:1267 +#: read-cache.c:1273 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1277 +#: read-cache.c:1283 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1069,23 +1069,31 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "" +#: send-pack.c:366 +msgid "server does not support --atomic push" +msgstr "" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1111,7 +1119,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "" @@ -1147,184 +1155,184 @@ msgstr "" msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "" -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4286 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "" @@ -1383,38 +1391,38 @@ msgstr "" msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "" @@ -1451,26 +1459,26 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "" @@ -1499,11 +1507,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "" @@ -1611,193 +1619,193 @@ msgstr "" msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "" -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "" -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1805,74 +1813,74 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "" -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "" @@ -1882,7 +1890,7 @@ msgid "failed to unlink '%s'" msgstr "" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." +msgid "git add [<options>] [--] <pathspec>..." msgstr "" #: builtin/add.c:65 @@ -1934,14 +1942,14 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "" @@ -2017,75 +2025,75 @@ msgstr "" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" msgstr "" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2096,394 +2104,413 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2872 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2884 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2890 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2909 +#: builtin/apply.c:2933 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:3010 +#: builtin/apply.c:3034 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:3016 +#: builtin/apply.c:3040 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:3037 +#: builtin/apply.c:3061 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3161 +#: builtin/apply.c:3185 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3238 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "" + +#: builtin/apply.c:3266 builtin/apply.c:3488 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3347 builtin/apply.c:3502 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3356 builtin/apply.c:3510 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3432 +#: builtin/apply.c:3458 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3501 +#: builtin/apply.c:3527 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3503 +#: builtin/apply.c:3529 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3604 +#: builtin/apply.c:3688 builtin/apply.c:3690 +#, c-format +msgid "invalid path '%s'" +msgstr "" + +#: builtin/apply.c:3745 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3607 +#: builtin/apply.c:3748 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3627 +#: builtin/apply.c:3768 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3632 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3640 +#: builtin/apply.c:3793 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "" + +#: builtin/apply.c:3797 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3653 +#: builtin/apply.c:3811 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3889 +#: builtin/apply.c:4047 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3918 +#: builtin/apply.c:4076 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:3922 +#: builtin/apply.c:4080 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3927 +#: builtin/apply.c:4085 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4088 builtin/apply.c:4196 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3963 +#: builtin/apply.c:4121 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:4012 +#: builtin/apply.c:4170 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4099 +#: builtin/apply.c:4257 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4107 +#: builtin/apply.c:4265 msgid "internal error" msgstr "" -#: builtin/apply.c:4110 +#: builtin/apply.c:4268 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4120 +#: builtin/apply.c:4278 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4141 +#: builtin/apply.c:4299 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4144 +#: builtin/apply.c:4302 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4234 +#: builtin/apply.c:4392 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4245 +#: builtin/apply.c:4403 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "" -#: builtin/apply.c:4363 +#: builtin/apply.c:4521 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4366 +#: builtin/apply.c:4524 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4368 +#: builtin/apply.c:4526 msgid "num" msgstr "" -#: builtin/apply.c:4369 +#: builtin/apply.c:4527 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4372 +#: builtin/apply.c:4530 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4374 +#: builtin/apply.c:4532 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4378 +#: builtin/apply.c:4536 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4380 +#: builtin/apply.c:4538 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4382 +#: builtin/apply.c:4540 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4384 +#: builtin/apply.c:4542 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4386 +#: builtin/apply.c:4544 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4388 +#: builtin/apply.c:4546 +msgid "accept a patch that touches outside the working area" +msgstr "" + +#: builtin/apply.c:4548 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4390 +#: builtin/apply.c:4550 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4392 +#: builtin/apply.c:4552 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4397 +#: builtin/apply.c:4557 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4398 +#: builtin/apply.c:4558 msgid "action" msgstr "" -#: builtin/apply.c:4399 +#: builtin/apply.c:4559 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4562 builtin/apply.c:4565 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4408 +#: builtin/apply.c:4568 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4410 +#: builtin/apply.c:4570 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4412 +#: builtin/apply.c:4572 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4414 +#: builtin/apply.c:4574 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4417 +#: builtin/apply.c:4577 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4420 +#: builtin/apply.c:4580 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4422 +#: builtin/apply.c:4582 msgid "root" msgstr "" -#: builtin/apply.c:4423 +#: builtin/apply.c:4583 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4445 +#: builtin/apply.c:4605 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4453 +#: builtin/apply.c:4613 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4456 +#: builtin/apply.c:4616 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4472 +#: builtin/apply.c:4635 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4486 +#: builtin/apply.c:4649 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4655 builtin/apply.c:4665 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2538,102 +2565,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" msgstr "" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -2643,24 +2670,24 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" #: builtin/branch.c:152 @@ -2795,239 +2822,244 @@ msgstr "" msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" +msgid "(HEAD detached at %s)" msgstr "" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3035,12 +3067,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -3058,52 +3090,52 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:328 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" msgstr "" -#: builtin/cat-file.c:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" msgstr "" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "" #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "" #: builtin/check-attr.c:19 @@ -3159,7 +3191,7 @@ msgid "--non-matching is only valid with --verbose" msgstr "" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." +msgid "git check-mailmap [<options>] <contact>..." msgstr "" #: builtin/check-mailmap.c:13 @@ -3176,7 +3208,7 @@ msgid "no contacts specified" msgstr "" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" #: builtin/checkout-index.c:188 @@ -3220,11 +3252,11 @@ msgid "copy out the files from named stage" msgstr "" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" +msgid "git checkout [<options>] <branch>" msgstr "" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" #: builtin/checkout.c:132 builtin/checkout.c:165 @@ -3346,7 +3378,7 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" @@ -3463,7 +3495,7 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" +msgid "second guess 'git checkout <no-such-branch>'" msgstr "" #: builtin/checkout.c:1153 @@ -3569,16 +3601,17 @@ msgstr "" msgid "Select items to delete" msgstr "" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " +msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "" -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3589,79 +3622,79 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "" @@ -3721,7 +3754,7 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "" @@ -3862,7 +3895,7 @@ msgstr "" msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "" @@ -3877,58 +3910,58 @@ msgstr "" msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." +msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "" #: builtin/column.c:9 -msgid "git column [options]" +msgid "git column [<options>]" msgstr "" #: builtin/column.c:26 @@ -3960,11 +3993,11 @@ msgid "--command must be the first argument" msgstr "" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." +msgid "git commit [<options>] [--] <pathspec>..." msgstr "" #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." +msgid "git status [<options>] [--] <pathspec>..." msgstr "" #: builtin/commit.c:47 @@ -4070,68 +4103,68 @@ msgstr "" msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:584 +#: builtin/commit.c:578 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:586 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:605 +#: builtin/commit.c:599 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:613 +#: builtin/commit.c:607 #, c-format msgid "invalid date format: %s" msgstr "" -#: builtin/commit.c:657 +#: builtin/commit.c:651 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:700 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:702 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:712 +#: builtin/commit.c:706 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:734 +#: builtin/commit.c:728 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:738 +#: builtin/commit.c:732 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:742 +#: builtin/commit.c:736 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:789 +#: builtin/commit.c:783 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:807 +#: builtin/commit.c:801 #, c-format msgid "" "\n" @@ -4141,7 +4174,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:812 +#: builtin/commit.c:806 #, c-format msgid "" "\n" @@ -4151,14 +4184,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:825 +#: builtin/commit.c:819 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:832 +#: builtin/commit.c:826 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4166,348 +4199,348 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:852 +#: builtin/commit.c:846 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:860 +#: builtin/commit.c:854 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:867 +#: builtin/commit.c:861 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:885 +#: builtin/commit.c:879 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:942 +#: builtin/commit.c:936 msgid "Error building trees" msgstr "" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:951 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1059 +#: builtin/commit.c:1053 #, c-format -msgid "No existing author found with '%s'" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1068 builtin/commit.c:1308 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1111 +#: builtin/commit.c:1105 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1141 +#: builtin/commit.c:1135 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1150 +#: builtin/commit.c:1144 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1153 +#: builtin/commit.c:1147 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1155 +#: builtin/commit.c:1149 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1152 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1168 +#: builtin/commit.c:1162 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1164 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1178 +#: builtin/commit.c:1172 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1195 +#: builtin/commit.c:1189 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1197 +#: builtin/commit.c:1191 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1199 +#: builtin/commit.c:1193 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1201 +#: builtin/commit.c:1195 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1207 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1218 +#: builtin/commit.c:1212 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1322 builtin/commit.c:1602 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show branch information" msgstr "" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1329 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1332 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1335 builtin/commit.c:1614 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1344 +#: builtin/commit.c:1338 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1339 parse-options.h:153 msgid "when" msgstr "" -#: builtin/commit.c:1346 +#: builtin/commit.c:1340 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1348 +#: builtin/commit.c:1342 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1435 +#: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1437 +#: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1482 +#: builtin/commit.c:1476 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1485 +#: builtin/commit.c:1479 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1575 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1576 builtin/tag.c:601 msgid "read message from file" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "author" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1578 builtin/gc.c:275 msgid "date" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1578 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1579 msgid "commit message" msgstr "" -#: builtin/commit.c:1586 +#: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1584 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1586 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1593 +#: builtin/commit.c:1587 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1594 +#: builtin/commit.c:1588 msgid "default" msgstr "" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1588 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1595 +#: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1594 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1595 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1596 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1597 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1598 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1605 +#: builtin/commit.c:1599 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1606 +#: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1607 +#: builtin/commit.c:1601 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1618 +#: builtin/commit.c:1612 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1626 +#: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1655 +#: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1688 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1701 +#: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1708 +#: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1727 +#: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1738 +#: builtin/commit.c:1732 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1743 +#: builtin/commit.c:1737 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1791 +#: builtin/commit.c:1785 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4515,7 +4548,7 @@ msgid "" msgstr "" #: builtin/config.c:8 -msgid "git config [options]" +msgid "git config [<options>]" msgstr "" #: builtin/config.c:53 @@ -4666,11 +4699,11 @@ msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" +msgid "git describe [<options>] [<commit-ish>...]" msgstr "" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" +msgid "git describe [<options>] --dirty" msgstr "" #: builtin/describe.c:217 @@ -4880,268 +4913,269 @@ msgstr "" msgid "anonymize output" msgstr "" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 @@ -5171,51 +5205,51 @@ msgstr "" msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "" @@ -5224,7 +5258,7 @@ msgid "Checking object directories" msgstr "" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" +msgid "git fsck [<options>] [<object>...]" msgstr "" #: builtin/fsck.c:609 @@ -5272,7 +5306,7 @@ msgid "Checking objects" msgstr "" #: builtin/gc.c:24 -msgid "git gc [options]" +msgid "git gc [<options>]" msgstr "" #: builtin/gc.c:79 @@ -5328,7 +5362,7 @@ msgid "" msgstr "" #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" #: builtin/grep.c:218 @@ -5369,7 +5403,7 @@ msgid "search in both tracked and untracked files" msgstr "" #: builtin/grep.c:644 -msgid "search also in ignored files" +msgid "ignore files specified via '.gitignore'" msgstr "" #: builtin/grep.c:647 @@ -5554,15 +5588,15 @@ msgstr "" #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "" @@ -5612,7 +5646,7 @@ msgid "show info page" msgstr "" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "" #: builtin/help.c:64 @@ -5817,8 +5851,8 @@ msgstr "" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "" @@ -5905,97 +5939,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "" @@ -6107,7 +6141,7 @@ msgstr "" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" #: builtin/init-db.c:498 @@ -6167,7 +6201,7 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "" #: builtin/log.c:42 -msgid "git show [options] <object>..." +msgid "git show [<options>] <object>..." msgstr "" #: builtin/log.c:81 @@ -6246,7 +6280,7 @@ msgid "insane in-reply-to: %s" msgstr "" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" #: builtin/log.c:1071 @@ -6443,95 +6477,95 @@ msgstr "" msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "" @@ -6572,11 +6606,11 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" +msgid "git merge [<options>] [<commit>...]" msgstr "" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" +msgid "git merge [<options>] <msg> HEAD <commit>" msgstr "" #: builtin/merge.c:47 @@ -6908,11 +6942,11 @@ msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "" #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "" #: builtin/merge-base.c:31 @@ -6949,8 +6983,8 @@ msgstr "" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" #: builtin/merge-file.c:33 @@ -6982,7 +7016,7 @@ msgid "do not warn about conflicts" msgstr "" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" +msgid "set labels for file1/orig-file/file2" msgstr "" #: builtin/mktree.c:64 @@ -7002,7 +7036,7 @@ msgid "allow creation of more than one tree" msgstr "" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" +msgid "git mv [<options>] <source>... <destination>" msgstr "" #: builtin/mv.c:69 @@ -7088,21 +7122,21 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." +msgid "git name-rev [<options>] <commit>..." msgstr "" #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" +msgid "git name-rev [<options>] --all" msgstr "" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" +msgid "git name-rev [<options>] --stdin" msgstr "" #: builtin/name-rev.c:309 @@ -7134,36 +7168,36 @@ msgid "dereference tags in the input (internal use)" msgstr "" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" #: builtin/notes.c:31 @@ -7175,15 +7209,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "" #: builtin/notes.c:40 @@ -7215,7 +7249,7 @@ msgid "git notes show [<object>]" msgstr "" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "" #: builtin/notes.c:72 @@ -7444,7 +7478,7 @@ msgid "notes-ref" msgstr "" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" +msgid "use notes from <notes-ref>" msgstr "" #: builtin/notes.c:989 builtin/remote.c:1621 @@ -7460,185 +7494,185 @@ msgstr "" msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" +msgid "git pack-refs [<options>]" msgstr "" #: builtin/pack-refs.c:14 @@ -7650,7 +7684,7 @@ msgid "prune loose refs (default)" msgstr "" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "" #: builtin/prune-packed.c:40 @@ -7852,75 +7886,79 @@ msgstr "" msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -7995,12 +8033,12 @@ msgstr "" msgid "debug unpack-trees" msgstr "" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" @@ -8011,7 +8049,7 @@ msgstr "" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" @@ -8023,8 +8061,8 @@ msgstr "" msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" #: builtin/remote.c:17 @@ -8060,10 +8098,6 @@ msgstr "" msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "" @@ -8487,7 +8521,7 @@ msgid "be verbose; must be placed before a subcommand" msgstr "" #: builtin/repack.c:17 -msgid "git repack [options]" +msgid "git repack [<options>]" msgstr "" #: builtin/repack.c:159 @@ -8554,7 +8588,7 @@ msgstr "" msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "" @@ -8644,7 +8678,7 @@ msgid "use this format" msgstr "" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" #: builtin/rerere.c:57 @@ -8782,7 +8816,7 @@ msgid "Could not write new index file." msgstr "" #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" #: builtin/rev-parse.c:366 @@ -8799,15 +8833,15 @@ msgstr "" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." +msgid "git revert [<options>] <commit-ish>..." msgstr "" #: builtin/revert.c:23 @@ -8815,7 +8849,7 @@ msgid "git revert <subcommand>" msgstr "" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." +msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "" #: builtin/revert.c:29 @@ -8896,7 +8930,7 @@ msgid "cherry-pick failed" msgstr "" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." +msgid "git rm [<options>] [--] <file>..." msgstr "" #: builtin/rm.c:65 @@ -8984,7 +9018,7 @@ msgid "git rm: unable to remove %s" msgstr "" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "" #: builtin/shortlog.c:131 @@ -9014,14 +9048,14 @@ msgstr "" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" #: builtin/show-branch.c:652 @@ -9090,8 +9124,8 @@ msgstr "" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" #: builtin/show-ref.c:11 @@ -9131,11 +9165,11 @@ msgid "show refs from stdin that aren't in local repository" msgstr "" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" +msgid "git symbolic-ref -d [-q] <name>" msgstr "" #: builtin/symbolic-ref.c:40 @@ -9160,7 +9194,8 @@ msgstr "" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" #: builtin/tag.c:23 @@ -9169,7 +9204,7 @@ msgstr "" #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" @@ -9305,16 +9340,16 @@ msgstr "" msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:608 -msgid "show tag list in columns" +#: builtin/tag.c:609 +msgid "Tag listing options" msgstr "" #: builtin/tag.c:610 -msgid "sort tags" +msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:614 -msgid "Tag listing options" +#: builtin/tag.c:612 +msgid "sort tags" msgstr "" #: builtin/tag.c:617 builtin/tag.c:623 @@ -9373,7 +9408,7 @@ msgid "Unpacking objects" msgstr "" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" +msgid "git update-index [<options>] [--] [<file>...]" msgstr "" #: builtin/update-index.c:756 @@ -9489,15 +9524,15 @@ msgid "enable or disable split index" msgstr "" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" msgstr "" #: builtin/update-ref.c:359 @@ -9525,7 +9560,7 @@ msgid "update the info files from scratch" msgstr "" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." +msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "" #: builtin/verify-commit.c:75 @@ -9533,7 +9568,7 @@ msgid "print commit contents" msgstr "" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "" #: builtin/verify-pack.c:64 @@ -9545,7 +9580,7 @@ msgid "show statistics only" msgstr "" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." +msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "" #: builtin/verify-tag.c:73 @@ -9868,7 +9903,7 @@ msgstr "" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" #: git-bisect.sh:140 diff --git a/po/ru.po b/po/ru.po new file mode 100644 index 0000000000..cbd5c9ceff --- /dev/null +++ b/po/ru.po @@ -0,0 +1,10633 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2015 +# insolor <insolor@gmail.com>, 2014 +# insolor <insolor@gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: Перевод Git на русский язык\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2015-03-27 13:33+0800\n" +"PO-Revision-Date: 2015-03-27 10:52+0000\n" +"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" +"Language-Team: Russian (http://www.transifex.com/projects/p/git-po-ru/language/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: advice.c:55 +#, c-format +msgid "hint: %.*s\n" +msgstr "подсказка: %.*s\n" + +#: advice.c:88 +msgid "" +"Fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution and make a commit." +msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит." + +#: archive.c:11 +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]" + +#: archive.c:12 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:13 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> " +"[<path>...]" +msgstr "git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]" + +#: archive.c:14 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <репозиторий> [--exec <команда>] --list" + +#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "спецификация пути «%s» не соответствует ни одному файлу" + +#: archive.c:427 +msgid "fmt" +msgstr "формат" + +#: archive.c:427 +msgid "archive format" +msgstr "формат архива" + +#: archive.c:428 builtin/log.c:1204 +msgid "prefix" +msgstr "префикс" + +#: archive.c:429 +msgid "prepend prefix to each pathname in the archive" +msgstr "добавлять префикс перед каждым путем файла в архиве" + +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +msgid "file" +msgstr "файл" + +#: archive.c:431 builtin/archive.c:89 +msgid "write the archive to this file" +msgstr "запись архива в этот файл" + +#: archive.c:433 +msgid "read .gitattributes in working directory" +msgstr "читать .gitattributes в рабочем каталоге" + +#: archive.c:434 +msgid "report archived files on stderr" +msgstr "отчет об архивированных файлах в stderr" + +#: archive.c:435 +msgid "store only" +msgstr "только хранение" + +#: archive.c:436 +msgid "compress faster" +msgstr "сжимать быстрее" + +#: archive.c:444 +msgid "compress better" +msgstr "сжимать лучше" + +#: archive.c:447 +msgid "list supported archive formats" +msgstr "перечислить поддерживаемые форматы архивов" + +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +msgid "repo" +msgstr "репозиторий" + +#: archive.c:450 builtin/archive.c:91 +msgid "retrieve the archive from remote repository <repo>" +msgstr "получить архив из внешнего <репозитория>" + +#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 +msgid "command" +msgstr "комманда" + +#: archive.c:452 builtin/archive.c:93 +msgid "path to the remote git-upload-archive command" +msgstr "путь к команде git-upload-archive на машине с внешним репозиторием" + +#: attr.c:264 +msgid "" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»." + +#: branch.c:60 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "Не устанавливаю ветку %s, так так она принадлежит вышестоящему репозиторию." + +#: branch.c:83 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgstr "Ветка %s отслеживает внешнюю ветку %s из %s перемещением." + +#: branch.c:84 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s." +msgstr "Ветка %s отслеживает внешнюю ветку %s из %s." + +#: branch.c:88 +#, c-format +msgid "Branch %s set up to track local branch %s by rebasing." +msgstr "Ветка %s отслеживает локальную ветку %s перемещением." + +#: branch.c:89 +#, c-format +msgid "Branch %s set up to track local branch %s." +msgstr "Ветка %s отслеживает локальную ветку %s." + +#: branch.c:94 +#, c-format +msgid "Branch %s set up to track remote ref %s by rebasing." +msgstr "Ветка %s отслеживает внешнюю ссылку %s перемещением." + +#: branch.c:95 +#, c-format +msgid "Branch %s set up to track remote ref %s." +msgstr "Ветка %s отслеживает внешнюю ссылку %s." + +#: branch.c:99 +#, c-format +msgid "Branch %s set up to track local ref %s by rebasing." +msgstr "Ветка %s отслеживает локальную ссылку %s перемещением." + +#: branch.c:100 +#, c-format +msgid "Branch %s set up to track local ref %s." +msgstr "Ветка %s отслеживает локальную ссылку %s." + +#: branch.c:133 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "Не отслеживается: неоднозначная информация для ссылки %s" + +#: branch.c:162 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "«%s» не является действительным именем ветки." + +#: branch.c:167 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "Ветка с именем «%s» уже существует." + +#: branch.c:175 +msgid "Cannot force update the current branch." +msgstr "Не удалось принудительно обновить текущую ветку." + +#: branch.c:195 +#, c-format +msgid "" +"Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой." + +#: branch.c:197 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует" + +#: branch.c:199 +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 "\nЕсли вы планируете основывать свою работу на вышестоящей ветке, которая уже существует во внешнем репозитории, вам может потребоваться запустить «git fetch» для ее получения.\n\nЕсли вы планируете отправить новую локальную ветку, которая будет отслеживаться, во внешний репозиторий, вам может потребоваться запустить «git push -u» — чтобы сохранить настройку вышестоящего репозитория для отправки." + +#: branch.c:243 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "Недопустимое имя объекта: «%s»." + +#: branch.c:263 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "Неоднозначное имя объекта: «%s»." + +#: branch.c:268 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "Недопустимая точка ветки: «%s»." + +#: bundle.c:34 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "«%s» не похож на файл пакета версии 2" + +#: bundle.c:61 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "неопознанный заголовок: %s%s (%d)" + +#: bundle.c:87 builtin/commit.c:764 +#, c-format +msgid "could not open '%s'" +msgstr "не удалось открыть «%s»" + +#: bundle.c:139 +msgid "Repository lacks these prerequisite commits:" +msgstr "В репозитории отсутствуют необходимые коммиты:" + +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/shortlog.c:158 +msgid "revision walk setup failed" +msgstr "сбой инициализации прохода по редакциям" + +#: bundle.c:185 +#, c-format +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %d refs:" +msgstr[0] "Пакет содержит эту %d ссылку:" +msgstr[1] "Пакет содержит эти %d ссылки:" +msgstr[2] "Пакет содержит эти %d ссылок:" + +#: bundle.c:192 +msgid "The bundle records a complete history." +msgstr "Пакет содержит полную историю." + +#: bundle.c:194 +#, c-format +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %d refs:" +msgstr[0] "Пакет требует эту %d ссылку:" +msgstr[1] "Пакет требует эти %d ссылки:" +msgstr[2] "Пакет требует эти %d ссылок:" + +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "Не удалось создать объекты пакета" + +#: bundle.c:269 +msgid "pack-objects died" +msgstr "критическая ошибка pack-objects" + +#: bundle.c:309 +msgid "rev-list died" +msgstr "критическая ошибка rev-list" + +#: bundle.c:358 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "ссылка «%s» исключена в соответствии с опциями rev-list" + +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "неопознанный аргумент: %s" + +#: bundle.c:443 +msgid "Refusing to create empty bundle." +msgstr "Отклонение создания пустого пакета." + +#: bundle.c:453 +#, c-format +msgid "cannot create '%s'" +msgstr "не удалось создать «%s»" + +#: bundle.c:474 +msgid "index-pack died" +msgstr "критическая ошибка index-pack" + +#: color.c:260 +#, c-format +msgid "invalid color value: %.*s" +msgstr "недопустимое значение цвета: %.*s" + +#: commit.c:40 +#, c-format +msgid "could not parse %s" +msgstr "не удалось разобрать %s" + +#: commit.c:42 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s не является коммитом!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "память исчерпана" + +#: config.c:474 config.c:476 +#, c-format +msgid "bad config file line %d in %s" +msgstr "ошибка в %d строке файла конфигурации в %s" + +#: config.c:592 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "неправильное числовое значение «%s» для «%s» в %s: %s" + +#: config.c:594 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "неправильное числовое значение «%s» для «%s»: %s" + +#: config.c:679 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "сбой разворачивания пути каталога пользователя: «%s»" + +#: config.c:757 config.c:768 +#, c-format +msgid "bad zlib compression level %d" +msgstr "неправильный уровень сжатия zlib %d" + +#: config.c:890 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "недопустимый режим создания объекта: %s" + +#: config.c:1216 +msgid "unable to parse command-line config" +msgstr "не удалось разобрать конфигурацию из командной строки" + +#: config.c:1277 +msgid "unknown error occured while reading the configuration files" +msgstr "произошла неизвестная ошибка при чтении файлов конфигурации" + +#: config.c:1601 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "не удалось разобрать «%s» в конфигурации из командной строки" + +#: config.c:1603 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d" + +#: config.c:1662 +#, c-format +msgid "%s has multiple values" +msgstr "%s имеет несколько значений" + +#: connected.c:69 +msgid "Could not run 'git rev-list'" +msgstr "Не удалось запустить «git rev-list»" + +#: connected.c:89 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "сбой записи в rev-list: %s" + +#: connected.c:97 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "сбой закрытия стандартного ввода у rev-list: %s" + +#: date.c:95 +msgid "in the future" +msgstr "в будущем" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "%lu секунду назад" +msgstr[1] "%lu секунды назад" +msgstr[2] "%lu секунд назад" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "%lu минуту назад" +msgstr[1] "%lu минуты назад" +msgstr[2] "%lu минут назад" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "%lu час назад" +msgstr[1] "%lu часа назад" +msgstr[2] "%lu часов назад" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "%lu день назад" +msgstr[1] "%lu дня назад" +msgstr[2] "%lu дней назад" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "%lu неделю назад" +msgstr[1] "%lu недели назад" +msgstr[2] "%lu недель назад" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "%lu месяц назад" +msgstr[1] "%lu месяца назад" +msgstr[2] "%lu месяцев назад" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu год" +msgstr[1] "%lu года" +msgstr[2] "%lu лет" + +#. TRANSLATORS: "%s" is "<n> years" +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s и %lu месяц назад" +msgstr[1] "%s и %lu месяца назад" +msgstr[2] "%s и %lu месяцев назад" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "%lu год назад" +msgstr[1] "%lu года назад" +msgstr[2] "%lu лет назад" + +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "сбой чтения orderfile «%s»" + +#: diffcore-rename.c:536 +msgid "Performing inexact rename detection" +msgstr "Выполняется неточное определение переименования" + +#: diff.c:114 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n" + +#: diff.c:119 +#, c-format +msgid " Unknown dirstat parameter '%s'\n" +msgstr "Неизвестный параметр dirstat: «%s»\n" + +#: diff.c:214 +#, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»" + +#: diff.c:266 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s" + +#: diff.c:2956 +#, c-format +msgid "external diff died, stopping at %s" +msgstr "критическая ошибка при внешнем сравнении, останов на %s" + +#: diff.c:3351 +msgid "--follow requires exactly one pathspec" +msgstr "--follow требует ровно одной спецификации пути" + +#: diff.c:3514 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s" + +#: diff.c:3528 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "Сбой разбора параметра опции --submodule: «%s»" + +#: gpg-interface.c:129 gpg-interface.c:200 +msgid "could not run gpg." +msgstr "не удалось запустить gpg." + +#: gpg-interface.c:141 +msgid "gpg did not accept the data" +msgstr "gpg не принял данные" + +#: gpg-interface.c:152 +msgid "gpg failed to sign the data" +msgstr "gpg не удалось подписать данные" + +#: gpg-interface.c:185 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "не удалось создать временный файл «%s»: %s" + +#: gpg-interface.c:188 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "сбой записи отсоединенной подписи в «%s»: %s" + +#: grep.c:1718 +#, c-format +msgid "'%s': unable to read %s" +msgstr "«%s»: не удалось прочесть %s" + +#: grep.c:1735 +#, c-format +msgid "'%s': %s" +msgstr "«%s»: %s" + +#: grep.c:1746 +#, c-format +msgid "'%s': short read %s" +msgstr "«%s»: слишком мало данных прочитано %s" + +#: help.c:207 +#, c-format +msgid "available git commands in '%s'" +msgstr "доступные команды git в «%s»" + +#: help.c:214 +msgid "git commands available from elsewhere on your $PATH" +msgstr "команды git, доступные в других местах вашего $PATH" + +#: help.c:230 +msgid "The most commonly used git commands are:" +msgstr "Самые часто используемые команды git:" + +#: help.c:289 +#, 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, но нам не удалось ее запустить. Возможно, git-%s не работает?" + +#: help.c:346 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще." + +#: help.c:368 +#, 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:373 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "через %0.1f секунд автоматически…" + +#: help.c:380 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: «%s» не является командой git. Смотрите «git --help»." + +#: help.c:384 help.c:444 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "\nВозможно, вы имели в виду это?" +msgstr[1] "\nВозможно, вы имели в виду что-то из этого?" +msgstr[2] "\nВозможно, вы имели в виду что-то из этого?" + +#: help.c:440 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s — %s" + +#: lockfile.c:283 +msgid "BUG: reopen a lockfile that is still open" +msgstr "БАГ: повторное открытие файла блокировки, который уже открыт" + +#: lockfile.c:285 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "БАГ: повторное открытие файла блокировки, который уже был закоммичен" + +#: merge.c:41 +msgid "failed to read the cache" +msgstr "сбой чтения кэша" + +#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 +#: builtin/clone.c:662 +msgid "unable to write new index file" +msgstr "не удалось записать новый файл индекса" + +#: merge-recursive.c:189 +#, c-format +msgid "(bad commit)\n" +msgstr "(плохой коммит)\n" + +#: merge-recursive.c:209 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "сбой addinfo_cache для пути «%s»" + +#: merge-recursive.c:270 +msgid "error building trees" +msgstr "ошибка при построении деревьев" + +#: merge-recursive.c:688 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "не удалось создать путь «%s»%s" + +#: merge-recursive.c:699 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "Удаление %s, чтобы освободить место для подкаталогов\n" + +#: merge-recursive.c:713 merge-recursive.c:734 +msgid ": perhaps a D/F conflict?" +msgstr ": возможно, конфликт каталогов/файлов?" + +#: merge-recursive.c:724 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "отказ потери неотслеживаемого файла в «%s»" + +#: merge-recursive.c:764 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "невозможно прочитать объект %s «%s»" + +#: merge-recursive.c:766 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "ожидается двоичный объект для %s «%s»" + +#: merge-recursive.c:789 builtin/clone.c:321 +#, c-format +msgid "failed to open '%s'" +msgstr "не удалось открыть «%s»" + +#: merge-recursive.c:797 +#, c-format +msgid "failed to symlink '%s'" +msgstr "не удалось создать символьную ссылку «%s»" + +#: merge-recursive.c:800 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "не понятно, что делать с %06o %s «%s»" + +#: merge-recursive.c:938 +msgid "Failed to execute internal merge" +msgstr "Не удалось запустить внутреннее слияние" + +#: merge-recursive.c:942 +#, c-format +msgid "Unable to add %s to database" +msgstr "Не удалось добавить %s в базу данных" + +#: merge-recursive.c:958 +msgid "unsupported object type in the tree" +msgstr "объект неподдерживаемого типа в дереве" + +#: merge-recursive.c:1033 merge-recursive.c:1047 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве." + +#: merge-recursive.c:1039 merge-recursive.c:1052 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s." + +#: merge-recursive.c:1093 +msgid "rename" +msgstr "переименование" + +#: merge-recursive.c:1093 +msgid "renamed" +msgstr "переименовано" + +#: merge-recursive.c:1149 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s — это каталог в %s, добавляем как %s вместо этого" + +#: merge-recursive.c:1171 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +"\"%s\"->\"%s\" in \"%s\"%s" +msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s" + +#: merge-recursive.c:1176 +msgid " (left unresolved)" +msgstr " (оставлено неразрешенным)" + +#: merge-recursive.c:1230 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»" + +#: merge-recursive.c:1260 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "Переименовываю %s в %s и %s в %s вместо этого" + +#: merge-recursive.c:1459 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»" + +#: merge-recursive.c:1469 +#, c-format +msgid "Adding merged %s" +msgstr "Добавление слитого %s" + +#: merge-recursive.c:1474 merge-recursive.c:1672 +#, c-format +msgid "Adding as %s instead" +msgstr "Добавление вместо этого как %s" + +#: merge-recursive.c:1525 +#, c-format +msgid "cannot read object %s" +msgstr "невозможно прочитать объект «%s»" + +#: merge-recursive.c:1528 +#, c-format +msgid "object %s is not a blob" +msgstr "объект %s не является двоичным объектом" + +#: merge-recursive.c:1576 +msgid "modify" +msgstr "изменение" + +#: merge-recursive.c:1576 +msgid "modified" +msgstr "изменено" + +#: merge-recursive.c:1586 +msgid "content" +msgstr "содержимое" + +#: merge-recursive.c:1593 +msgid "add/add" +msgstr "добавление/добавление" + +#: merge-recursive.c:1627 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "Пропуск %s (слиты одинаковые изменения как существующие)" + +#: merge-recursive.c:1641 +#, c-format +msgid "Auto-merging %s" +msgstr "Автослияние %s" + +#: merge-recursive.c:1645 git-submodule.sh:1150 +msgid "submodule" +msgstr "подмодуль" + +#: merge-recursive.c:1646 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s" + +#: merge-recursive.c:1732 +#, c-format +msgid "Removing %s" +msgstr "Удаление %s" + +#: merge-recursive.c:1757 +msgid "file/directory" +msgstr "файл/каталог" + +#: merge-recursive.c:1763 +msgid "directory/file" +msgstr "каталог/файл" + +#: merge-recursive.c:1768 +#, c-format +msgid "" +"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»" + +#: merge-recursive.c:1778 +#, c-format +msgid "Adding %s" +msgstr "Добавление %s" + +#: merge-recursive.c:1795 +msgid "Fatal merge failure, shouldn't happen." +msgstr "Критическая ошибка слияния, такого не должно случаться." + +#: merge-recursive.c:1814 +msgid "Already up-to-date!" +msgstr "Уже обновлено!" + +#: merge-recursive.c:1823 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "сбой слияния деревьев «%s» и «%s»" + +#: merge-recursive.c:1853 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "Необработанный путь??? %s" + +#: merge-recursive.c:1898 +msgid "Merging:" +msgstr "Слияние:" + +#: merge-recursive.c:1911 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "найден %u общий предок:" +msgstr[1] "найдено %u общих предка:" +msgstr[2] "найдено %u общих предков:" + +#: merge-recursive.c:1948 +msgid "merge returned no commit" +msgstr "слияние не вернуло коммит" + +#: merge-recursive.c:2005 +#, c-format +msgid "Could not parse object '%s'" +msgstr "Не удалось разобрать объект «%s»" + +#: merge-recursive.c:2016 builtin/merge.c:667 +msgid "Unable to write index." +msgstr "Не удается записать индекс." + +#: notes-utils.c:41 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "Нельзя закоммитить неинициализированное или не имеющее ссылок дерево заметок" + +#: notes-utils.c:82 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Неправильное значение notes.rewriteMode: «%s»" + +#: notes-utils.c:92 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: notes-utils.c:119 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Неправильное значение переменной %s: «%s»" + +#: object.c:241 +#, c-format +msgid "unable to parse object: %s" +msgstr "не удалось разобрать объект: %s" + +#: parse-options.c:546 +msgid "..." +msgstr "…" + +#: parse-options.c:564 +#, c-format +msgid "usage: %s" +msgstr "использование: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:568 +#, c-format +msgid " or: %s" +msgstr " или: %s" + +#: parse-options.c:571 +#, c-format +msgid " %s" +msgstr " %s" + +#: parse-options.c:605 +msgid "-NUM" +msgstr "-КОЛИЧЕСТВО" + +#: pathspec.c:133 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "глобальные опции спецификации пути «glob» и «noglob» нельзя использовать одновременно" + +#: pathspec.c:143 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "глобальная опция спецификации пути «literal» не совместима с другими глобальными спецификаторами доступа" + +#: pathspec.c:177 +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "неправильный параметр для магического слова «prefix» в спецификации пути " + +#: pathspec.c:183 +#, c-format +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "неправильное магическое слово «%.*s» в спецификации пути «%s»" + +#: pathspec.c:187 +#, c-format +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "Пропущено «)» в конце магического слова спецификации пути «%s»" + +#: pathspec.c:205 +#, c-format +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "Нереализованное магическое слово «%c» спецификации пути «%s»" + +#: pathspec.c:230 +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "%s: «literal» и «glob» не совместимы" + +#: pathspec.c:241 +#, c-format +msgid "%s: '%s' is outside repository" +msgstr "%s: «%s» вне репозитория" + +#: pathspec.c:291 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Спецификация пути «%s» в подмодуле «%.*s»" + +#: pathspec.c:353 +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "%s: магические слова в спецификации пути не поддерживаются командой: %s" + +#: pathspec.c:432 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "спецификация пути «%s» находится за символической ссылкой" + +#: pathspec.c:441 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "Не указан шаблон для исключения с помощью :(exclude).\nВозможно, вы забыли «:/» или «.» ?" + +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "не удалось разобрать формат для --pretty" + +#: progress.c:225 +msgid "done" +msgstr "готово" + +#: read-cache.c:1273 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "index.version указан, но значение недействительное.\nИспользую версию %i" + +#: read-cache.c:1283 +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i" + +#: remote.c:782 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Нельзя извлечь одновременно %s и %s в %s" + +#: remote.c:786 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s обычно отслеживает %s, а не %s" + +#: remote.c:790 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s отслеживает и %s и %s" + +#: remote.c:798 +msgid "Internal error" +msgstr "Внутренняя ошибка" + +#: remote.c:1980 +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n" + +#: remote.c:1984 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr "(для исправления запустите «git branch --unset-upstream»)\n" + +#: remote.c:1987 +#, c-format +msgid "Your branch is up-to-date with '%s'.\n" +msgstr "Ваша ветка обновлена в соответствии с «%s».\n" + +#: remote.c:1991 +#, 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" +msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n" + +#: remote.c:1997 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n" + +#: remote.c:2000 +#, 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] "Ваша ветка отстает от «%s» на %d коммит и может быть перемотана вперед.\n" +msgstr[1] "Ваша ветка отстает от «%s» на %d коммита и может быть перемотана вперед.\n" +msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" + +#: remote.c:2008 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n" + +#: remote.c:2011 +#, 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" +msgstr[2] "Ваша ветка и «%s» разошлись\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" + +#: remote.c:2021 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n" + +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "опцию --first-parent нельзя использовать одновременно с --bisect" + +#: run-command.c:83 +msgid "open /dev/null failed" +msgstr "сбой открытия /dev/null" + +#: run-command.c:85 +#, c-format +msgid "dup2(%d,%d) failed" +msgstr "dup2(%d,%d) сбой" + +#: send-pack.c:272 +msgid "failed to sign the push certificate" +msgstr "сбой подписания сертификата отправки" + +#: send-pack.c:356 +msgid "the receiving end does not support --signed push" +msgstr "получающая сторона не поддерживает отправку с опцией --signed" + +#: send-pack.c:366 +msgid "server does not support --atomic push" +msgstr "сервер не поддерживает отправку с параметром --atomic" + +#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 +#: builtin/merge.c:1005 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Не удалось открыть «%s» для записи" + +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 +#: builtin/merge.c:1010 +#, c-format +msgid "Could not write to '%s'" +msgstr "Не удалось записать в «%s»" + +#: sequencer.c:195 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»" + +#: sequencer.c:198 +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 "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»" + +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 +#, c-format +msgid "Could not write to %s" +msgstr "Не удалось записать в %s" + +#: sequencer.c:214 +#, c-format +msgid "Error wrapping up %s" +msgstr "Ошибка оборачивания %s" + +#: sequencer.c:229 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "Ваши локальные изменение будут перезаписаны отбором лучшего." + +#: sequencer.c:231 +msgid "Your local changes would be overwritten by revert." +msgstr "Ваши локальные изменение будут перезаписаны возвратом коммита." + +#: sequencer.c:234 +msgid "Commit your changes or stash them to proceed." +msgstr "Сделайте коммит или спрячьте ваши изменения для продолжения." + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:321 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Не удалось записать файл индекса" + +#: sequencer.c:339 +msgid "Could not resolve HEAD commit\n" +msgstr "Не удалось определить HEAD коммит\n" + +#: sequencer.c:359 +msgid "Unable to update cache tree\n" +msgstr "Не удалось обновить дерево кэша\n" + +#: sequencer.c:411 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Не удалось разобрать коммит %s\n" + +#: sequencer.c:416 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "Не удалось разобрать родительскую коммит %s\n" + +#: sequencer.c:482 +msgid "Your index file is unmerged." +msgstr "Ваш файл индекса не слит." + +#: sequencer.c:501 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "Коммит %s — это коммит-слияние, но опция -m не указана." + +#: sequencer.c:509 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "У коммита %s нет предка %d" + +#: sequencer.c:513 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "Основная ветка указана, но коммит %s не является слиянием." + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:526 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: не удалось разобрать родительский коммит для %s" + +#: sequencer.c:530 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Не удалось получить сообщение коммита для %s" + +#: sequencer.c:616 +#, c-format +msgid "could not revert %s... %s" +msgstr "не удалось возвратить коммит %s… %s" + +#: sequencer.c:617 +#, c-format +msgid "could not apply %s... %s" +msgstr "не удалось применить коммит %s… %s" + +#: sequencer.c:653 +msgid "empty commit set passed" +msgstr "передан пустой набор коммитов" + +#: sequencer.c:661 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: сбой чтения индекса" + +#: sequencer.c:665 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: сбой обновления индекса" + +#: sequencer.c:725 +#, c-format +msgid "Cannot %s during a %s" +msgstr "Не удалось %s во время %s" + +#: sequencer.c:747 +#, c-format +msgid "Could not parse line %d." +msgstr "Не удалось разобрать строку %d." + +#: sequencer.c:752 +msgid "No commits parsed." +msgstr "Коммиты не разобраны." + +#: sequencer.c:765 +#, c-format +msgid "Could not open %s" +msgstr "Не удалось открыть %s" + +#: sequencer.c:769 +#, c-format +msgid "Could not read %s." +msgstr "Не удалось прочитать %s." + +#: sequencer.c:776 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "Непригодная для использования карта с инструкциями: %s" + +#: sequencer.c:806 +#, c-format +msgid "Invalid key: %s" +msgstr "Недействительный ключ: %s" + +#: sequencer.c:809 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Неправильное значение %s: %s" + +#: sequencer.c:821 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "Испорченная карта с опциями: %s" + +#: sequencer.c:842 +msgid "a cherry-pick or revert is already in progress" +msgstr "отбор лучшего или возврат коммита уже выполняется" + +#: sequencer.c:843 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»" + +#: sequencer.c:847 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "Не удалось создать каталог для указателя следования коммитов %s" + +#: sequencer.c:863 sequencer.c:948 +#, c-format +msgid "Error wrapping up %s." +msgstr "Ошибка оборачивания %s." + +#: sequencer.c:882 sequencer.c:1018 +msgid "no cherry-pick or revert in progress" +msgstr "отбор лучшего или возврат коммита не выполняется" + +#: sequencer.c:884 +msgid "cannot resolve HEAD" +msgstr "не удалось определить HEAD" + +#: sequencer.c:886 +msgid "cannot abort from a branch yet to be born" +msgstr "нельзя отменить изменения с ветки, которая еще не создана" + +#: sequencer.c:908 builtin/apply.c:4286 +#, c-format +msgid "cannot open %s: %s" +msgstr "не удалось открыть %s: %s" + +#: sequencer.c:911 +#, c-format +msgid "cannot read %s: %s" +msgstr "не удалось прочитать %s: %s" + +#: sequencer.c:912 +msgid "unexpected end of file" +msgstr "неожиданный конец файла" + +#: sequencer.c:918 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "сохраненный файл с HEAD перед отбором лучшего «%s» поврежден" + +#: sequencer.c:941 +#, c-format +msgid "Could not format %s." +msgstr "Не удалось отформатировать %s." + +#: sequencer.c:1086 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s: не удалось отобрать %s" + +#: sequencer.c:1089 +#, c-format +msgid "%s: bad revision" +msgstr "%s: плохая редакция" + +#: sequencer.c:1123 +msgid "Can't revert as initial commit" +msgstr "Нельзя возвратить изначальный коммит" + +#: sequencer.c:1124 +msgid "Can't cherry-pick into empty head" +msgstr "Нельзя отобрать лучшее в пустой HEAD" + +#: sha1_name.c:440 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»" + +#: sha1_name.c:1068 +msgid "HEAD does not point to a branch" +msgstr "HEAD не указывает на ветку" + +#: sha1_name.c:1071 +#, c-format +msgid "No such branch: '%s'" +msgstr "Нет такой ветки: «%s»" + +#: sha1_name.c:1073 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "Вышестоящий репозиторий не настроен для ветки «%s»" + +#: sha1_name.c:1077 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "Вышестоящая ветка «%s» не сохранена как отслеживаемая ветка" + +#: submodule.c:64 submodule.c:98 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты" + +#: submodule.c:68 submodule.c:102 +#, c-format +msgid "Could not find section in .gitmodules where path=%s" +msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s" + +#: submodule.c:76 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr " Не удалось обновить .gitmodules запись %s" + +#: submodule.c:109 +#, c-format +msgid "Could not remove .gitmodules entry for %s" +msgstr "Не удалось удалить запись в .gitmodules для %s" + +#: submodule.c:120 +msgid "staging updated .gitmodules failed" +msgstr "сбой индексирования обновленного .gitmodules" + +#: submodule.c:1109 builtin/init-db.c:371 +#, c-format +msgid "Could not create git link %s" +msgstr "Не удалось создать git ссылку %s" + +#: submodule.c:1120 +#, c-format +msgid "Could not set core.worktree in %s" +msgstr "Не удалось установить core.worktree в %s" + +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "неизвестное значение «%s» для ключа «%s»" + +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 +#, c-format +msgid "more than one %s" +msgstr "больше одного %s" + +#: trailer.c:581 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "пустая последняя лексема в завершителе «%.*s»" + +#: trailer.c:701 +#, c-format +msgid "could not read input file '%s'" +msgstr "не удалось прочитать входной файл «%s»" + +#: trailer.c:704 +msgid "could not read from stdin" +msgstr "не удалось прочитать из стандартного ввода" + +#: unpack-trees.c:202 +msgid "Checking out files" +msgstr "Распаковка файлов" + +#: urlmatch.c:120 +msgid "invalid URL scheme name or missing '://' suffix" +msgstr "Неправильная имя URL схемы или пропущен суффикс «://»" + +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#, c-format +msgid "invalid %XX escape sequence" +msgstr "неправильная управляющая последовательность %XX" + +#: urlmatch.c:172 +msgid "missing host and scheme is not 'file:'" +msgstr "пропущено имя сервера и схема доступа не «file:»" + +#: urlmatch.c:189 +msgid "a 'file:' URL may not have a port number" +msgstr "URL со схемой «file:» не может содержать номер порта" + +#: 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:523 +#, c-format +msgid "unable to access '%s': %s" +msgstr "«%s» недоступно: %s" + +#: wrapper.c:544 +#, c-format +msgid "unable to access '%s'" +msgstr "«%s» недоступно" + +#: wrapper.c:555 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "не удалось запросить текущего пользователя в файле passwd: %s" + +#: wrapper.c:556 +msgid "no such user" +msgstr "нет такого пользователя" + +#: wrapper.c:564 +msgid "unable to get current working directory" +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 " (используйте «git reset %s <файл>…», чтобы убрать из индекса)" + +#: wt-status.c:179 wt-status.c:206 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)" + +#: wt-status.c:183 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)" + +#: wt-status.c:185 wt-status.c:189 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)" + +#: wt-status.c:187 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)" + +#: wt-status.c:198 wt-status.c:878 +msgid "Changes to be committed:" +msgstr "Изменения, которые будут включены в коммит:" + +#: wt-status.c:216 wt-status.c:887 +msgid "Changes not staged for commit:" +msgstr "Изменения, которые не в индексе для коммита:" + +#: wt-status.c:220 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)" + +#: wt-status.c:222 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)" + +#: wt-status.c:223 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working " +"directory)" +msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)" + +#: 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 " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)" + +#: wt-status.c:252 +msgid "both deleted:" +msgstr "оба удалены:" + +#: wt-status.c:254 +msgid "added by us:" +msgstr "добавлено нами:" + +#: wt-status.c:256 +msgid "deleted by them:" +msgstr "удалено ими:" + +#: wt-status.c:258 +msgid "added by them:" +msgstr "добавлено ими:" + +#: wt-status.c:260 +msgid "deleted by us:" +msgstr "удалено нами:" + +#: wt-status.c:262 +msgid "both added:" +msgstr "оба добавлены:" + +#: wt-status.c:264 +msgid "both modified:" +msgstr "оба измены:" + +#: wt-status.c:266 +#, c-format +msgid "bug: unhandled unmerged status %x" +msgstr "ошибка: необработанный статус не слитых изменений %x" + +#: wt-status.c:274 +msgid "new file:" +msgstr "новый файл:" + +#: wt-status.c:276 +msgid "copied:" +msgstr "скопировано:" + +#: wt-status.c:278 +msgid "deleted:" +msgstr "удалено:" + +#: wt-status.c:280 +msgid "modified:" +msgstr "изменено:" + +#: wt-status.c:282 +msgid "renamed:" +msgstr "переименовано:" + +#: wt-status.c:284 +msgid "typechange:" +msgstr "изменен тип:" + +#: wt-status.c:286 +msgid "unknown:" +msgstr "неизвестно:" + +#: wt-status.c:288 +msgid "unmerged:" +msgstr "не слитые:" + +#: wt-status.c:370 +msgid "new commits, " +msgstr "новые коммиты, " + +#: wt-status.c:372 +msgid "modified content, " +msgstr "изменено содержимое, " + +#: wt-status.c:374 +msgid "untracked content, " +msgstr "неотслеживаемое содержимое, " + +#: wt-status.c:391 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "ошибка: необработанный статус изменений %c" + +#: wt-status.c:753 +msgid "Submodules changed but not updated:" +msgstr "Измененные, но не обновленные подмодули:" + +#: wt-status.c:755 +msgid "Submodule changes to be committed:" +msgstr "Изменения в подмодулях, которые будут закоммичены:" + +#: wt-status.c:835 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "Не трогайте строку выше этой.\nВсё, что ниже — будет удалено." + +#: wt-status.c:946 +msgid "You have unmerged paths." +msgstr "У вас есть не слитые пути." + +#: wt-status.c:949 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (разрешите конфликты, затем запустите «git commit»)" + +#: wt-status.c:952 +msgid "All conflicts fixed but you are still merging." +msgstr "Все конфликты исправлены, но вы все еще в процессе слияния." + +#: wt-status.c:955 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (используйте «git commit», чтобы завершить слияние)" + +#: wt-status.c:965 +msgid "You are in the middle of an am session." +msgstr "Вы в процессе сессии am." + +#: wt-status.c:968 +msgid "The current patch is empty." +msgstr "Текущий патч пустой." + +#: wt-status.c:972 +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr " (разрешите конфликты, затем запустите «git am --continue»)" + +#: wt-status.c:974 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (используйте «git am --skip», чтобы пропустить этот патч)" + +#: wt-status.c:976 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)" + +#: wt-status.c:1036 wt-status.c:1053 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Вы сейчас перемещаете ветку «%s» над «%s»." + +#: wt-status.c:1041 wt-status.c:1058 +msgid "You are currently rebasing." +msgstr "Вы сейчас перемещаете ветку." + +#: wt-status.c:1044 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)" + +#: wt-status.c:1046 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)" + +#: wt-status.c:1048 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)" + +#: wt-status.c:1061 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (все конфликты разрешены: запустите «git rebase --continue»)" + +#: wt-status.c:1065 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»." + +#: wt-status.c:1070 +msgid "You are currently splitting a commit during a rebase." +msgstr "Вы сейчас разделяете коммит при перемещении ветки." + +#: wt-status.c:1073 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)" + +#: wt-status.c:1077 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»." + +#: wt-status.c:1082 +msgid "You are currently editing a commit during a rebase." +msgstr "Вы сейчас редактируете коммит при перемещении ветки." + +#: wt-status.c:1085 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)" + +#: wt-status.c:1087 +msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)" + +#: wt-status.c:1097 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "Вы сейчас отбираете лучший коммит %s." + +#: wt-status.c:1102 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)" + +#: wt-status.c:1105 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)" + +#: wt-status.c:1107 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr " (используйте «git cherry-pick --abort», чтобы отменить операцию отбора лучшего)" + +#: wt-status.c:1116 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "Вы сейчас возвращаете коммит %s." + +#: wt-status.c:1121 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " (разрешите конфликты, затем запустите «git revert --continue»)" + +#: wt-status.c:1124 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr " (все конфликты разрешены: запустите «git revert --continue»)" + +#: wt-status.c:1126 +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr " (используйте «git revert --abort», чтобы отменить операцию возврата)" + +#: wt-status.c:1137 +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»." + +#: wt-status.c:1141 +msgid "You are currently bisecting." +msgstr "Вы сейчас в процессе двоичного поиска." + +#: wt-status.c:1144 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)" + +#: wt-status.c:1321 +msgid "On branch " +msgstr "На ветке " + +#: wt-status.c:1328 +msgid "rebase in progress; onto " +msgstr "перемещение в процессе; над " + +#: wt-status.c:1333 +msgid "HEAD detached at " +msgstr "HEAD отделен на " + +#: wt-status.c:1335 +msgid "HEAD detached from " +msgstr "HEAD отделен начиная с " + +#: wt-status.c:1338 +msgid "Not currently on any branch." +msgstr "Сейчас ни на одной из веток" + +#: wt-status.c:1355 +msgid "Initial commit" +msgstr "Начальный коммит" + +#: wt-status.c:1369 +msgid "Untracked files" +msgstr "Неотслеживаемые файлы" + +#: wt-status.c:1371 +msgid "Ignored files" +msgstr "Игнорируемые файлы" + +#: wt-status.c:1375 +#, 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 "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)." + +#: wt-status.c:1381 +#, c-format +msgid "Untracked files not listed%s" +msgstr "Неотслеживаемые файлы не показаны%s" + +#: wt-status.c:1383 +msgid " (use -u option to show untracked files)" +msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)" + +#: wt-status.c:1389 +msgid "No changes" +msgstr "Нет изменений" + +#: wt-status.c:1394 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n" + +#: wt-status.c:1397 +#, c-format +msgid "no changes added to commit\n" +msgstr "нет изменений добавленных для коммита\n" + +#: wt-status.c:1400 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте \"git add\", чтобы отслеживать их)\n" + +#: wt-status.c:1403 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n" + +#: wt-status.c:1406 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n" + +#: wt-status.c:1409 wt-status.c:1414 +#, c-format +msgid "nothing to commit\n" +msgstr "нечего коммитить\n" + +#: wt-status.c:1412 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n" + +#: wt-status.c:1416 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "нечего коммитить, нет изменений в рабочем каталоге\n" + +#: wt-status.c:1525 +msgid "HEAD (no branch)" +msgstr "HEAD (нет ветки)" + +#: wt-status.c:1531 +msgid "Initial commit on " +msgstr "Начальный коммит на " + +#: wt-status.c:1563 +msgid "gone" +msgstr "исчез" + +#: wt-status.c:1565 wt-status.c:1573 +msgid "behind " +msgstr "позади" + +#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#, c-format +msgid "failed to unlink '%s'" +msgstr "сбой отсоединения «%s»" + +#: builtin/add.c:22 +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<опции>] [--] <спецификация-пути>…" + +#: builtin/add.c:65 +#, c-format +msgid "unexpected diff status %c" +msgstr "неожиданный статус различий %c" + +#: builtin/add.c:70 builtin/commit.c:275 +msgid "updating files failed" +msgstr "сбой при обновлении файлов" + +#: builtin/add.c:80 +#, c-format +msgid "remove '%s'\n" +msgstr "удалить «%s»\n" + +#: builtin/add.c:134 +msgid "Unstaged changes after refreshing the index:" +msgstr "Непроиндексированные изменения после обновления индекса:" + +#: builtin/add.c:194 builtin/rev-parse.c:785 +msgid "Could not read the index" +msgstr "Не удалось прочитать индекс" + +#: builtin/add.c:205 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Не удалось открыть «%s» для записи." + +#: builtin/add.c:209 +msgid "Could not write patch" +msgstr "Не удалось записать патч" + +#: builtin/add.c:214 +#, c-format +msgid "Could not stat '%s'" +msgstr "Не удалось выполнить stat для «%s»" + +#: builtin/add.c:216 +msgid "Empty patch. Aborted." +msgstr "Пустой патч. Операция прервана." + +#: builtin/add.c:221 +#, c-format +msgid "Could not apply '%s'" +msgstr "Не удалось применить «%s»" + +#: builtin/add.c:231 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n" + +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 +#: builtin/rm.c:269 +msgid "dry run" +msgstr "пробный запуск" + +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 +msgid "be verbose" +msgstr "быть многословнее" + +#: builtin/add.c:251 +msgid "interactive picking" +msgstr "интерактивный выбор" + +#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +msgid "select hunks interactively" +msgstr "интерактивный выбор блоков" + +#: builtin/add.c:253 +msgid "edit current diff and apply" +msgstr "отредактировать текущий файл различий и применить его" + +#: builtin/add.c:254 +msgid "allow adding otherwise ignored files" +msgstr "разрешить добавление игнорируемых иначе файлов" + +#: builtin/add.c:255 +msgid "update tracked files" +msgstr "обновить отслеживаемые файлы" + +#: builtin/add.c:256 +msgid "record only the fact that the path will be added later" +msgstr "записать только факт, что путь будет добавлен позже" + +#: builtin/add.c:257 +msgid "add changes from all tracked and untracked files" +msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов" + +#: builtin/add.c:260 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)" + +#: builtin/add.c:262 +msgid "don't add, only refresh the index" +msgstr "не добавлять, только обновить индекс" + +#: builtin/add.c:263 +msgid "just skip files which cannot be added because of errors" +msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок" + +#: builtin/add.c:264 +msgid "check if - even missing - files are ignored in dry run" +msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске" + +#: builtin/add.c:286 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Используйте -f, если вы действительно хотите добавить их.\n" + +#: builtin/add.c:293 +msgid "adding files failed" +msgstr "ошибка при добавлении файлов" + +#: builtin/add.c:329 +msgid "-A and -u are mutually incompatible" +msgstr "-A и -u нельзя использовать одновременно" + +#: builtin/add.c:336 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run" + +#: builtin/add.c:357 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Ничего не указано, ничего не добавлено.\n" + +#: builtin/add.c:358 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Возможно, вы имели в виду «git add .»?\n" + +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +msgid "index file corrupt" +msgstr "файл индекса поврежден" + +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "Не удалось записать новый файл индекса" + +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<опции>] [<патч>…]" + +#: builtin/apply.c:112 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "неопознанная опция для пробелов «%s»" + +#: builtin/apply.c:127 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "неопознанная опция для игнорирования пробелов «%s»" + +#: builtin/apply.c:822 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Не удалось подготовить регулярное выражение для метки времени %s" + +#: builtin/apply.c:831 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec возвратил %d для ввода: %s" + +#: builtin/apply.c:912 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "не удалось найти имя файла в строке патча %d" + +#: builtin/apply.c:944 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d" + +#: builtin/apply.c:948 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d" + +#: builtin/apply.c:956 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d" + +#: builtin/apply.c:1419 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: не ожидаемая строка: %.*s" + +#: builtin/apply.c:1476 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "фрагмент изменений без заголовка на строке %d: %.*s" + +#: builtin/apply.c:1493 +#, 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] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущего компонента пути к файлу (строка %d)" +msgstr[1] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" +msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" + +#: 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 "патч поврежден на строке %d" + +#: builtin/apply.c:1720 +#, c-format +msgid "new file %s depends on old contents" +msgstr "новый файл %s зависит от старого содержимого" + +#: builtin/apply.c:1722 +#, c-format +msgid "deleted file %s still has contents" +msgstr "удаленный файл %s все еще имеет содержимое" + +#: builtin/apply.c:1725 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** предупреждение: файл %s становится пустым, но не удаляется" + +#: builtin/apply.c:1871 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "поврежденный двоичный патч на строке %d: %.*s" + +#: builtin/apply.c:1900 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "неопознанный двоичный патч на строке %d" + +#: builtin/apply.c:2051 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "патч с мусором на строке %d" + +#: builtin/apply.c:2141 +#, c-format +msgid "unable to read symlink %s" +msgstr "не удалось прочитать символьную ссылку %s" + +#: builtin/apply.c:2145 +#, c-format +msgid "unable to open or read %s" +msgstr "не удалось открыть или прочесть %s" + +#: builtin/apply.c:2778 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "неправильное начало строки: «%c»" + +#: builtin/apply.c:2896 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "Часть #%d успешно применена на %d (со сдвигом в %d строку)." +msgstr[1] "Часть #%d успешно применена на %d (со сдвигом в %d строки)." +msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." + +#: builtin/apply.c:2908 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке" + +#: builtin/apply.c:2914 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "при поиске:\n%.*s" + +#: builtin/apply.c:2933 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "пропущены данные двоичного патча для «%s»" + +#: builtin/apply.c:3034 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "не удалось применить двоичный патч к «%s»" + +#: builtin/apply.c:3040 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)" + +#: builtin/apply.c:3061 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "ошибка применения изменений: %s:%ld" + +#: builtin/apply.c:3185 +#, c-format +msgid "cannot checkout %s" +msgstr "не удалось перейти на %s" + +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286 +#, c-format +msgid "read of %s failed" +msgstr "ошибка чтения %s" + +#: builtin/apply.c:3238 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "чтение из «%s» за символической ссылкой" + +#: builtin/apply.c:3266 builtin/apply.c:3488 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "путь %s был переименован/удален" + +#: builtin/apply.c:3347 builtin/apply.c:3502 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: нет в индексе" + +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3356 builtin/apply.c:3510 +#, c-format +msgid "%s: does not match index" +msgstr "%s: не совпадает с индексом" + +#: builtin/apply.c:3458 +msgid "removal patch leaves file contents" +msgstr "патч удаления не удалил содержимое файла" + +#: builtin/apply.c:3527 +#, c-format +msgid "%s: wrong type" +msgstr "%s: неправильный тип" + +#: builtin/apply.c:3529 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s имеет тип %o, а ожидался %o" + +#: builtin/apply.c:3688 builtin/apply.c:3690 +#, c-format +msgid "invalid path '%s'" +msgstr "неправильный путь «%s»" + +#: builtin/apply.c:3745 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: уже содержится в индексе" + +#: builtin/apply.c:3748 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: уже содержится в рабочем каталоге" + +#: builtin/apply.c:3768 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)" + +#: builtin/apply.c:3773 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s" + +#: builtin/apply.c:3793 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "затронутый файл «%s» находится за символической ссылкой" + +#: builtin/apply.c:3797 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: не удалось применить патч" + +#: builtin/apply.c:3811 +#, c-format +msgid "Checking patch %s..." +msgstr "Проверка патча %s…" + +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "сбой make_cache_entry для пути «%s»" + +#: builtin/apply.c:4047 +#, c-format +msgid "unable to remove %s from index" +msgstr "не удалось удалить %s из индекса" + +#: builtin/apply.c:4076 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "поврежденный патч для подмодуля %s" + +#: builtin/apply.c:4080 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "не удалось выполнить stat для созданного файла «%s»" + +#: builtin/apply.c:4085 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "не удалось создать вспомогательный файл для созданного файла %s" + +#: builtin/apply.c:4088 builtin/apply.c:4196 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "не удалось создать запись в кэше для %s" + +#: builtin/apply.c:4121 +#, c-format +msgid "closing file '%s'" +msgstr "закрытие файла «%s»" + +#: builtin/apply.c:4170 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "не удалось записать файл «%s» с режимом доступа %o" + +#: builtin/apply.c:4257 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Патч %s применен без ошибок." + +#: builtin/apply.c:4265 +msgid "internal error" +msgstr "внутренняя ошибка" + +#: builtin/apply.c:4268 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "Применение патча %%s с %d отказом…" +msgstr[1] "Применение патча %%s с %d отказами…" +msgstr[2] "Применение патча %%s с %d отказами…" + +#: builtin/apply.c:4278 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "усечение имени .rej файла до %.*s.rej" + +#: builtin/apply.c:4299 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Блок №%d применен без ошибок." + +#: builtin/apply.c:4302 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Блок №%d отклонен." + +#: builtin/apply.c:4392 +msgid "unrecognized input" +msgstr "не распознанный ввод" + +#: builtin/apply.c:4403 +msgid "unable to read index file" +msgstr "не удалось прочитать файл индекса" + +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92 +#: builtin/fetch.c:92 +msgid "path" +msgstr "путь" + +#: builtin/apply.c:4521 +msgid "don't apply changes matching the given path" +msgstr "не применять изменения по указанному пути" + +#: builtin/apply.c:4524 +msgid "apply changes matching the given path" +msgstr "применять изменения по указанному пути" + +#: builtin/apply.c:4526 +msgid "num" +msgstr "количество" + +#: builtin/apply.c:4527 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений" + +#: builtin/apply.c:4530 +msgid "ignore additions made by the patch" +msgstr "игнорировать добавления, сделанные этим патчем" + +#: builtin/apply.c:4532 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода" + +#: builtin/apply.c:4536 +msgid "show number of added and deleted lines in decimal notation" +msgstr "показать количество добавленных и удаленных строк в десятичном представлении" + +#: builtin/apply.c:4538 +msgid "instead of applying the patch, output a summary for the input" +msgstr "вместо применения патча вывести статистику изменений для ввода" + +#: builtin/apply.c:4540 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "вместо применения патча проверить подходит ли он" + +#: builtin/apply.c:4542 +msgid "make sure the patch is applicable to the current index" +msgstr "проверить, что патч применяется к текущему индексу" + +#: builtin/apply.c:4544 +msgid "apply a patch without touching the working tree" +msgstr "применить патч, не изменяя рабочий каталог" + +#: builtin/apply.c:4546 +msgid "accept a patch that touches outside the working area" +msgstr "принять патч, который затрагивает файлы за рабочим каталогом" + +#: builtin/apply.c:4548 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "а также применить патч (используйте с --stat/--summary/--check)" + +#: builtin/apply.c:4550 +msgid "attempt three-way merge if a patch does not apply" +msgstr "попытаться сделать трехходовое слияние, если патч не применяется" + +#: builtin/apply.c:4552 +msgid "build a temporary index based on embedded index information" +msgstr "построить временный индекс, основанный на встроенной информации об индексе" + +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412 +msgid "paths are separated with NUL character" +msgstr "пути, отделенные НУЛЕВЫМ символом" + +#: builtin/apply.c:4557 +msgid "ensure at least <n> lines of context match" +msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают" + +#: builtin/apply.c:4558 +msgid "action" +msgstr "действие" + +#: builtin/apply.c:4559 +msgid "detect new or modified lines that have whitespace errors" +msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах" + +#: builtin/apply.c:4562 builtin/apply.c:4565 +msgid "ignore changes in whitespace when finding context" +msgstr "игнорировать изменения в пробельных символах при поиске контекста" + +#: builtin/apply.c:4568 +msgid "apply the patch in reverse" +msgstr "применить патч с обращением изменений" + +#: builtin/apply.c:4570 +msgid "don't expect at least one line of context" +msgstr "не ожидать как минимум одной строки контекста" + +#: builtin/apply.c:4572 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах" + +#: builtin/apply.c:4574 +msgid "allow overlapping hunks" +msgstr "разрешить перекрывающиеся блоки изменений" + +#: builtin/apply.c:4577 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла" + +#: builtin/apply.c:4580 +msgid "do not trust the line counts in the hunk headers" +msgstr "не доверять количеству строк из заголовка блока изменений" + +#: builtin/apply.c:4582 +msgid "root" +msgstr "корень" + +#: builtin/apply.c:4583 +msgid "prepend <root> to all filenames" +msgstr "добавить <корень> спереди ко всем именам файлов" + +#: builtin/apply.c:4605 +msgid "--3way outside a repository" +msgstr "--3way вне репозитория" + +#: builtin/apply.c:4613 +msgid "--index outside a repository" +msgstr "--index вне репозитория" + +#: builtin/apply.c:4616 +msgid "--cached outside a repository" +msgstr "--cached вне репозитория" + +#: builtin/apply.c:4635 +#, c-format +msgid "can't open patch '%s'" +msgstr "не удалось открыть патч «%s»" + +#: builtin/apply.c:4649 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "пропущена %d ошибка в пробельных символах" +msgstr[1] "пропущено %d ошибки в пробельных символах" +msgstr[2] "пропущено %d ошибок в пробельных символах" + +#: builtin/apply.c:4655 builtin/apply.c:4665 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d строка добавила ошибки в пробельных символах." +msgstr[1] "%d строки добавили ошибки в пробельных символах." +msgstr[2] "%d строк добавили ошибки в пробельных символах." + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "не удалось создать файл архива «%s»" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "не удалось перенаправить вывод" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive: внешний репозиторий без URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: ожидался ACK/NAK, а получен EOF" + +#: builtin/archive.c:61 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "ошибка внешнего репозитория: %s" + +#: builtin/archive.c:64 +msgid "git archive: protocol error" +msgstr "git archive: ошибка протокола" + +#: builtin/archive.c:68 +msgid "git archive: expected a flush" +msgstr "git archive: ожидался сброс буфера" + +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "выполнить «git bisect next»" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит" + +#: builtin/blame.c:30 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<опции>] [<опции-rev-list>] [<редакция>] [--] файл" + +#: builtin/blame.c:35 +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<опции-rev-list> документированы в git-rev-list(1)" + +#: builtin/blame.c:2500 +msgid "Show blame entries as we find them, incrementally" +msgstr "Показать записи авторства постепенно, в процессе нахождения" + +#: builtin/blame.c:2501 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)" + +#: builtin/blame.c:2502 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)" + +#: builtin/blame.c:2503 +msgid "Show work cost statistics" +msgstr "Показать статистику расходов на выполнение запроса" + +#: builtin/blame.c:2504 +msgid "Show output score for blame entries" +msgstr "Показать оценку для записей авторства" + +#: builtin/blame.c:2505 +msgid "Show original filename (Default: auto)" +msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)" + +#: builtin/blame.c:2506 +msgid "Show original linenumber (Default: off)" +msgstr "Показать оригинальные номера строк (По умолчанию: отключено)" + +#: builtin/blame.c:2507 +msgid "Show in a format designed for machine consumption" +msgstr "Показать в формате для программного разбора" + +#: builtin/blame.c:2508 +msgid "Show porcelain format with per-line commit information" +msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите" + +#: builtin/blame.c:2509 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)" + +#: builtin/blame.c:2510 +msgid "Show raw timestamp (Default: off)" +msgstr "Показать необработанные временные метки (По умолчанию: отключено)" + +#: builtin/blame.c:2511 +msgid "Show long commit SHA1 (Default: off)" +msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)" + +#: builtin/blame.c:2512 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)" + +#: builtin/blame.c:2513 +msgid "Show author email instead of name (Default: off)" +msgstr "Показать почту автора вместо имени (По умолчанию: отключено)" + +#: builtin/blame.c:2514 +msgid "Ignore whitespace differences" +msgstr "Игнорировать различия в пробелах" + +#: builtin/blame.c:2515 +msgid "Spend extra cycles to find better match" +msgstr "Потратить больше времени, для нахождения лучших совпадений" + +#: builtin/blame.c:2516 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "Использовать редакции из <файла> вместо вызова git-rev-list" + +#: builtin/blame.c:2517 +msgid "Use <file>'s contents as the final image" +msgstr "Использовать содержимое <файла> как финальный снимок" + +#: builtin/blame.c:2518 builtin/blame.c:2519 +msgid "score" +msgstr "мин-длина" + +#: builtin/blame.c:2518 +msgid "Find line copies within and across files" +msgstr "Найти копирование строк в пределах и между файлами" + +#: builtin/blame.c:2519 +msgid "Find line movements within and across files" +msgstr "Найти перемещения строк в пределах и между файлами" + +#: builtin/blame.c:2520 +msgid "n,m" +msgstr "начало,конец" + +#: builtin/blame.c:2520 +msgid "Process only line range n,m, counting from 1" +msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1" + +#. TRANSLATORS: This string is used to tell us the maximum +#. display width for a relative timestamp in "git blame" +#. output. For C locale, "4 years, 11 months ago", which +#. takes 22 places, is the longest among various forms of +#. relative timestamps, but your language may need more or +#. fewer display columns. +#: builtin/blame.c:2601 +msgid "4 years, 11 months ago" +msgstr "4 года и 11 месяцев назад" + +#: builtin/branch.c:24 +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]" + +#: builtin/branch.c:25 +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<опции>] [-l] [-f] <имя-ветки> [<точка-начала>]" + +#: builtin/branch.c:26 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<опции>] [-r] (-d | -D) <имя-ветки>…" + +#: builtin/branch.c:27 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>" + +#: builtin/branch.c:152 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "удаление ветки «%s», которая была слита с\n «%s», но не слита с HEAD." + +#: builtin/branch.c:156 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "не удаление ветки «%s», которая еще не слита с\n «%s», хотя уже слита с HEAD." + +#: builtin/branch.c:170 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Не удалось найти объект коммита для «%s»" + +#: builtin/branch.c:174 +#, 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 "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»." + +#: builtin/branch.c:187 +msgid "Update of config-file failed" +msgstr "Не удалось обновить файл конфигурации" + +#: builtin/branch.c:215 +msgid "cannot use -a with -d" +msgstr "нельзя использовать одновременно ключи -a и -d" + +#: builtin/branch.c:221 +msgid "Couldn't look up commit object for HEAD" +msgstr "Не удалось найти объект коммита для HEAD" + +#: builtin/branch.c:229 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "Нельзя удалить ветку «%s», так как вы сейчас на ней находитесь." + +#: builtin/branch.c:245 +#, c-format +msgid "remote branch '%s' not found." +msgstr "внешняя ветка «%s» не найдена." + +#: builtin/branch.c:246 +#, c-format +msgid "branch '%s' not found." +msgstr "ветка «%s» не найдена." + +#: builtin/branch.c:260 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "Ошибка удаления внешней ветки «%s»" + +#: builtin/branch.c:261 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Ошибка удаления ветки «%s»" + +#: builtin/branch.c:268 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "Внешняя ветка %s удалена (была %s).\n" + +#: builtin/branch.c:269 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Ветка %s удалена (была %s).\n" + +#: builtin/branch.c:370 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "ветка «%s» не указывает на коммит" + +#: builtin/branch.c:459 +#, c-format +msgid "[%s: gone]" +msgstr "[%s: пропал]" + +#: builtin/branch.c:464 +#, c-format +msgid "[%s]" +msgstr "[%s]" + +#: builtin/branch.c:469 +#, c-format +msgid "[%s: behind %d]" +msgstr "[%s: позади %d]" + +#: builtin/branch.c:471 +#, c-format +msgid "[behind %d]" +msgstr "[позади %d]" + +#: builtin/branch.c:475 +#, c-format +msgid "[%s: ahead %d]" +msgstr "[%s: впереди %d]" + +#: builtin/branch.c:477 +#, c-format +msgid "[ahead %d]" +msgstr "[впереди %d]" + +#: builtin/branch.c:480 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "[%s: впереди %d, позади %d]" + +#: builtin/branch.c:483 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "[впереди %d, позади %d]" + +#: builtin/branch.c:496 +msgid " **** invalid ref ****" +msgstr " **** недействительная ссылка ****" + +#: builtin/branch.c:587 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(нет ветки, перемещение %s)" + +#: builtin/branch.c:590 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "(нет ветки, двоичный поиск начат на %s)" + +#: builtin/branch.c:596 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD отделён на %s)" + +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD отделён начиная с %s)" + +#: builtin/branch.c:603 +msgid "(no branch)" +msgstr "(нет ветки)" + +#: builtin/branch.c:650 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "объект «%s» не указывает на коммит" + +#: builtin/branch.c:698 +msgid "some refs could not be read" +msgstr "не удается прочитать некоторые ссылки" + +#: builtin/branch.c:711 +msgid "cannot rename the current branch while not on any." +msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них." + +#: builtin/branch.c:721 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Недействительное имя ветки: «%s»" + +#: builtin/branch.c:736 +msgid "Branch rename failed" +msgstr "Сбой переименования ветки" + +#: builtin/branch.c:740 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Переименована неправильно названная ветка «%s»" + +#: builtin/branch.c:744 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "Ветка переименована в %s, но HEAD не обновлен!" + +#: builtin/branch.c:751 +msgid "Branch is renamed, but update of config-file failed" +msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации" + +#: builtin/branch.c:766 +#, c-format +msgid "malformed object name %s" +msgstr "плохое имя объекта %s" + +#: builtin/branch.c:790 +#, c-format +msgid "could not write branch description template: %s" +msgstr "не удалось записать шаблон описания ветки: %s" + +#: builtin/branch.c:820 +msgid "Generic options" +msgstr "Общие параметры" + +#: builtin/branch.c:822 +msgid "show hash and subject, give twice for upstream branch" +msgstr "показывать хеш-сумму и тему, укажите дважды для вышестоящей ветки" + +#: builtin/branch.c:823 +msgid "suppress informational messages" +msgstr "не выводить информационные сообщения" + +#: builtin/branch.c:824 +msgid "set up tracking mode (see git-pull(1))" +msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))" + +#: builtin/branch.c:826 +msgid "change upstream info" +msgstr "изменить информацию о вышестоящей ветке" + +#: builtin/branch.c:830 +msgid "use colored output" +msgstr "использовать цветной вывод" + +#: builtin/branch.c:831 +msgid "act on remote-tracking branches" +msgstr "выполнить действия на отслеживаемых внешних ветках" + +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616 +#: builtin/tag.c:622 +msgid "commit" +msgstr "коммит" + +#: builtin/branch.c:835 builtin/branch.c:841 +msgid "print only branches that contain the commit" +msgstr "вывод только веток, которые содержат коммит" + +#: builtin/branch.c:847 +msgid "Specific git-branch actions:" +msgstr "Специфичные для git-branch действия:" + +#: builtin/branch.c:848 +msgid "list both remote-tracking and local branches" +msgstr "показать список и отслеживаемых и локальных веток" + +#: builtin/branch.c:850 +msgid "delete fully merged branch" +msgstr "удалить полностью слитую ветку" + +#: builtin/branch.c:851 +msgid "delete branch (even if not merged)" +msgstr "удалить ветку (даже никуда не слитую)" + +#: builtin/branch.c:852 +msgid "move/rename a branch and its reflog" +msgstr "переместить/переименовать ветки и ее журнал ссылок" + +#: builtin/branch.c:853 +msgid "move/rename a branch, even if target exists" +msgstr "переместить/переименовать ветку, даже если целевое имя уже существует" + +#: builtin/branch.c:854 +msgid "list branch names" +msgstr "показать список имен веток" + +#: builtin/branch.c:855 +msgid "create the branch's reflog" +msgstr "создать журнал ссылок ветки" + +#: builtin/branch.c:857 +msgid "edit the description for the branch" +msgstr "изменить описание ветки" + +#: builtin/branch.c:858 +msgid "force creation, move/rename, deletion" +msgstr "принудительное создание, перемещение или удаление ветки" + +#: builtin/branch.c:861 +msgid "print only not merged branches" +msgstr "вывод только не слитых веток" + +#: builtin/branch.c:867 +msgid "print only merged branches" +msgstr "вывод только слитых веток" + +#: builtin/branch.c:871 +msgid "list branches in columns" +msgstr "показать список веток по столбцам" + +#: builtin/branch.c:884 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Не удалось определить HEAD как действительную ссылку." + +#: builtin/branch.c:888 builtin/clone.c:637 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD не найден в refs/heads!" + +#: builtin/branch.c:910 +msgid "--column and --verbose are incompatible" +msgstr "--column и --verbose нельзя использовать одновременно" + +#: builtin/branch.c:921 builtin/branch.c:960 +msgid "branch name required" +msgstr "требуется имя ветки" + +#: builtin/branch.c:936 +msgid "Cannot give description to detached HEAD" +msgstr "Нельзя дать описание отделенному HEAD" + +#: builtin/branch.c:941 +msgid "cannot edit description of more than one branch" +msgstr "нельзя изменить описание более одной ветки за раз" + +#: builtin/branch.c:948 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Еще нет коммита на ветке «%s»." + +#: builtin/branch.c:951 +#, c-format +msgid "No branch named '%s'." +msgstr "Нет ветки с именем «%s»." + +#: builtin/branch.c:966 +msgid "too many branches for a rename operation" +msgstr "слишком много веток для операции переименования" + +#: builtin/branch.c:971 +msgid "too many branches to set new upstream" +msgstr "слишком много веток для указания новых вышестоящих" + +#: builtin/branch.c:975 +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, когда он не указывает ни на одну ветку." + +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 +#, c-format +msgid "no such branch '%s'" +msgstr "нет такой ветки «%s»" + +#: builtin/branch.c:982 +#, c-format +msgid "branch '%s' does not exist" +msgstr "ветка «%s» не существует" + +#: builtin/branch.c:994 +msgid "too many branches to unset upstream" +msgstr "слишком много веток для убирания вышестоящих" + +#: builtin/branch.c:998 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "невозможно убрать вышестоящий репозиторий для HEAD, когда он не указывает ни на одну ветку." + +#: builtin/branch.c:1004 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Ветка «%s» не имеет информации о вышестоящей ветке" + +#: builtin/branch.c:1018 +msgid "it does not make sense to create 'HEAD' manually" +msgstr "не имеет смысла создавать «HEAD» вручную" + +#: builtin/branch.c:1024 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки" + +#: builtin/branch.c:1027 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using " +"--track or --set-upstream-to\n" +msgstr "Флаг --set-upstream устарел и будет удален в будущем. Вместо него используйте --track или --set-upstream-to\n" + +#: builtin/branch.c:1044 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "\nЕсли вы хотите, чтобы «%s» отслеживала «%s», сделайте следующее:\n\n" + +#: builtin/branch.c:1045 +#, c-format +msgid " git branch -d %s\n" +msgstr "git branch -d %s\n" + +#: builtin/branch.c:1046 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s в порядке\n" + +#: 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:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | <тип> | --textconv) <объект>" + +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <список-объектов>" + +#: builtin/cat-file.c:364 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<тип> может быть одним из: blob, tree, commit, tag" + +#: builtin/cat-file.c:365 +msgid "show object type" +msgstr "показать тип объекта" + +#: builtin/cat-file.c:366 +msgid "show object size" +msgstr "показать размер объекта" + +#: builtin/cat-file.c:368 +msgid "exit with zero when there's no error" +msgstr "выйти с нулевым кодом возврата, если нет ошибки" + +#: builtin/cat-file.c:369 +msgid "pretty-print object's content" +msgstr "структурированный вывод содержимого объекта" + +#: builtin/cat-file.c:371 +msgid "for blob objects, run textconv on object's content" +msgstr "запустить texconv на содержимом двоичных объектов " + +#: builtin/cat-file.c:373 +msgid "show info and content of objects fed from the standard input" +msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода" + +#: builtin/cat-file.c:376 +msgid "show info about objects fed from the standard input" +msgstr "показать информацию об объектах, переданных из стандартного ввода" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…" + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…] < <список путей>" + +#: 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 "использовать только .gitattributes из индекса" + +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +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:1107 builtin/gc.c:274 +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 "нельзя указывать пути вместе с параметром --stdin" + +#: builtin/check-ignore.c:157 +msgid "-z only makes sense with --stdin" +msgstr "-z имеет смысл только вместе с параметром --stdin" + +#: 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 "--quiet можно использовать только при указании одного пути" + +#: builtin/check-ignore.c:165 +msgid "cannot have both --quiet and --verbose" +msgstr "нельзя использовать одновременно --quiet и --verbose" + +#: builtin/check-ignore.c:168 +msgid "--non-matching is only valid with --verbose" +msgstr "--non-matching можно использовать только вместе с --verbose" + +#: builtin/check-mailmap.c:8 +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<опции>] <контакт>…" + +#: builtin/check-mailmap.c:13 +msgid "also read contacts from stdin" +msgstr "также читать контакты из стандартного ввода" + +#: builtin/check-mailmap.c:24 +#, c-format +msgid "unable to parse contact: %s" +msgstr "не удалось разобрать контакт: %s" + +#: builtin/check-mailmap.c:47 +msgid "no contacts specified" +msgstr "не указаны контакты" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<опции>] [--] [<файл>…]" + +#: builtin/checkout-index.c:188 +msgid "check out all files in the index" +msgstr "перейти на состояние всех файлов из индекса" + +#: builtin/checkout-index.c:189 +msgid "force overwrite of existing files" +msgstr "принудительная перезапись существующих файлов" + +#: builtin/checkout-index.c:191 +msgid "no warning for existing files and files not in index" +msgstr "не выводить предупреждения для существующих и непроиндексированных файлов" + +#: builtin/checkout-index.c:193 +msgid "don't checkout new files" +msgstr "не создавать новые файлы" + +#: builtin/checkout-index.c:195 +msgid "update stat information in the index file" +msgstr "обновить статистику доступа в файле индекса" + +#: builtin/checkout-index.c:201 +msgid "read list of paths from the standard input" +msgstr "прочитать список путей из стандартного ввода" + +#: builtin/checkout-index.c:203 +msgid "write the content to temporary files" +msgstr "записать содержимое во временные файлы" + +#: builtin/checkout-index.c:204 builtin/column.c:30 +msgid "string" +msgstr "строка" + +#: builtin/checkout-index.c:205 +msgid "when creating files, prepend <string>" +msgstr "добавить спереди <строку> при создании файлов" + +#: builtin/checkout-index.c:208 +msgid "copy out the files from named stage" +msgstr "копировать файлы из указанного индекса" + +#: builtin/checkout.c:25 +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<опции>] <ветка>" + +#: builtin/checkout.c:26 +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<опции>] [<ветка>] -- <файл>…" + +#: builtin/checkout.c:132 builtin/checkout.c:165 +#, c-format +msgid "path '%s' does not have our version" +msgstr "путь «%s» не имеет нашей версии" + +#: builtin/checkout.c:134 builtin/checkout.c:167 +#, c-format +msgid "path '%s' does not have their version" +msgstr "путь «%s» не имеет их версии" + +#: builtin/checkout.c:150 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "путь «%s» не имеет всех необходимых версий" + +#: builtin/checkout.c:194 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "путь «%s» не имеет необходимых версий" + +#: builtin/checkout.c:211 +#, c-format +msgid "path '%s': cannot merge" +msgstr "путь «%s»: не удалось слить" + +#: builtin/checkout.c:228 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Не удалось добавить результат слияния «%s»" + +#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 +#: builtin/checkout.c:258 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "«%s» нельзя использовать при обновлении путей" + +#: builtin/checkout.c:261 builtin/checkout.c:264 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "«%s» нельзя использовать одновременно с %s" + +#: builtin/checkout.c:267 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно." + +#: builtin/checkout.c:278 builtin/checkout.c:467 +msgid "corrupt index file" +msgstr "файл индекса поврежден" + +#: builtin/checkout.c:338 builtin/checkout.c:345 +#, c-format +msgid "path '%s' is unmerged" +msgstr "путь «%s» не слит" + +#: builtin/checkout.c:489 +msgid "you need to resolve your current index first" +msgstr "сначала нужно разрешить конфликты в вашем текущем индексе" + +#: builtin/checkout.c:615 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Не удалось создать журнал ссылок для «%s»\n" + +#: builtin/checkout.c:653 +msgid "HEAD is now at" +msgstr "HEAD сейчас на" + +#: builtin/checkout.c:660 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Сброс ветки «%s»\n" + +#: builtin/checkout.c:663 +#, c-format +msgid "Already on '%s'\n" +msgstr "Уже на «%s»\n" + +#: builtin/checkout.c:667 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Переключение и сброс ветки «%s»\n" + +#: builtin/checkout.c:669 builtin/checkout.c:1050 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Переключено на новую ветку «%s»\n" + +#: builtin/checkout.c:671 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Переключено на ветку «%s»\n" + +#: builtin/checkout.c:723 +#, c-format +msgid " ... and %d more.\n" +msgstr " … и еще %d.\n" + +#: builtin/checkout.c:729 +#, 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] "Предупреждение: вы оставляете позади %d коммит не соединенную ни с одной из ваших веток:\n\n%s\n" +msgstr[1] "Предупреждение: вы оставляете позади %d коммита не соединенные ни с одной из ваших веток:\n\n%s\n" +msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" + +#: builtin/checkout.c:747 +#, 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 "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" + +#: builtin/checkout.c:777 +msgid "internal error in revision walk" +msgstr "внутренняя ошибка при хождении по редакциям" + +#: builtin/checkout.c:781 +msgid "Previous HEAD position was" +msgstr "Предыдущая позиция HEAD была" + +#: builtin/checkout.c:808 builtin/checkout.c:1045 +msgid "You are on a branch yet to be born" +msgstr "Вы находитесь на еще не созданной ветке" + +#: builtin/checkout.c:952 +#, c-format +msgid "only one reference expected, %d given." +msgstr "ожидается только одна ссылка, а передано %d." + +#: builtin/checkout.c:991 +#, c-format +msgid "invalid reference: %s" +msgstr "неправильная ссылка: %s" + +#: builtin/checkout.c:1020 +#, c-format +msgid "reference is not a tree: %s" +msgstr "в дереве нет такой ссылки: %s" + +#: builtin/checkout.c:1059 +msgid "paths cannot be used with switching branches" +msgstr "нельзя использовать пути при переключении веток" + +#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "нельзя использовать «%s» при переключении веток" + +#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 +#: builtin/checkout.c:1081 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "«%s» нельзя использовать одновременно с «%s»" + +#: builtin/checkout.c:1086 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Нельзя переключить ветку на не коммит «%s»" + +#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/remote.c:159 builtin/remote.c:161 +msgid "branch" +msgstr "ветка" + +#: builtin/checkout.c:1109 +msgid "create and checkout a new branch" +msgstr "создать и перейти на новую ветку" + +#: builtin/checkout.c:1111 +msgid "create/reset and checkout a branch" +msgstr "создать/сбросить и перейти на новую ветку" + +#: builtin/checkout.c:1112 +msgid "create reflog for new branch" +msgstr "создать журнал ссылок для новой ветки" + +#: builtin/checkout.c:1113 +msgid "detach the HEAD at named commit" +msgstr "отсоединить HEAD на указанном коммите" + +#: builtin/checkout.c:1114 +msgid "set upstream info for new branch" +msgstr "установить информацию о вышестоящей ветке для новой ветки" + +#: builtin/checkout.c:1116 +msgid "new-branch" +msgstr "новая-ветка" + +#: builtin/checkout.c:1116 +msgid "new unparented branch" +msgstr "новая ветка без родителей" + +#: builtin/checkout.c:1117 +msgid "checkout our version for unmerged files" +msgstr "перейти на нашу версию для не слитых файлов" + +#: builtin/checkout.c:1119 +msgid "checkout their version for unmerged files" +msgstr "перейти на их версию для не слитых файлов" + +#: builtin/checkout.c:1121 +msgid "force checkout (throw away local modifications)" +msgstr "принудительный переход (отбрасывает все локальные изменения)" + +#: builtin/checkout.c:1122 +msgid "perform a 3-way merge with the new branch" +msgstr "выполнить трехходовое слияние с новой веткой" + +#: builtin/checkout.c:1123 builtin/merge.c:227 +msgid "update ignored files (default)" +msgstr "обновить игнорируемые файлы (по умолчанию)" + +#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +msgid "style" +msgstr "стиль" + +#: builtin/checkout.c:1125 +msgid "conflict style (merge or diff3)" +msgstr "стиль конфликтов слияния (merge или diff3)" + +#: builtin/checkout.c:1128 +msgid "do not limit pathspecs to sparse entries only" +msgstr "не ограничивать спецификаторы пути только частичными записями" + +#: builtin/checkout.c:1130 +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "пересмотр «git checkout <no-such-branch>»" + +#: builtin/checkout.c:1153 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-b, -B и --orphan нельзя использовать одновременно" + +#: builtin/checkout.c:1170 +msgid "--track needs a branch name" +msgstr "--track требует имя ветки" + +#: builtin/checkout.c:1175 +msgid "Missing branch name; try -b" +msgstr "Пропущено имя ветки; попробуйте -b" + +#: builtin/checkout.c:1212 +msgid "invalid path specification" +msgstr "неправильная спецификация пути" + +#: builtin/checkout.c:1219 +#, 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 "Нельзя обновить пути и одновременно переключить на ветку «%s».\nВы хотели переключиться на «%s», что не может быть определено как коммит?" + +#: builtin/checkout.c:1224 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout: --detach не принимает путь «%s» как аргумент" + +#: builtin/checkout.c:1228 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "git checkout: --ours/--theirs, --force and --merge нельзя использовать одновременно при применении состояния индекса." + +#: builtin/clean.c:26 +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…" + +#: builtin/clean.c:30 +#, c-format +msgid "Removing %s\n" +msgstr "Удаление %s\n" + +#: builtin/clean.c:31 +#, c-format +msgid "Would remove %s\n" +msgstr "Будет удалено %s\n" + +#: builtin/clean.c:32 +#, c-format +msgid "Skipping repository %s\n" +msgstr "Пропуск репозитория %s\n" + +#: builtin/clean.c:33 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Будет пропущен репозиторий %s\n" + +#: builtin/clean.c:34 +#, c-format +msgid "failed to remove %s" +msgstr "сбой удаления %s" + +#: builtin/clean.c:295 +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing" +msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего" + +#: builtin/clean.c:299 +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 "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение" + +#: builtin/clean.c:517 +#, c-format +msgid "Huh (%s)?" +msgstr "Хм (%s)?" + +#: 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 "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s" + +#: builtin/clean.c:717 +msgid "Select items to delete" +msgstr "Укажите элементы для удаления" + +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 +#, c-format +msgid "Remove %s [y/N]? " +msgstr "Удалить %s [y - да/N - нет]? " + +#: builtin/clean.c:783 +msgid "Bye." +msgstr "До свидания." + +#: builtin/clean.c:791 +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению" + +#: builtin/clean.c:818 +msgid "*** Commands ***" +msgstr "*** Команды ***" + +#: builtin/clean.c:819 +msgid "What now" +msgstr "Что теперь" + +#: builtin/clean.c:827 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "Удалить следующие элементы:" +msgstr[1] "Удалить следующие элементы:" +msgstr[2] "Удалить следующие элементы:" + +#: builtin/clean.c:844 +msgid "No more files to clean, exiting." +msgstr "Больше нет файлов для очистки, выходим." + +#: builtin/clean.c:875 +msgid "do not print names of files removed" +msgstr "не выводить имена удаляемых файлов" + +#: builtin/clean.c:877 +msgid "force" +msgstr "принудительно" + +#: builtin/clean.c:878 +msgid "interactive cleaning" +msgstr "интерактивная очистка" + +#: builtin/clean.c:880 +msgid "remove whole directories" +msgstr "удалить каталоги полностью" + +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +msgid "pattern" +msgstr "шаблон" + +#: builtin/clean.c:882 +msgid "add <pattern> to ignore rules" +msgstr "добавить <шаблон> в правила игнорирования" + +#: builtin/clean.c:883 +msgid "remove ignored files, too" +msgstr "также удалить игнорируемые файлы" + +#: builtin/clean.c:885 +msgid "remove only ignored files" +msgstr "удалить только игнорируемые файлы" + +#: builtin/clean.c:903 +msgid "-x and -X cannot be used together" +msgstr "нельзя использовать одновременно -x и -X" + +#: builtin/clean.c:907 +msgid "" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to" +" clean" +msgstr "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не указана; отказ очистки" + +#: builtin/clean.c:910 +msgid "" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" +msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки" + +#: builtin/clone.c:37 +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]" + +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 +msgid "force progress reporting" +msgstr "принудительно выводить прогресс" + +#: builtin/clone.c:68 +msgid "don't create a checkout" +msgstr "не переключать рабочую копию на HEAD" + +#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +msgid "create a bare repository" +msgstr "создать голый репозиторий" + +#: builtin/clone.c:73 +msgid "create a mirror repository (implies bare)" +msgstr "создать зеркало репозитория (включает в себя и параметр bare)" + +#: builtin/clone.c:75 +msgid "to clone from a local repository" +msgstr "для клонирования из локального репозитория" + +#: builtin/clone.c:77 +msgid "don't use local hardlinks, always copy" +msgstr "не использовать жесткие ссылки, всегда копировать файлы" + +#: builtin/clone.c:79 +msgid "setup as shared repository" +msgstr "настроить как общедоступный репозиторий" + +#: builtin/clone.c:81 builtin/clone.c:83 +msgid "initialize submodules in the clone" +msgstr "инициализировать подмодули в клоне" + +#: builtin/clone.c:84 builtin/init-db.c:493 +msgid "template-directory" +msgstr "каталог-шаблонов" + +#: builtin/clone.c:85 builtin/init-db.c:494 +msgid "directory from which templates will be used" +msgstr "каталог, шаблоны из которого будут использованы" + +#: builtin/clone.c:87 +msgid "reference repository" +msgstr "ссылаемый репозиторий" + +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "имя" + +#: builtin/clone.c:89 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория" + +#: builtin/clone.c:91 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "перейти на <ветку>, вместо HEAD внешнего репозитория" + +#: builtin/clone.c:93 +msgid "path to git-upload-pack on the remote" +msgstr "путь к git-upload-pack на внешнем репозитории" + +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +msgid "depth" +msgstr "глубина" + +#: builtin/clone.c:95 +msgid "create a shallow clone of that depth" +msgstr "сделать частичный клон указанной глубины" + +#: builtin/clone.c:97 +msgid "clone only one branch, HEAD or --branch" +msgstr "клонировать только одну ветку, HEAD или --branch" + +#: builtin/clone.c:99 +msgid "use --reference only while cloning" +msgstr "используйте --reference только при клонировании" + +#: builtin/clone.c:100 builtin/init-db.c:502 +msgid "gitdir" +msgstr "каталог-git" + +#: builtin/clone.c:101 builtin/init-db.c:503 +msgid "separate git dir from working tree" +msgstr "разместить каталог git отдельно от рабочей копии" + +#: builtin/clone.c:102 +msgid "key=value" +msgstr "ключ=значение" + +#: builtin/clone.c:103 +msgid "set config inside the new repository" +msgstr "установить параметры внутри нового репозитория" + +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "ссылаемый репозиторий «%s» не является локальным." + +#: builtin/clone.c:260 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "ссылаемый репозиторий «%s» является частичным" + +#: builtin/clone.c:263 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "ссылаемый репозиторий «%s» является сращенным" + +#: builtin/clone.c:325 +#, c-format +msgid "failed to create directory '%s'" +msgstr "не удалось создать каталог «%s»" + +#: builtin/clone.c:327 builtin/diff.c:84 +#, c-format +msgid "failed to stat '%s'" +msgstr "не удалось выполнить stat «%s»" + +#: builtin/clone.c:329 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s уже существует и не является каталогом" + +#: builtin/clone.c:343 +#, c-format +msgid "failed to stat %s\n" +msgstr "не удалось выполнить stat %s\n" + +#: builtin/clone.c:365 +#, c-format +msgid "failed to create link '%s'" +msgstr "не удалось создать ссылку «%s»" + +#: builtin/clone.c:369 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "не удалось копировать файл в «%s»" + +#: builtin/clone.c:392 builtin/clone.c:566 +#, c-format +msgid "done.\n" +msgstr "готово.\n" + +#: builtin/clone.c:404 +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 "Клонирование прошло успешно, но во время перехода на версию произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены, а повторить попытку перехода на версию с помощью «git checkout -f HEAD»\n" + +#: builtin/clone.c:481 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "Не удалось найти внешнюю ветку %s для клонирования." + +#: builtin/clone.c:561 +#, c-format +msgid "Checking connectivity... " +msgstr "Проверка соединения… " + +#: builtin/clone.c:564 +msgid "remote did not send all necessary objects" +msgstr "внешний репозиторий прислал не все необходимые объекты" + +#: builtin/clone.c:628 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя перейти на такую версию.\n" + +#: builtin/clone.c:659 +msgid "unable to checkout working tree" +msgstr "не удалось перейти на версию в рабочем каталоге" + +#: builtin/clone.c:746 +msgid "cannot repack to clean up" +msgstr "не удалось выполнить перепаковку для очистки" + +#: builtin/clone.c:748 +msgid "cannot unlink temporary alternates file" +msgstr "не удалось отсоединить временные альтернативные файлы" + +#: builtin/clone.c:778 +msgid "Too many arguments." +msgstr "Слишком много аргументов." + +#: builtin/clone.c:782 +msgid "You must specify a repository to clone." +msgstr "Вы должны указать репозиторий для клонирования." + +#: builtin/clone.c:793 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "--bare и --origin %s нельзя использовать одновременно." + +#: builtin/clone.c:796 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "--bare и --separate-git-dir нельзя использовать одновременно." + +#: builtin/clone.c:809 +#, c-format +msgid "repository '%s' does not exist" +msgstr "репозиторий «%s» не существует" + +#: builtin/clone.c:815 builtin/fetch.c:1156 +#, c-format +msgid "depth %s is not a positive number" +msgstr "глубина %s не является положительным числом" + +#: builtin/clone.c:825 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "целевой путь «%s» уже существует и не является пустым каталогом." + +#: builtin/clone.c:835 +#, c-format +msgid "working tree '%s' already exists." +msgstr "рабочий каталог «%s» уже существует." + +#: builtin/clone.c:850 builtin/clone.c:861 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "не удалось создать родительские каталоги для «%s»" + +#: builtin/clone.c:853 +#, c-format +msgid "could not create work tree dir '%s'" +msgstr "не удалось создать рабочий каталог «%s»" + +#: builtin/clone.c:871 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Клонирование в голый репозиторий «%s»…\n" + +#: builtin/clone.c:873 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Клонирование в «%s»…\n" + +#: builtin/clone.c:898 +msgid "--dissociate given, but there is no --reference" +msgstr "передана опция --dissociate, но не передана --reference" + +#: builtin/clone.c:913 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://." + +#: builtin/clone.c:916 +msgid "source repository is shallow, ignoring --local" +msgstr "исходный репозиторий является частичным, --local игнорируется" + +#: builtin/clone.c:921 +msgid "--local is ignored" +msgstr "--local игнорируется" + +#: builtin/clone.c:925 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Не знаю как клонировать %s" + +#: builtin/clone.c:976 builtin/clone.c:984 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s" + +#: builtin/clone.c:987 +msgid "You appear to have cloned an empty repository." +msgstr "Похоже, что вы клонировали пустой репозиторий." + +#: builtin/column.c:9 +msgid "git column [<options>]" +msgstr "git column [<опции>]" + +#: 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 "параметр --command должен быть первым" + +#: builtin/commit.c:37 +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<опции>] [--] <спецификация-пути>…" + +#: builtin/commit.c:42 +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<опции>] [--] <спецификация-пути>…" + +#: builtin/commit.c:47 +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. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" + +#: builtin/commit.c:60 +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 "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n git config --global user.name \"Ваше Имя\"\n git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" + +#: builtin/commit.c:72 +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 "Вы попросили исправить последний коммит, но делая это вы сделаете\nпустой коммит. Вы можете повторить эту команду с опцией --allow-empty\nили вы можете удалить коммит полностью с помощью команды \n«git reset HEAD^».\n" + +#: builtin/commit.c:77 +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 "Предыдущий отбор лучшего теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n git commit --allow-empty\n\n" + +#: builtin/commit.c:84 +msgid "Otherwise, please use 'git reset'\n" +msgstr "В противном случае, используйте «git reset»\n" + +#: builtin/commit.c:87 +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 "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит отбор лучшего\nв оставшихся коммитах.\n" + +#: builtin/commit.c:302 +msgid "failed to unpack HEAD tree object" +msgstr "сбой распаковки объекта дерева HEAD" + +#: builtin/commit.c:342 +msgid "unable to create temporary index" +msgstr "не удалось создать временный индекс" + +#: builtin/commit.c:348 +msgid "interactive add failed" +msgstr "сбой интерактивного добавления" + +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "не удалось записать индекс" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "не удалось обновить временный индекс" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "Сбой при обновлении основного кэша дерева" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 +msgid "unable to write new_index file" +msgstr "не удалось записать файл new_index" + +#: builtin/commit.c:443 +msgid "cannot do a partial commit during a merge." +msgstr "нельзя создать частичный коммит во время слияния." + +#: builtin/commit.c:445 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "нельзя создать частичный коммит во время отбора лучшего коммита." + +#: builtin/commit.c:454 +msgid "cannot read the index" +msgstr "не удалось прочитать индекс" + +#: builtin/commit.c:473 +msgid "unable to write temporary index file" +msgstr "не удалось записать временный файл индекса" + +#: builtin/commit.c:578 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "у коммита «%s» отсутствует автор в заголовке" + +#: builtin/commit.c:580 +#, c-format +msgid "commit '%s' has malformed author line" +msgstr "у коммита «%s» автор в неверном формате" + +#: builtin/commit.c:599 +msgid "malformed --author parameter" +msgstr "параметр --author в неверном формате" + +#: builtin/commit.c:607 +#, c-format +msgid "invalid date format: %s" +msgstr "неправильный формат даты: %s" + +#: builtin/commit.c:651 +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита" + +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078 +#, c-format +msgid "could not lookup commit %s" +msgstr "не удалось запросить коммит %s" + +#: builtin/commit.c:700 builtin/shortlog.c:273 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(чтение файла журнала из стандартного ввода)\n" + +#: builtin/commit.c:702 +msgid "could not read log from standard input" +msgstr "не удалось прочитать файл журнала из стандартного ввода" + +#: builtin/commit.c:706 +#, c-format +msgid "could not read log file '%s'" +msgstr "не удалось прочитать файл журнала «%s»" + +#: builtin/commit.c:728 +msgid "could not read MERGE_MSG" +msgstr "не удалось прочитать MERGE_MSG" + +#: builtin/commit.c:732 +msgid "could not read SQUASH_MSG" +msgstr "не удалось прочитать SQUASH_MSG" + +#: builtin/commit.c:736 +#, c-format +msgid "could not read '%s'" +msgstr "не удалось прочитать «%s»" + +#: builtin/commit.c:783 +msgid "could not write commit template" +msgstr "не удалось записать шаблон описания коммита" + +#: builtin/commit.c:801 +#, 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 "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" + +#: builtin/commit.c:806 +#, 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 "\nПохоже, что вы пытаетесь закоммитить отбор лучшего.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" + +#: builtin/commit.c:819 +#, 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 "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n" + +#: builtin/commit.c:826 +#, 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 "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n" + +#: builtin/commit.c:846 +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "%sАвтор: %.*s <%.*s>" + +#: builtin/commit.c:854 +#, c-format +msgid "%sDate: %s" +msgstr "%sДата: %s" + +#: builtin/commit.c:861 +#, c-format +msgid "%sCommitter: %.*s <%.*s>" +msgstr "%sКоммитер: %.*s <%.*s>" + +#: builtin/commit.c:879 +msgid "Cannot read index" +msgstr "Не удалось прочитать индекс" + +#: builtin/commit.c:936 +msgid "Error building trees" +msgstr "Ошибка при построении деревьев" + +#: builtin/commit.c:951 builtin/tag.c:495 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n" + +#: builtin/commit.c:1053 +#, c-format +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором" + +#: builtin/commit.c:1068 builtin/commit.c:1308 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Неправильный режим неотслеживаемых файлов «%s»" + +#: builtin/commit.c:1105 +msgid "--long and -z are incompatible" +msgstr "--long и -z нельзя использовать одновременно" + +#: builtin/commit.c:1135 +msgid "Using both --reset-author and --author does not make sense" +msgstr "Указание одновременно опций --reset-author и --author не имеет смысла" + +#: builtin/commit.c:1144 +msgid "You have nothing to amend." +msgstr "Нечего исправлять." + +#: builtin/commit.c:1147 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Вы в процессе слияния — сейчас нельзя исправлять." + +#: builtin/commit.c:1149 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "Вы в процессе отбора лучшего — сейчас нельзя исправлять." + +#: builtin/commit.c:1152 +msgid "Options --squash and --fixup cannot be used together" +msgstr "Опции --squash и --fixup не могут использоваться одновременно" + +#: builtin/commit.c:1162 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup." + +#: builtin/commit.c:1164 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "Опция -m не может использоваться с -c/-C/-F/--fixup." + +#: builtin/commit.c:1172 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend." + +#: builtin/commit.c:1189 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch." + +#: builtin/commit.c:1191 +msgid "No paths with --include/--only does not make sense." +msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла." + +#: builtin/commit.c:1193 +msgid "Clever... amending the last one with dirty index." +msgstr "Умно… отмена последнего с измененным индексом." + +#: builtin/commit.c:1195 +msgid "Explicit paths specified without -i or -o; assuming --only paths..." +msgstr "Пути явно указаны пути без опций -i или -o; предполагаю опцию --only…" + +#: builtin/commit.c:1207 builtin/tag.c:728 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Неправильное значение режима очистки %s" + +#: builtin/commit.c:1212 +msgid "Paths with -a does not make sense." +msgstr "С опцией -a указание пути не имеет смысла." + +#: builtin/commit.c:1322 builtin/commit.c:1602 +msgid "show status concisely" +msgstr "кратко показать статус" + +#: builtin/commit.c:1324 builtin/commit.c:1604 +msgid "show branch information" +msgstr "показать информацию о версии" + +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509 +msgid "machine-readable output" +msgstr "машиночитаемый вывод" + +#: builtin/commit.c:1329 builtin/commit.c:1608 +msgid "show status in long format (default)" +msgstr "показать статус в длинном формате (по умолчанию)" + +#: builtin/commit.c:1332 builtin/commit.c:1611 +msgid "terminate entries with NUL" +msgstr "завершать записи НУЛЕВЫМ байтом" + +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 +msgid "mode" +msgstr "режим" + +#: builtin/commit.c:1335 builtin/commit.c:1614 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)" + +#: builtin/commit.c:1338 +msgid "show ignored files" +msgstr "показать игнорируемые файлы" + +#: builtin/commit.c:1339 parse-options.h:153 +msgid "when" +msgstr "когда" + +#: builtin/commit.c:1340 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)" + +#: builtin/commit.c:1342 +msgid "list untracked files in columns" +msgstr "показать неотслеживаемые файлы по столбцам" + +#: builtin/commit.c:1429 +msgid "couldn't look up newly created commit" +msgstr "нельзя запросить новосозданный коммит" + +#: builtin/commit.c:1431 +msgid "could not parse newly created commit" +msgstr "нельзя разобрать новосозданный коммит" + +#: builtin/commit.c:1476 +msgid "detached HEAD" +msgstr "отделенный HEAD" + +#: builtin/commit.c:1479 +msgid " (root-commit)" +msgstr " (корневой коммит)" + +#: builtin/commit.c:1572 +msgid "suppress summary after successful commit" +msgstr "не выводить сводку после успешного коммита" + +#: builtin/commit.c:1573 +msgid "show diff in commit message template" +msgstr "добавить список изменений в шаблон сообщения коммита" + +#: builtin/commit.c:1575 +msgid "Commit message options" +msgstr "Опции сообщения коммита" + +#: builtin/commit.c:1576 builtin/tag.c:601 +msgid "read message from file" +msgstr "прочитать сообщение из файла" + +#: builtin/commit.c:1577 +msgid "author" +msgstr "автор" + +#: builtin/commit.c:1577 +msgid "override author for commit" +msgstr "подменить автора коммита" + +#: builtin/commit.c:1578 builtin/gc.c:275 +msgid "date" +msgstr "дата" + +#: builtin/commit.c:1578 +msgid "override date for commit" +msgstr "подменить дату коммита" + +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/notes.c:554 builtin/tag.c:599 +msgid "message" +msgstr "сообщение" + +#: builtin/commit.c:1579 +msgid "commit message" +msgstr "сообщение коммита" + +#: builtin/commit.c:1580 +msgid "reuse and edit message from specified commit" +msgstr "использовать и отредактировать сообщение от указанного коммита" + +#: builtin/commit.c:1581 +msgid "reuse message from specified commit" +msgstr "использовать сообщение указанного коммита" + +#: builtin/commit.c:1582 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита" + +#: builtin/commit.c:1583 +msgid "use autosquash formatted message to squash specified commit" +msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита" + +#: builtin/commit.c:1584 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "коммит теперь за моим авторством (с использованием -C/-c/--amend)" + +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86 +msgid "add Signed-off-by:" +msgstr "добавить Signed-off-by:" + +#: builtin/commit.c:1586 +msgid "use specified template file" +msgstr "использовать указанный файл шаблона" + +#: builtin/commit.c:1587 +msgid "force edit of commit" +msgstr "принудительно редактировать коммит" + +#: builtin/commit.c:1588 +msgid "default" +msgstr "по-умолчанию" + +#: builtin/commit.c:1588 builtin/tag.c:604 +msgid "how to strip spaces and #comments from message" +msgstr "как удалять пробелы и #комментарии из сообщения коммита" + +#: builtin/commit.c:1589 +msgid "include status in commit message template" +msgstr "включить статус файлов в шаблон сообщения коммита" + +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/tag.c:605 +msgid "key-id" +msgstr "key-id" + +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93 +msgid "GPG sign commit" +msgstr "подписать коммит с помощью GPG" + +#: builtin/commit.c:1594 +msgid "Commit contents options" +msgstr "Опции содержимого коммита" + +#: builtin/commit.c:1595 +msgid "commit all changed files" +msgstr "закоммитить все измененные файлы" + +#: builtin/commit.c:1596 +msgid "add specified files to index for commit" +msgstr "добавить указанные файлы в индекс для коммита" + +#: builtin/commit.c:1597 +msgid "interactively add files" +msgstr "интерактивное добавление файлов" + +#: builtin/commit.c:1598 +msgid "interactively add changes" +msgstr "интерактивное добавление изменений" + +#: builtin/commit.c:1599 +msgid "commit only specified files" +msgstr "закоммитить только указанные файлы" + +#: builtin/commit.c:1600 +msgid "bypass pre-commit hook" +msgstr "пропустить перехватчик перед-коммитом" + +#: builtin/commit.c:1601 +msgid "show what would be committed" +msgstr "показать, что будет закоммичено" + +#: builtin/commit.c:1612 +msgid "amend previous commit" +msgstr "исправить предыдущий коммит" + +#: builtin/commit.c:1613 +msgid "bypass post-rewrite hook" +msgstr "пропустить перехватчик после-перезаписи" + +#: builtin/commit.c:1618 +msgid "ok to record an empty change" +msgstr "разрешить запись пустого коммита" + +#: builtin/commit.c:1620 +msgid "ok to record a change with an empty message" +msgstr "разрешить запись изменений с пустым сообщением" + +#: builtin/commit.c:1649 +msgid "could not parse HEAD commit" +msgstr "не удалось разобрать HEAD коммит" + +#: builtin/commit.c:1688 builtin/merge.c:519 +#, c-format +msgid "could not open '%s' for reading" +msgstr "не удалось открыть «%s» для чтения" + +#: builtin/commit.c:1695 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Файл MERGE_HEAD поврежден (%s)" + +#: builtin/commit.c:1702 +msgid "could not read MERGE_MODE" +msgstr "не удалось прочитать MERGE_MODE" + +#: builtin/commit.c:1721 +#, c-format +msgid "could not read commit message: %s" +msgstr "не удалось открыть сообщение коммита: %s" + +#: builtin/commit.c:1732 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Отмена коммита; вы не изменили сообщение.\n" + +#: builtin/commit.c:1737 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Отмена коммита из-за пустого сообщения коммита.\n" + +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876 +msgid "failed to write commit object" +msgstr "сбой записи объекта коммита" + +#: builtin/commit.c:1785 +msgid "" +"Repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full and quota is\n" +"not exceeded, and then \"git reset HEAD\" to recover." +msgstr "Репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git reset HEAD» для восстановления." + +#: builtin/config.c:8 +msgid "git config [<options>]" +msgstr "git config [<опции>]" + +#: builtin/config.c:53 +msgid "Config file location" +msgstr "Размещение файла конфигурации" + +#: builtin/config.c:54 +msgid "use global config file" +msgstr "использовать глобальный файл конфигурации" + +#: builtin/config.c:55 +msgid "use system config file" +msgstr "использовать системный файл конфигурации" + +#: builtin/config.c:56 +msgid "use repository config file" +msgstr "использовать файл конфигурации репозитория" + +#: builtin/config.c:57 +msgid "use given config file" +msgstr "использовать указанный файл конфигурации" + +#: builtin/config.c:58 +msgid "blob-id" +msgstr "идент-двоичн-объекта" + +#: builtin/config.c:58 +msgid "read config from given blob object" +msgstr "прочитать настройки из указанного двоичного объекта" + +#: builtin/config.c:59 +msgid "Action" +msgstr "Действие" + +#: builtin/config.c:60 +msgid "get value: name [value-regex]" +msgstr "получить значение: имя [шаблон-значений]" + +#: builtin/config.c:61 +msgid "get all values: key [value-regex]" +msgstr "получить все значения: ключ [шаблон-значений]" + +#: builtin/config.c:62 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]" + +#: builtin/config.c:63 +msgid "get value specific for the URL: section[.var] URL" +msgstr "получить значение, специфичное для URL: раздел[.переменная] URL" + +#: builtin/config.c:64 +msgid "replace all matching variables: name value [value_regex]" +msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]" + +#: builtin/config.c:65 +msgid "add a new variable: name value" +msgstr "добавить новую переменную: имя значение" + +#: builtin/config.c:66 +msgid "remove a variable: name [value-regex]" +msgstr "удалить переменную: имя [шаблон-значений]" + +#: builtin/config.c:67 +msgid "remove all matches: name [value-regex]" +msgstr "удалить все совпадающие: имя [шаблон-значений]" + +#: builtin/config.c:68 +msgid "rename section: old-name new-name" +msgstr "переименовать раздел: старое-имя новое-имя" + +#: builtin/config.c:69 +msgid "remove a section: name" +msgstr "удалить раздел: имя" + +#: builtin/config.c:70 +msgid "list all" +msgstr "показать весь список" + +#: builtin/config.c:71 +msgid "open an editor" +msgstr "открыть в редакторе" + +#: builtin/config.c:72 +msgid "find the color configured: slot [default]" +msgstr "найти настроенный цвет: раздел [по-умолчанию]" + +#: builtin/config.c:73 +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]" + +#: builtin/config.c:74 +msgid "Type" +msgstr "Тип" + +#: builtin/config.c:75 +msgid "value is \"true\" or \"false\"" +msgstr "значение — это «true» (правда) или «false» (ложь)" + +#: builtin/config.c:76 +msgid "value is decimal number" +msgstr "значение — это десятичное число" + +#: builtin/config.c:77 +msgid "value is --bool or --int" +msgstr "значение — это --bool или --int" + +#: builtin/config.c:78 +msgid "value is a path (file or directory name)" +msgstr "значение — это путь (к файлу или каталогу)" + +#: builtin/config.c:79 +msgid "Other" +msgstr "Другое" + +#: builtin/config.c:80 +msgid "terminate values with NUL byte" +msgstr "завершать значения НУЛЕВЫМ байтом" + +#: builtin/config.c:81 +msgid "respect include directives on lookup" +msgstr "учитывать директивы include (включения файлов) при запросе" + +#: builtin/config.c:316 +msgid "unable to parse default color value" +msgstr "не удалось разобрать значение цвета по умолчанию" + +#: builtin/config.c:457 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "# Это файл конфигурации пользователя Git.\n[core]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n" + +#: builtin/config.c:589 +#, c-format +msgid "cannot create configuration file %s" +msgstr "не удалось создать файл конфигурации %s" + +#: builtin/count-objects.c:55 +msgid "git count-objects [-v] [-H | --human-readable]" +msgstr "git count-objects [-v] [-H | --human-readable]" + +#: builtin/count-objects.c:65 +msgid "print sizes in human readable format" +msgstr "вывод размеров в удобочитаемом для человека виде" + +#: builtin/describe.c:17 +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<опции>] [<указатель-коммита>…]" + +#: builtin/describe.c:18 +msgid "git describe [<options>] --dirty" +msgstr "git describe [<опции>] --dirty" + +#: builtin/describe.c:217 +#, c-format +msgid "annotated tag %s not available" +msgstr "аннотированная метка %s не доступна" + +#: builtin/describe.c:221 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "аннотированная метка %s не содержит встроенного названия" + +#: builtin/describe.c:223 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "метка «%s» уже здесь «%s»" + +#: builtin/describe.c:250 builtin/log.c:452 +#, c-format +msgid "Not a valid object name %s" +msgstr "Недействительное имя объекта %s" + +#: builtin/describe.c:253 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s не является действительным объектом «%s»" + +#: builtin/describe.c:270 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "нет меток, точно соответствующих «%s»" + +#: builtin/describe.c:272 +#, c-format +msgid "searching to describe %s\n" +msgstr "поиск описания для %s\n" + +#: builtin/describe.c:319 +#, c-format +msgid "finished search at %s\n" +msgstr "поиск окончен на %s\n" + +#: builtin/describe.c:346 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags." + +#: builtin/describe.c:350 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки." + +#: builtin/describe.c:371 +#, c-format +msgid "traversed %lu commits\n" +msgstr "посещено %lu коммитов\n" + +#: builtin/describe.c:374 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "более %i меток найдено; показано последние %i\nостановлен поиск после %s\n" + +#: builtin/describe.c:396 +msgid "find the tag that comes after the commit" +msgstr "поиск метки, которая идет после коммита" + +#: builtin/describe.c:397 +msgid "debug search strategy on stderr" +msgstr "вывод отладочной информации стратегии поиска на стандартный вывод" + +#: builtin/describe.c:398 +msgid "use any ref" +msgstr "использовать любую ссылку" + +#: builtin/describe.c:399 +msgid "use any tag, even unannotated" +msgstr "использовать любую метку, даже неаннотированную" + +#: builtin/describe.c:400 +msgid "always use long format" +msgstr "всегда использовать длинный формат вывода" + +#: builtin/describe.c:401 +msgid "only follow first parent" +msgstr "следовать только за первым родителем" + +#: builtin/describe.c:404 +msgid "only output exact matches" +msgstr "выводить только точные совпадения" + +#: builtin/describe.c:406 +msgid "consider <n> most recent tags (default: 10)" +msgstr "рассматривать последние <n> меток (по умолчанию: 10)" + +#: builtin/describe.c:408 +msgid "only consider tags matching <pattern>" +msgstr "рассматривать только метки по <шаблону>" + +#: builtin/describe.c:410 builtin/name-rev.c:318 +msgid "show abbreviated commit object as fallback" +msgstr "если не найдено, показать сокращенный номер ревизии коммита" + +#: builtin/describe.c:411 +msgid "mark" +msgstr "пометка" + +#: builtin/describe.c:412 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)" + +#: builtin/describe.c:430 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long несовместимо с --abbrev=0" + +#: builtin/describe.c:456 +msgid "No names found, cannot describe anything." +msgstr "Имена не найдены, не могу ничего описать." + +#: builtin/describe.c:476 +msgid "--dirty is incompatible with commit-ishes" +msgstr "--dirty несовместимо с указанием указателей коммитов" + +#: builtin/diff.c:86 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "«%s»: не является обычным файлом или символьной ссылкой" + +#: builtin/diff.c:237 +#, c-format +msgid "invalid option: %s" +msgstr "неправильный параметр: %s" + +#: builtin/diff.c:358 +msgid "Not a git repository" +msgstr "Не является репозиторием git" + +#: builtin/diff.c:401 +#, c-format +msgid "invalid object '%s' given." +msgstr "передан неправильный объект «%s»." + +#: builtin/diff.c:410 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "передано больше двух двоичных объектов: «%s»" + +#: builtin/diff.c:417 +#, c-format +msgid "unhandled object '%s' given." +msgstr "передан необработанный объект «%s»." + +#: builtin/fast-export.c:24 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [опции-rev-list]" + +#: builtin/fast-export.c:979 +msgid "show progress after <n> objects" +msgstr "показать прогресс после <n> объектов" + +#: builtin/fast-export.c:981 +msgid "select handling of signed tags" +msgstr "выбор обработки подписанных меток" + +#: builtin/fast-export.c:984 +msgid "select handling of tags that tag filtered objects" +msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты" + +#: builtin/fast-export.c:987 +msgid "Dump marks to this file" +msgstr "Записать пометки в этот файл" + +#: builtin/fast-export.c:989 +msgid "Import marks from this file" +msgstr "Импортировать пометки из этого файла" + +#: builtin/fast-export.c:991 +msgid "Fake a tagger when tags lack one" +msgstr "Подделать автора метки, если у метки он отсутствует" + +#: builtin/fast-export.c:993 +msgid "Output full tree for each commit" +msgstr "Вывести полное дерево для каждого коммита" + +#: builtin/fast-export.c:995 +msgid "Use the done feature to terminate the stream" +msgstr "Использовать пометку завершения в конце потока" + +#: builtin/fast-export.c:996 +msgid "Skip output of blob data" +msgstr "Пропустить вывод данных двоичных объектов" + +#: builtin/fast-export.c:997 +msgid "refspec" +msgstr "спецификация ссылки" + +#: builtin/fast-export.c:998 +msgid "Apply refspec to exported refs" +msgstr "Применить спецификацию ссылки к экспортируемым ссылкам" + +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "сделать вывод анонимным" + +#: builtin/fetch.c:19 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<опции>] [<репозиторий> [<спецификация-ссылки>…]]" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<опции>] <группа>" + +#: builtin/fetch.c:21 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]" + +#: builtin/fetch.c:22 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<опции>]" + +#: builtin/fetch.c:89 +msgid "fetch from all remotes" +msgstr "извлечь со всех внешних репозиториев" + +#: builtin/fetch.c:91 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "дописать к .git/FETCH_HEAD вместо перезаписи" + +#: builtin/fetch.c:93 +msgid "path to upload pack on remote end" +msgstr "путь к программе упаковки пакета на машине с внешним репозиторием" + +#: builtin/fetch.c:94 +msgid "force overwrite of local branch" +msgstr "принудительная перезапись локальной ветки" + +#: builtin/fetch.c:96 +msgid "fetch from multiple remotes" +msgstr "извлечь с нескольких внешних репозиториев" + +#: builtin/fetch.c:98 +msgid "fetch all tags and associated objects" +msgstr "извлечь все метки и связанные объекты" + +#: builtin/fetch.c:100 +msgid "do not fetch all tags (--no-tags)" +msgstr "не извлекать все метки (--no-tags)" + +#: builtin/fetch.c:102 +msgid "prune remote-tracking branches no longer on remote" +msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории" + +#: builtin/fetch.c:103 +msgid "on-demand" +msgstr "по требованию" + +#: builtin/fetch.c:104 +msgid "control recursive fetching of submodules" +msgstr "управление рекурсивным извлечением подмодулей" + +#: builtin/fetch.c:108 +msgid "keep downloaded pack" +msgstr "оставить загруженный пакет данных" + +#: builtin/fetch.c:110 +msgid "allow updating of HEAD ref" +msgstr "разрешить обновление ссылки HEAD" + +#: builtin/fetch.c:113 +msgid "deepen history of shallow clone" +msgstr "глубокая история частичного клона" + +#: builtin/fetch.c:115 +msgid "convert to a complete repository" +msgstr "преобразовать в полный репозиторий" + +#: builtin/fetch.c:117 builtin/log.c:1208 +msgid "dir" +msgstr "каталог" + +#: builtin/fetch.c:118 +msgid "prepend this to submodule path output" +msgstr "присоединять это спереди к выводу путей подмодуля" + +#: builtin/fetch.c:121 +msgid "default mode for recursion" +msgstr "режим по умолчанию для рекурсии" + +#: builtin/fetch.c:123 +msgid "accept refs that update .git/shallow" +msgstr "принимать ссылки, которые обновляют .git/shallow" + +#: builtin/fetch.c:124 +msgid "refmap" +msgstr "соответствие-ссылок" + +#: builtin/fetch.c:125 +msgid "specify fetch refmap" +msgstr "указать соответствие ссылок при извлечении" + +#: builtin/fetch.c:375 +msgid "Couldn't find remote ref HEAD" +msgstr "Не удалось найти ссылку HEAD на внешнем репозитории" + +#: builtin/fetch.c:455 +#, c-format +msgid "object %s not found" +msgstr "объект %s не найден" + +#: builtin/fetch.c:460 +msgid "[up to date]" +msgstr "[актуально]" + +#: builtin/fetch.c:474 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s → %s (не удалось извлечь в текущую ветку)" + +#: builtin/fetch.c:475 builtin/fetch.c:561 +msgid "[rejected]" +msgstr "[отклонено]" + +#: builtin/fetch.c:486 +msgid "[tag update]" +msgstr "[обновление метки]" + +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +msgid " (unable to update local ref)" +msgstr " (не удалось обновить локальную ссылку)" + +#: builtin/fetch.c:506 +msgid "[new tag]" +msgstr "[новая метка]" + +#: builtin/fetch.c:509 +msgid "[new branch]" +msgstr "[новая ветка]" + +#: builtin/fetch.c:512 +msgid "[new ref]" +msgstr "[новая ссылка]" + +#: builtin/fetch.c:557 +msgid "unable to update local ref" +msgstr "не удалось обновить локальную ссылку" + +#: builtin/fetch.c:557 +msgid "forced update" +msgstr "принудительное обновление" + +#: builtin/fetch.c:563 +msgid "(non-fast-forward)" +msgstr "(без перемотки вперед)" + +#: builtin/fetch.c:596 builtin/fetch.c:829 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "не удалось открыть %s: %s\n" + +#: builtin/fetch.c:605 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s не отправил все необходимые объекты\n" + +#: builtin/fetch.c:623 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять" + +#: builtin/fetch.c:711 builtin/fetch.c:794 +#, c-format +msgid "From %.*s\n" +msgstr "Из %.*s\n" + +#: builtin/fetch.c:722 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки" + +#: builtin/fetch.c:774 +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s будет висящей веткой)" + +#: builtin/fetch.c:775 +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s стала висящей веткой)" + +#: builtin/fetch.c:799 +msgid "[deleted]" +msgstr "[удалено]" + +#: builtin/fetch.c:800 builtin/remote.c:1060 +msgid "(none)" +msgstr "(нет)" + +#: builtin/fetch.c:819 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "Отказ получения в текущую ветку %s не голого репозитория" + +#: builtin/fetch.c:838 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s" + +#: builtin/fetch.c:841 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Параметр «%s» игнорируется для %s\n" + +#: builtin/fetch.c:897 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Не знаю как извлечь с %s" + +#: builtin/fetch.c:1059 +#, c-format +msgid "Fetching %s\n" +msgstr "Извлечение из %s\n" + +#: builtin/fetch.c:1061 builtin/remote.c:90 +#, c-format +msgid "Could not fetch %s" +msgstr "Не удалось извлечь %s" + +#: builtin/fetch.c:1079 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции." + +#: builtin/fetch.c:1102 +msgid "You need to specify a tag name." +msgstr "Вам нужно указать имя метки." + +#: builtin/fetch.c:1144 +msgid "--depth and --unshallow cannot be used together" +msgstr "нельзя использовать одновременно --depth и --unshallow" + +#: builtin/fetch.c:1146 +msgid "--unshallow on a complete repository does not make sense" +msgstr "--unshallow не имеет смысла на полном репозитории" + +#: builtin/fetch.c:1169 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all не принимает имя репозитория как аргумент" + +#: builtin/fetch.c:1171 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all не имеет смысла при указании спецификаций ссылок" + +#: builtin/fetch.c:1182 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "Нет такого внешнего репозитория или группы: %s" + +#: builtin/fetch.c:1190 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Получение группы и указание спецификаций ссылок не имеет смысла" + +#: builtin/fmt-merge-msg.c:13 +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]" + +#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 +#: parse-options.h:132 parse-options.h:239 +msgid "n" +msgstr "n" + +#: builtin/fmt-merge-msg.c:663 +msgid "populate log with at most <n> entries from shortlog" +msgstr "отправить в журнал <n> записей из короткого журнала" + +#: builtin/fmt-merge-msg.c:666 +msgid "alias for --log (deprecated)" +msgstr "сокращение для --log (устаревшее)" + +#: builtin/fmt-merge-msg.c:669 +msgid "text" +msgstr "текст" + +#: builtin/fmt-merge-msg.c:670 +msgid "use <text> as start of message" +msgstr "использовать <текст> как начальное сообщение" + +#: builtin/fmt-merge-msg.c:671 +msgid "file to read from" +msgstr "файл для чтения" + +#: builtin/for-each-ref.c:675 +msgid "unable to parse format" +msgstr "не удалось разобрать формат" + +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<опции>] [<шаблон>]" + +#: 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 "выводить указатели места заполнения в подходящем формате для perl" + +#: builtin/for-each-ref.c:1082 +msgid "quote placeholders suitably for python" +msgstr "выводить указатели места заполнения в подходящем формате для python" + +#: builtin/for-each-ref.c:1084 +msgid "quote placeholders suitably for Tcl" +msgstr "выводить указатели места заполнения в подходящем формате для Tcl" + +#: builtin/for-each-ref.c:1087 +msgid "show only <n> matched refs" +msgstr "показать только <n> совпадающих ссылок" + +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +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:147 builtin/prune.c:137 +msgid "Checking connectivity" +msgstr "Проверка соединения" + +#: builtin/fsck.c:540 +msgid "Checking object directories" +msgstr "Проверка каталогов объектов" + +#: builtin/fsck.c:603 +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<опции>] [<объект>…]" + +#: builtin/fsck.c:609 +msgid "show unreachable objects" +msgstr "показать недоступные объекты" + +#: builtin/fsck.c:610 +msgid "show dangling objects" +msgstr "показать объекты, на которые нет ссылок" + +#: builtin/fsck.c:611 +msgid "report tags" +msgstr "вывести отчет по меткам" + +#: builtin/fsck.c:612 +msgid "report root nodes" +msgstr "вывести отчет по корневым узлам" + +#: builtin/fsck.c:613 +msgid "make index objects head nodes" +msgstr "воспринимать объекты в индексе как корневые узлы" + +#: builtin/fsck.c:614 +msgid "make reflogs head nodes (default)" +msgstr "создать корневые узлы журналов ссылок (по умолчанию)" + +#: builtin/fsck.c:615 +msgid "also consider packs and alternate objects" +msgstr "также проверять пакеты и альтернативные объекты" + +#: builtin/fsck.c:616 +msgid "enable more strict checking" +msgstr "использовать более строгую проверку" + +#: builtin/fsck.c:618 +msgid "write dangling objects in .git/lost-found" +msgstr "записать объекты на которые нет ссылок в .git/lost-found" + +#: builtin/fsck.c:619 builtin/prune.c:108 +msgid "show progress" +msgstr "показать прогресс выполнения" + +#: builtin/fsck.c:669 +msgid "Checking objects" +msgstr "Проверка объектов" + +#: builtin/gc.c:24 +msgid "git gc [<options>]" +msgstr "git gc [<опции>]" + +#: builtin/gc.c:79 +#, c-format +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "Неправильный gc.pruneexpire: «%s»" + +#: builtin/gc.c:107 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "слишком длинный путь к каталогу объекта %.*s" + +#: builtin/gc.c:276 +msgid "prune unreferenced objects" +msgstr "почистить объекты, на которые нет ссылок" + +#: builtin/gc.c:278 +msgid "be more thorough (increased runtime)" +msgstr "проверять более внимательно (занимает больше времени)" + +#: builtin/gc.c:279 +msgid "enable auto-gc mode" +msgstr "включить режим auto-gc" + +#: builtin/gc.c:280 +msgid "force running gc even if there may be another gc running" +msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена" + +#: builtin/gc.c:321 +#, c-format +msgid "Auto packing the repository in background for optimum performance.\n" +msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n" + +#: builtin/gc.c:323 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n" + +#: builtin/gc.c:324 +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" +msgstr "Смотрите «git help gc» руководства по ручной очистке.\n" + +#: builtin/gc.c:342 +#, 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:364 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove " +"them." +msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления." + +#: builtin/grep.c:23 +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]" + +#: builtin/grep.c:218 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: сбой создания потока: %s" + +#: builtin/grep.c:441 builtin/grep.c:476 +#, c-format +msgid "unable to read tree (%s)" +msgstr "не удалось прочитать дерево (%s)" + +#: builtin/grep.c:491 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "не удалось выполнить grep из объекта типа %s" + +#: builtin/grep.c:547 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "параметр «%c» ожидает числовое значение" + +#: builtin/grep.c:564 +#, c-format +msgid "cannot open '%s'" +msgstr "не удалось открыть «%s»" + +#: builtin/grep.c:638 +msgid "search in index instead of in the work tree" +msgstr "искать в индексе, а не в рабочем каталоге" + +#: builtin/grep.c:640 +msgid "find in contents not managed by git" +msgstr "искать в содержимом не управляемым git" + +#: builtin/grep.c:642 +msgid "search in both tracked and untracked files" +msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах" + +#: builtin/grep.c:644 +msgid "ignore files specified via '.gitignore'" +msgstr "игнорировать файлы указанные в «.gitignore»" + +#: builtin/grep.c:647 +msgid "show non-matching lines" +msgstr "искать в несовпадающих строках" + +#: builtin/grep.c:649 +msgid "case insensitive matching" +msgstr "без учета регистра" + +#: builtin/grep.c:651 +msgid "match patterns only at word boundaries" +msgstr "искать совпадения шаблона только на границах слов" + +#: builtin/grep.c:653 +msgid "process binary files as text" +msgstr "обработка двоичных файлов как текста" + +#: builtin/grep.c:655 +msgid "don't match patterns in binary files" +msgstr "не искать совпадения шаблона в двоичных файлах" + +#: builtin/grep.c:658 +msgid "process binary files with textconv filters" +msgstr "обрабатываться двоичные файлы с помощью фильтров textconv" + +#: builtin/grep.c:660 +msgid "descend at most <depth> levels" +msgstr "на глубине максиму <глубина> уровней" + +#: builtin/grep.c:664 +msgid "use extended POSIX regular expressions" +msgstr "использовать расширенные регулярные выражения POSIX" + +#: builtin/grep.c:667 +msgid "use basic POSIX regular expressions (default)" +msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)" + +#: builtin/grep.c:670 +msgid "interpret patterns as fixed strings" +msgstr "интерпретировать шаблоны как фиксированные строки" + +#: builtin/grep.c:673 +msgid "use Perl-compatible regular expressions" +msgstr "использовать Perl-совместимые регулярные выражения" + +#: builtin/grep.c:676 +msgid "show line numbers" +msgstr "вывести номера строк" + +#: builtin/grep.c:677 +msgid "don't show filenames" +msgstr "не выводить имена файлов" + +#: builtin/grep.c:678 +msgid "show filenames" +msgstr "выводить имена файлов" + +#: builtin/grep.c:680 +msgid "show filenames relative to top directory" +msgstr "выводить имена файлов относительно каталога репозитория" + +#: builtin/grep.c:682 +msgid "show only filenames instead of matching lines" +msgstr "выводить только имена файлов, а не совпадающие строки" + +#: builtin/grep.c:684 +msgid "synonym for --files-with-matches" +msgstr "синоним для --files-with-matches" + +#: builtin/grep.c:687 +msgid "show only the names of files without match" +msgstr "выводить только несовпадающие имена файлов" + +#: builtin/grep.c:689 +msgid "print NUL after filenames" +msgstr "выводить двоичный НОЛЬ после списка имен файлов" + +#: builtin/grep.c:691 +msgid "show the number of matches instead of matching lines" +msgstr "выводить количество совпадений, а не совпадающие строки" + +#: builtin/grep.c:692 +msgid "highlight matches" +msgstr "подсвечивать совпадения" + +#: builtin/grep.c:694 +msgid "print empty line between matches from different files" +msgstr "выводить пустую строку после совпадений из разных файлов" + +#: builtin/grep.c:696 +msgid "show filename only once above matches from same file" +msgstr "выводить имя файла только раз на несколько совпадений в одном файле" + +#: builtin/grep.c:699 +msgid "show <n> context lines before and after matches" +msgstr "показать <n> строк контекста перед и после совпадения" + +#: builtin/grep.c:702 +msgid "show <n> context lines before matches" +msgstr "показать <n> строк контекста перед совпадением" + +#: builtin/grep.c:704 +msgid "show <n> context lines after matches" +msgstr "показать <n> строк контекста после совпадения" + +#: builtin/grep.c:705 +msgid "shortcut for -C NUM" +msgstr "тоже, что и -C КОЛИЧЕСТВО" + +#: builtin/grep.c:708 +msgid "show a line with the function name before matches" +msgstr "показать строку с именем функции перед совпадением" + +#: builtin/grep.c:710 +msgid "show the surrounding function" +msgstr "показать окружающую функцию" + +#: builtin/grep.c:713 +msgid "read patterns from file" +msgstr "прочитать шаблоны из файла" + +#: builtin/grep.c:715 +msgid "match <pattern>" +msgstr "поиск соответствий с <шаблоном>" + +#: builtin/grep.c:717 +msgid "combine patterns specified with -e" +msgstr "объединить шаблоны указанные с помощью -e" + +#: builtin/grep.c:729 +msgid "indicate hit with exit status without output" +msgstr "ничего не выводить, указать на совпадение с помощью кода выхода" + +#: builtin/grep.c:731 +msgid "show only matches from files that match all patterns" +msgstr "показать только совпадения из файлов в которых совпадают все шаблоны" + +#: builtin/grep.c:733 +msgid "show parse tree for grep expression" +msgstr "показать дерево разбора для выражения поиска" + +#: builtin/grep.c:737 +msgid "pager" +msgstr "пейджер" + +#: builtin/grep.c:737 +msgid "show matching files in the pager" +msgstr "показать совпадающие файлы с помощью программы-пейджера" + +#: builtin/grep.c:740 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)" + +#: builtin/grep.c:741 builtin/show-ref.c:187 +msgid "show usage" +msgstr "показать использование" + +#: builtin/grep.c:808 +msgid "no pattern given." +msgstr "не задан шаблон." + +#: builtin/grep.c:866 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager работает только в рабочем каталоге" + +#: builtin/grep.c:892 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached или --untracked нельзя использовать одновременно с --no-index." + +#: builtin/grep.c:897 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии." + +#: builtin/grep.c:900 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "--[no-]exclude-standard не может использоваться для отслеживаемого содержимого." + +#: builtin/grep.c:908 +msgid "both --cached and trees are given." +msgstr "указано одновременно --cached и дерево." + +#: builtin/hash-object.c:82 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." +msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…" + +#: builtin/hash-object.c:83 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "git hash-object --stdin-paths < <список-путей>" + +#: builtin/hash-object.c:94 builtin/tag.c:612 +msgid "type" +msgstr "тип" + +#: builtin/hash-object.c:94 +msgid "object type" +msgstr "тип объекта" + +#: builtin/hash-object.c:95 +msgid "write the object into the object database" +msgstr "запись объекта в базу данных объектов" + +#: builtin/hash-object.c:97 +msgid "read the object from stdin" +msgstr "прочитать объект из стандартного ввода" + +#: builtin/hash-object.c:99 +msgid "store file as is without filters" +msgstr "сохранить файл без использования фильтров" + +#: builtin/hash-object.c:100 +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "хешировать любой мусор и создавать поврежденные объекты для отладки Git" + +#: builtin/hash-object.c:101 +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 "открыть руководство в формате man" + +#: builtin/help.c:44 +msgid "show manual in web browser" +msgstr "открыть руководство в веб-браузере" + +#: builtin/help.c:46 +msgid "show info page" +msgstr "открыть руководство в формате info" + +#: 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:91 +msgid "Failed to start emacsclient." +msgstr "Сбой при запуске emacsclient." + +#: builtin/help.c:104 +msgid "Failed to parse emacsclient version." +msgstr "Сбой при определении версии emacsclient." + +#: builtin/help.c:112 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "версия emacsclient «%d» слишком старая (< 22)." + +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "сбой при запуске «%s»: %s" + +#: builtin/help.c:215 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»." + +#: builtin/help.c:227 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»." + +#: builtin/help.c:354 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "«%s»: неизвестная программа просмотра man." + +#: builtin/help.c:371 +msgid "no man viewer handled the request" +msgstr "программа просмотра man не обработала запрос" + +#: builtin/help.c:379 +msgid "no info viewer handled the request" +msgstr "программа просмотра info не обработала запрос" + +#: builtin/help.c:428 +msgid "Defining attributes per path" +msgstr "Определение атрибутов для путей файлов или каталогов" + +#: builtin/help.c:429 +msgid "Everyday Git With 20 Commands Or So" +msgstr "Повседневный Git с 20 командами или около того" + +#: builtin/help.c:430 +msgid "A Git glossary" +msgstr "Глоссарий Git" + +#: builtin/help.c:431 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Указание специально игнорируемых файлов" + +#: builtin/help.c:432 +msgid "Defining submodule properties" +msgstr "Определение свойств подмодулей" + +#: builtin/help.c:433 +msgid "Specifying revisions and ranges for Git" +msgstr "Указание редакций и диапазонов для Git" + +#: builtin/help.c:434 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" +msgstr "Учебное введение в Git (для версии 1.5.1 или новее)" + +#: builtin/help.c:435 +msgid "An overview of recommended workflows with Git" +msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git" + +#: builtin/help.c:447 +msgid "The common Git guides are:\n" +msgstr "Основные руководства Git:\n" + +#: builtin/help.c:468 builtin/help.c:485 +#, c-format +msgid "usage: %s%s" +msgstr "использование: %s%s" + +#: builtin/help.c:501 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "«git %s» — это сокращение для «%s»" + +#: builtin/index-pack.c:150 +#, c-format +msgid "unable to open %s" +msgstr "не удалось открыть %s" + +#: builtin/index-pack.c:200 +#, c-format +msgid "object type mismatch at %s" +msgstr "несоответствие типа объекта на %s" + +#: builtin/index-pack.c:220 +#, c-format +msgid "did not receive expected object %s" +msgstr "ожидаемый объект не получен на %s" + +#: builtin/index-pack.c:223 +#, c-format +msgid "object %s: expected type %s, found %s" +msgstr "объект %s: ожидаемый тип %s, получен %s" + +#: builtin/index-pack.c:265 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "не удалось заполнить %d байт" +msgstr[1] "не удалось заполнить %d байта" +msgstr[2] "не удалось заполнить %d байтов" + +#: builtin/index-pack.c:275 +msgid "early EOF" +msgstr "неожиданный конец файла" + +#: builtin/index-pack.c:276 +msgid "read error on input" +msgstr "ошибка чтения ввода" + +#: builtin/index-pack.c:288 +msgid "used more bytes than were available" +msgstr "использовано больше байт, чем было доступно" + +#: builtin/index-pack.c:295 +msgid "pack too large for current definition of off_t" +msgstr "пакет слишком большой для текущего определения off_t" + +#: builtin/index-pack.c:311 +#, c-format +msgid "unable to create '%s'" +msgstr "не удалось создать «%s»" + +#: builtin/index-pack.c:316 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "не удалось открыть файл пакета «%s»" + +#: builtin/index-pack.c:330 +msgid "pack signature mismatch" +msgstr "несоответствие подписи пакета" + +#: builtin/index-pack.c:332 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "версия пакета %<PRIu32> не поддерживается" + +#: builtin/index-pack.c:350 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "в пакете содержится поврежденный объект по смещению %lu: %s" + +#: builtin/index-pack.c:471 +#, c-format +msgid "inflate returned %d" +msgstr "программа сжатия вернула %d" + +#: builtin/index-pack.c:520 +msgid "offset value overflow for delta base object" +msgstr "переполнение значения смещения у базового объекта дельты" + +#: builtin/index-pack.c:528 +msgid "delta base offset is out of bound" +msgstr "смещение базовой дельты вышло за допустимые пределы" + +#: builtin/index-pack.c:536 +#, c-format +msgid "unknown object type %d" +msgstr "неизвестный тип объекта %d" + +#: builtin/index-pack.c:567 +msgid "cannot pread pack file" +msgstr "не удалось выполнить pread для файла пакета" + +#: builtin/index-pack.c:569 +#, c-format +msgid "premature end of pack file, %lu byte missing" +msgid_plural "premature end of pack file, %lu bytes missing" +msgstr[0] "преждевременное окончание файла пакета, %lu байт отсутствует" +msgstr[1] "преждевременное окончание файла пакета, %lu байта отсутствует" +msgstr[2] "преждевременное окончание файла пакета, %lu байтов отсутствует" + +#: builtin/index-pack.c:595 +msgid "serious inflate inconsistency" +msgstr "серьезное несоответствие при распаковке" + +#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 +#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !" + +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 +#, c-format +msgid "unable to read %s" +msgstr "не удалось прочитать %s" + +#: builtin/index-pack.c:755 +#, c-format +msgid "cannot read existing object %s" +msgstr "не удалось прочитать существующий объект %s" + +#: builtin/index-pack.c:769 +#, c-format +msgid "invalid blob object %s" +msgstr "неправильный файл двоичного объекта %s" + +#: builtin/index-pack.c:783 +#, c-format +msgid "invalid %s" +msgstr "неправильный %s" + +#: builtin/index-pack.c:787 +msgid "Error in object" +msgstr "Ошибка в объекте" + +#: builtin/index-pack.c:789 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "Не все дочерние объекты %s достижимы" + +#: builtin/index-pack.c:861 builtin/index-pack.c:890 +msgid "failed to apply delta" +msgstr "сбой при применении дельты" + +#: builtin/index-pack.c:1055 +msgid "Receiving objects" +msgstr "Получение объектов" + +#: builtin/index-pack.c:1055 +msgid "Indexing objects" +msgstr "Индексирование объектов" + +#: builtin/index-pack.c:1081 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "пакет поврежден (несоответствие SHA1)" + +#: builtin/index-pack.c:1086 +msgid "cannot fstat packfile" +msgstr "не удалось выполнить fstat для файла пакета" + +#: builtin/index-pack.c:1089 +msgid "pack has junk at the end" +msgstr "файл пакета содержит мусор в конце" + +#: builtin/index-pack.c:1100 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "безумная путаница в parse_pack_objects()" + +#: builtin/index-pack.c:1123 +msgid "Resolving deltas" +msgstr "Определение изменений" + +#: builtin/index-pack.c:1133 +#, c-format +msgid "unable to create thread: %s" +msgstr "не удалось создать поток: %s" + +#: builtin/index-pack.c:1175 +msgid "confusion beyond insanity" +msgstr "безумная путаница" + +#: builtin/index-pack.c:1181 +#, c-format +msgid "completed with %d local objects" +msgstr "завершено с %d локальными объектами" + +#: builtin/index-pack.c:1191 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)" + +#: builtin/index-pack.c:1195 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "пакет содержит %d неразрешенную дельту" +msgstr[1] "пакет содержит %d неразрешенные дельты" +msgstr[2] "пакет содержит %d неразрешенных дельт" + +#: builtin/index-pack.c:1219 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "нельзя сжать присоединенный объект (%d)" + +#: builtin/index-pack.c:1298 +#, c-format +msgid "local object %s is corrupt" +msgstr "локальный объект %s поврежден" + +#: builtin/index-pack.c:1322 +msgid "error while closing pack file" +msgstr "ошибка при закрытии файла пакета" + +#: builtin/index-pack.c:1335 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "не удалось записать файл удержания «%s»" + +#: builtin/index-pack.c:1343 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "не удалось закрыть записанный файл удержания «%s»" + +#: builtin/index-pack.c:1356 +msgid "cannot store pack file" +msgstr "не удалось сохранить файл пакета" + +#: builtin/index-pack.c:1367 +msgid "cannot store index file" +msgstr "не удалось сохранить файл индекса" + +#: builtin/index-pack.c:1400 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "плохой pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1406 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "указано неправильное количество потоков (%d)" + +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "нет поддержки потоков, игнорирование %s" + +#: builtin/index-pack.c:1468 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Не удалось открыть существующий файл пакета «%s»" + +#: builtin/index-pack.c:1470 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "Не удалось открыть существующий файл индекса для «%s»" + +#: builtin/index-pack.c:1517 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "не дельты: %d объект" +msgstr[1] "не дельты: %d объекта" +msgstr[2] "не дельты: %d объектов" + +#: builtin/index-pack.c:1524 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "длина цепочки = %d: %lu объект" +msgstr[1] "длина цепочки = %d: %lu объекта" +msgstr[2] "длина цепочки = %d: %lu объектов" + +#: builtin/index-pack.c:1553 +msgid "Cannot come back to cwd" +msgstr "Не удалось вернуться в текущий рабочий каталог" + +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#, c-format +msgid "bad %s" +msgstr "плохой %s" + +#: builtin/index-pack.c:1634 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin нельзя использовать без --stdin" + +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "имя пакета «%s» не оканчивается на «.pack»" + +#: builtin/index-pack.c:1655 +msgid "--verify with no packfile name given" +msgstr "--verify без указания имени файла пакета" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Не удалось предоставить доступ к %s на запись" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "слишком длинное имя шаблона %s" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "не удалось выполнить stat для «%s»" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "не удалось выполнить stat для шаблона «%s»" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "не удалось выполнить opendir для «%s»" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "не удалось выполнить readlink для «%s»" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "слишком длинная символьная ссылка %s" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "не удалось создать символьную ссылку «%s» на «%s»" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "не удалось скопировать файл «%s» в «%s»" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "игнорирование шаблона %s" + +#: builtin/init-db.c:136 +#, c-format +msgid "insanely long template path %s" +msgstr "слишком длинный путь шаблона %s" + +#: builtin/init-db.c:144 +#, c-format +msgid "templates not found %s" +msgstr "шаблоны не найдены %s" + +#: builtin/init-db.c:157 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "не копирую шаблоны в неправильной версии формата %d из «%s»" + +#: builtin/init-db.c:197 +#, c-format +msgid "insane git directory %s" +msgstr "слишком длинный путь к каталогу git %s" + +#: builtin/init-db.c:331 builtin/init-db.c:334 +#, c-format +msgid "%s already exists" +msgstr "%s уже существует" + +#: builtin/init-db.c:363 +#, c-format +msgid "unable to handle file type %d" +msgstr "не удается обработать файл типа %d" + +#: builtin/init-db.c:366 +#, c-format +msgid "unable to move %s to %s" +msgstr "не удается переместить файл %s в %s" + +#. 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:426 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s репозиторий Git в %s%s\n" + +#: builtin/init-db.c:427 +msgid "Reinitialized existing" +msgstr "Реинициализация существующего" + +#: builtin/init-db.c:427 +msgid "Initialized empty" +msgstr "Инициализирован пустой" + +#: builtin/init-db.c:428 +msgid " shared" +msgstr " общий" + +#: builtin/init-db.c:475 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] " +"[--shared[=<permissions>]] [<directory>]" +msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]" + +#: builtin/init-db.c:498 +msgid "permissions" +msgstr "права-доступа" + +#: builtin/init-db.c:499 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями" + +#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 +msgid "be quiet" +msgstr "тихий режим" + +#: builtin/init-db.c:533 builtin/init-db.c:538 +#, c-format +msgid "cannot mkdir %s" +msgstr "не удалось выполнить mkdir %s" + +#: builtin/init-db.c:542 +#, c-format +msgid "cannot chdir to %s" +msgstr "не удалось выполнить chdir в %s" + +#: builtin/init-db.c:563 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --git-dir=<каталог>)" + +#: builtin/init-db.c:591 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Не удалось получить доступ к рабочему каталогу «%s»" + +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...]" +" [<file>...]" +msgstr "git interpret-trailers [--trim-empty] [(--trailer <лексема>[(=|:)<значение>])…] [<файл>…]" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "удалять пустые завершители" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "завершитель" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" +msgstr "завершители для добавления" + +#: builtin/log.c:41 +msgid "git log [<options>] [<revision range>] [[--] <path>...]" +msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]" + +#: builtin/log.c:42 +msgid "git show [<options>] <object>..." +msgstr "git show [<опции>] <объект>…" + +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "неправильный параметр для --decorate: %s" + +#: builtin/log.c:127 +msgid "suppress diff output" +msgstr "не выводить различия" + +#: builtin/log.c:128 +msgid "show source" +msgstr "показать источник" + +#: builtin/log.c:129 +msgid "Use mail map file" +msgstr "Использовать файл соответствия почтовых адресов" + +#: builtin/log.c:130 +msgid "decorate options" +msgstr "опции формата вывода ссылок" + +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "Обработать диапазон строк n,m из файла, начиная с 1" + +#: builtin/log.c:229 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Финальный вывод: %d %s\n" + +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: плохой файл" + +#: builtin/log.c:472 builtin/log.c:564 +#, c-format +msgid "Could not read object %s" +msgstr "Не удалось прочитать объект %s" + +#: builtin/log.c:588 +#, c-format +msgid "Unknown type: %d" +msgstr "Неизвестный тип объекта: %d" + +#: builtin/log.c:689 +msgid "format.headers without value" +msgstr "в format.headers не указано значение" + +#: builtin/log.c:773 +msgid "name of output directory is too long" +msgstr "слишком длинное имя выходного каталога" + +#: builtin/log.c:789 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Ну удалось открыть файл изменений %s" + +#: builtin/log.c:803 +msgid "Need exactly one range." +msgstr "Нужен только один диапазон." + +#: builtin/log.c:811 +msgid "Not a range." +msgstr "Не является диапазоном." + +#: builtin/log.c:919 +msgid "Cover letter needs email format" +msgstr "Сопроводительное письмо должно быть в формате электронной почты" + +#: builtin/log.c:998 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "ошибка в поле in-reply-to: %s" + +#: builtin/log.c:1026 +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]" + +#: builtin/log.c:1071 +msgid "Two output directories?" +msgstr "Два выходных каталога?" + +#: builtin/log.c:1186 +msgid "use [PATCH n/m] even with a single patch" +msgstr "выводить [PATCH n/m] даже когда один патч" + +#: builtin/log.c:1189 +msgid "use [PATCH] even with multiple patches" +msgstr "выводить [PATCH] даже когда несколько патчей" + +#: builtin/log.c:1193 +msgid "print patches to standard out" +msgstr "выводить патчи на стандартный вывод" + +#: builtin/log.c:1195 +msgid "generate a cover letter" +msgstr "генерировать сопроводительное письмо" + +#: builtin/log.c:1197 +msgid "use simple number sequence for output file names" +msgstr "использовать простую последовательность чисел для имен выходных файлов" + +#: builtin/log.c:1198 +msgid "sfx" +msgstr "суффикс" + +#: builtin/log.c:1199 +msgid "use <sfx> instead of '.patch'" +msgstr "использовать суффикс <суффикс> вместо «.patch»" + +#: builtin/log.c:1201 +msgid "start numbering patches at <n> instead of 1" +msgstr "начать нумерацию патчей с <n>, а не с 1" + +#: builtin/log.c:1203 +msgid "mark the series as Nth re-roll" +msgstr "пометить серию как энную попытку" + +#: builtin/log.c:1205 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "Использовать [<префикс>] вместо [PATCH]" + +#: builtin/log.c:1208 +msgid "store resulting files in <dir>" +msgstr "сохранить результирующие файлы в <каталог>" + +#: builtin/log.c:1211 +msgid "don't strip/add [PATCH]" +msgstr "не обрезать/добавлять [PATCH]" + +#: builtin/log.c:1214 +msgid "don't output binary diffs" +msgstr "не выводить двоичные различия" + +#: builtin/log.c:1216 +msgid "don't include a patch matching a commit upstream" +msgstr "не включать патч, если коммит уже есть в вышестоящей ветке" + +#: builtin/log.c:1218 +msgid "show patch format instead of default (patch + stat)" +msgstr "выводить в формате патча, а не в стандартном (патч + статистика)" + +#: builtin/log.c:1220 +msgid "Messaging" +msgstr "Передача сообщений" + +#: builtin/log.c:1221 +msgid "header" +msgstr "заголовок" + +#: builtin/log.c:1222 +msgid "add email header" +msgstr "добавить заголовок сообщения" + +#: builtin/log.c:1223 builtin/log.c:1225 +msgid "email" +msgstr "почта" + +#: builtin/log.c:1223 +msgid "add To: header" +msgstr "добавить заголовок To:" + +#: builtin/log.c:1225 +msgid "add Cc: header" +msgstr "добавить заголовок Cc:" + +#: builtin/log.c:1227 +msgid "ident" +msgstr "идентификатор" + +#: builtin/log.c:1228 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)" + +#: builtin/log.c:1230 +msgid "message-id" +msgstr "идентификатор-сообщения" + +#: builtin/log.c:1231 +msgid "make first mail a reply to <message-id>" +msgstr "сделать первое письмо ответом на <идентификатор-сообщения>" + +#: builtin/log.c:1232 builtin/log.c:1235 +msgid "boundary" +msgstr "вложение" + +#: builtin/log.c:1233 +msgid "attach the patch" +msgstr "приложить патч" + +#: builtin/log.c:1236 +msgid "inline the patch" +msgstr "включить патч в текст письма" + +#: builtin/log.c:1240 +msgid "enable message threading, styles: shallow, deep" +msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)" + +#: builtin/log.c:1242 +msgid "signature" +msgstr "подпись" + +#: builtin/log.c:1243 +msgid "add a signature" +msgstr "добавить подпись" + +#: builtin/log.c:1245 +msgid "add a signature from a file" +msgstr "добавить подпись из файла" + +#: builtin/log.c:1246 +msgid "don't print the patch filenames" +msgstr "не выводить имена файлов патчей" + +#: builtin/log.c:1320 +#, c-format +msgid "invalid ident line: %s" +msgstr "неправильная строка идентификации: %s" + +#: builtin/log.c:1335 +msgid "-n and -k are mutually exclusive." +msgstr "-n и -k нельзя использовать одновременно" + +#: builtin/log.c:1337 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix и -k нельзя использовать одновременно." + +#: builtin/log.c:1345 +msgid "--name-only does not make sense" +msgstr "--name-only не имеет смысла" + +#: builtin/log.c:1347 +msgid "--name-status does not make sense" +msgstr "--name-status не имеет смысла" + +#: builtin/log.c:1349 +msgid "--check does not make sense" +msgstr "--check не имеет смысла" + +#: builtin/log.c:1372 +msgid "standard output, or directory, which one?" +msgstr "стандартный вывод или каталог?" + +#: builtin/log.c:1374 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Не удалось создать каталог «%s»" + +#: builtin/log.c:1472 +#, c-format +msgid "unable to read signature file '%s'" +msgstr "не удалось прочитать файл подписи «%s»" + +#: builtin/log.c:1535 +msgid "Failed to create output files" +msgstr "Сбой при создании выходных файлов" + +#: builtin/log.c:1583 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]" + +#: builtin/log.c:1638 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> " +"manually.\n" +msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n" + +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 +#, c-format +msgid "Unknown commit %s" +msgstr "Неизвестный коммит %s" + +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<опции>] [<файл>…]" + +#: builtin/ls-files.c:415 +msgid "identify the file status with tags" +msgstr "выводить имена файлов с метками" + +#: builtin/ls-files.c:417 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов" + +#: builtin/ls-files.c:419 +msgid "show cached files in the output (default)" +msgstr "показывать кэшированные файлы при выводе (по умолчанию)" + +#: builtin/ls-files.c:421 +msgid "show deleted files in the output" +msgstr "показывать удаленные файлы при выводе" + +#: builtin/ls-files.c:423 +msgid "show modified files in the output" +msgstr "показывать измененные файлы при выводе" + +#: builtin/ls-files.c:425 +msgid "show other files in the output" +msgstr "показывать другие файлы при выводе" + +#: builtin/ls-files.c:427 +msgid "show ignored files in the output" +msgstr "показывать игнорируемые файлы при выводе" + +#: builtin/ls-files.c:430 +msgid "show staged contents' object name in the output" +msgstr "показывать имя индексированного объекта на выводе" + +#: builtin/ls-files.c:432 +msgid "show files on the filesystem that need to be removed" +msgstr "показывать файлы в файловой системе, которые должны быть удалены" + +#: builtin/ls-files.c:434 +msgid "show 'other' directories' names only" +msgstr "показывать только имена у «других» каталогов" + +#: builtin/ls-files.c:437 +msgid "don't show empty directories" +msgstr "не показывать пустые каталоги" + +#: builtin/ls-files.c:440 +msgid "show unmerged files in the output" +msgstr "показывать не слитые файлы на выводе" + +#: builtin/ls-files.c:442 +msgid "show resolve-undo information" +msgstr "показывать информации о разрешении конфликтов и отмене" + +#: builtin/ls-files.c:444 +msgid "skip files matching pattern" +msgstr "пропустить файлы, соответствующие шаблону" + +#: builtin/ls-files.c:447 +msgid "exclude patterns are read from <file>" +msgstr "прочитать шаблоны исключения из <файл>" + +#: builtin/ls-files.c:450 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>" + +#: builtin/ls-files.c:452 +msgid "add the standard git exclusions" +msgstr "добавить стандартные исключения git" + +#: builtin/ls-files.c:455 +msgid "make the output relative to the project top directory" +msgstr "выводить пути относительно корневого каталога проекта" + +#: builtin/ls-files.c:458 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "если какой-либо <файл> не в индексе, считать это ошибкой" + +#: builtin/ls-files.c:459 +msgid "tree-ish" +msgstr "указатель-дерева" + +#: builtin/ls-files.c:460 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует" + +#: builtin/ls-files.c:462 +msgid "show debugging data" +msgstr "показать отладочную информацию" + +#: builtin/ls-tree.c:28 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]" + +#: builtin/ls-tree.c:127 +msgid "only show trees" +msgstr "выводить только деревья" + +#: builtin/ls-tree.c:129 +msgid "recurse into subtrees" +msgstr "проходить рекурсивно в поддеревья" + +#: builtin/ls-tree.c:131 +msgid "show trees when recursing" +msgstr "выводить деревья при рекурсивном проходе" + +#: builtin/ls-tree.c:134 +msgid "terminate entries with NUL byte" +msgstr "разделять записи с помощью НУЛЕВОГО байта" + +#: builtin/ls-tree.c:135 +msgid "include object size" +msgstr "включить размер объекта" + +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +msgid "list only filenames" +msgstr "выводить только имена файлов" + +#: builtin/ls-tree.c:142 +msgid "use full path names" +msgstr "использовать полные пути" + +#: builtin/ls-tree.c:144 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "вывести полное дерево; не только текущий каталог (включает в себя --full-name)" + +#: builtin/merge.c:45 +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<опции>] [<коммит>…]" + +#: builtin/merge.c:46 +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<опции>] <сообщение> HEAD <коммит>" + +#: builtin/merge.c:47 +msgid "git merge --abort" +msgstr "git merge --abort" + +#: builtin/merge.c:100 +msgid "switch `m' requires a value" +msgstr "при указании параметра «m» требуется указать значение" + +#: builtin/merge.c:137 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Не удалось найти стратегию слияния «%s».\n" + +#: builtin/merge.c:138 +#, c-format +msgid "Available strategies are:" +msgstr "Доступные стратегии:" + +#: builtin/merge.c:143 +#, c-format +msgid "Available custom strategies are:" +msgstr "Доступные пользовательские стратегии:" + +#: builtin/merge.c:193 +msgid "do not show a diffstat at the end of the merge" +msgstr "не выводить статистику изменений после окончания слияния" + +#: builtin/merge.c:196 +msgid "show a diffstat at the end of the merge" +msgstr "вывести статистику изменений после окончания слияния" + +#: builtin/merge.c:197 +msgid "(synonym to --stat)" +msgstr "(синоним для --stat)" + +#: builtin/merge.c:199 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния" + +#: builtin/merge.c:202 +msgid "create a single commit instead of doing a merge" +msgstr "создать один коммит, вместо выполнения слияния" + +#: builtin/merge.c:204 +msgid "perform a commit if the merge succeeds (default)" +msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)" + +#: builtin/merge.c:206 +msgid "edit message before committing" +msgstr "отредактировать сообщение перед выполнением коммита" + +#: builtin/merge.c:207 +msgid "allow fast-forward (default)" +msgstr "разрешить перемотку вперед (по умолчанию)" + +#: builtin/merge.c:209 +msgid "abort if fast-forward is not possible" +msgstr "отменить выполнение слияния, если перемотка вперед не возможна" + +#: builtin/merge.c:213 +msgid "Verify that the named commit has a valid GPG signature" +msgstr "Проверить, что указанный коммит имеет верную электронную подпись GPG" + +#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 +msgid "strategy" +msgstr "стратегия" + +#: builtin/merge.c:215 +msgid "merge strategy to use" +msgstr "используемая стратегия слияния" + +#: builtin/merge.c:216 +msgid "option=value" +msgstr "опция=значение" + +#: builtin/merge.c:217 +msgid "option for selected merge strategy" +msgstr "опции для выбранной стратегии слияния" + +#: builtin/merge.c:219 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)" + +#: builtin/merge.c:223 +msgid "abort the current in-progress merge" +msgstr "отменить выполнение происходящего слияния" + +#: builtin/merge.c:251 +msgid "could not run stash." +msgstr "не удалось выполнить stash." + +#: builtin/merge.c:256 +msgid "stash failed" +msgstr "сбой при выполнении stash" + +#: builtin/merge.c:261 +#, c-format +msgid "not a valid object: %s" +msgstr "неправильный объект: %s" + +#: builtin/merge.c:280 builtin/merge.c:297 +msgid "read-tree failed" +msgstr "сбой при выполнении read-tree" + +#: builtin/merge.c:327 +msgid " (nothing to squash)" +msgstr " (нечего уплотнять)" + +#: builtin/merge.c:340 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Уплотнение коммита — не обновляя HEAD\n" + +#: builtin/merge.c:372 +msgid "Writing SQUASH_MSG" +msgstr "Запись SQUASH_MSG" + +#: builtin/merge.c:374 +msgid "Finishing SQUASH_MSG" +msgstr "Завершение SQUASH_MSG" + +#: builtin/merge.c:397 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Нет сообщения слияния — не обновляем HEAD\n" + +#: builtin/merge.c:447 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "«%s» не указывает на коммит" + +#: builtin/merge.c:559 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Неправильная строка branch.%s.mergeoptions: %s" + +#: builtin/merge.c:654 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree не удалось записать дерево" + +#: 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 "Неизвестный параметр merge-recursive: -X%s" + +#: builtin/merge.c:705 +#, c-format +msgid "unable to write %s" +msgstr "не удалось записать %s" + +#: builtin/merge.c:794 +#, c-format +msgid "Could not read from '%s'" +msgstr "Не удалось прочесть из «%s»" + +#: builtin/merge.c:803 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n" + +#: builtin/merge.c:809 +#, 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 "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n" + +#: builtin/merge.c:833 +msgid "Empty commit message." +msgstr "Пустое сообщение коммита." + +#: builtin/merge.c:845 +#, c-format +msgid "Wonderful.\n" +msgstr "Прекрасно.\n" + +#: builtin/merge.c:900 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n" + +#: builtin/merge.c:916 +#, c-format +msgid "'%s' is not a commit" +msgstr "«%s» не является коммитом" + +#: builtin/merge.c:957 +msgid "No current branch." +msgstr "Нет текущей ветки." + +#: builtin/merge.c:959 +msgid "No remote for the current branch." +msgstr "У текущей ветки нет внешнего репозитория." + +#: builtin/merge.c:961 +msgid "No default upstream defined for the current branch." +msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию." + +#: builtin/merge.c:966 +#, c-format +msgid "No remote-tracking branch for %s from %s" +msgstr "Не указана внешняя отслеживаемая ветка для %s на %s" + +#: builtin/merge.c:1122 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)." + +#: builtin/merge.c:1138 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you merge." +msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием." + +#: builtin/merge.c:1141 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)." + +#: builtin/merge.c:1145 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you merge." +msgstr "Вы не завершили отбор лучшего (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, выполните коммит ваших изменений, перед слиянием." + +#: builtin/merge.c:1148 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "Вы не завершили отбор лучшего (присутствует файл CHERRY_PICK_HEAD)." + +#: builtin/merge.c:1157 +msgid "You cannot combine --squash with --no-ff." +msgstr "Нельзя использовать одновременно --squash и --no-ff." + +#: builtin/merge.c:1166 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен." + +#: builtin/merge.c:1198 +msgid "Can merge only exactly one commit into empty head" +msgstr "Можно слить строго один коммит в пустой HEAD." + +#: builtin/merge.c:1201 +msgid "Squash commit into empty head not supported yet" +msgstr "Уплотнение коммита в пустой HEAD еще не поддерживается" + +#: builtin/merge.c:1203 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустой HEAD." + +#: builtin/merge.c:1208 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s не является тем, что можно слить" + +#: builtin/merge.c:1259 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s." + +#: builtin/merge.c:1262 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s." + +#: builtin/merge.c:1265 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Коммит %s не содержит GPG подпись." + +#: builtin/merge.c:1268 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n" + +#: builtin/merge.c:1349 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Обновление %s..%s\n" + +#: builtin/merge.c:1388 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Попытка тривиального слияния в индексе…\n" + +#: builtin/merge.c:1395 +#, c-format +msgid "Nope.\n" +msgstr "Не вышло.\n" + +#: builtin/merge.c:1427 +msgid "Not possible to fast-forward, aborting." +msgstr "Перемотка вперед не возможна, отмена." + +#: builtin/merge.c:1450 builtin/merge.c:1529 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Перемотка дерева к исходному состоянию…\n" + +#: builtin/merge.c:1454 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Попытка слияния с помощью стратегии %s…\n" + +#: builtin/merge.c:1520 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Ни одна стратегия слияния не обработала слияние.\n" + +#: builtin/merge.c:1522 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Сбой при слиянии с помощью стратегии %s.\n" + +#: builtin/merge.c:1531 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n" + +#: builtin/merge.c:1543 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n" + +#: builtin/merge-base.c:29 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <коммит> <коммит>…" + +#: builtin/merge-base.c:30 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <коммит>…" + +#: builtin/merge-base.c:31 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <коммит>…" + +#: builtin/merge-base.c:32 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <коммит> <коммит>" + +#: 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: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 "git merge-file [<опции>] [-L имя1 [-L orig [-L имя2]]] <файл1> <ориг-файл> <файл2>" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "вывести результат на стандартный вывод" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "использовать diff3 слияние" + +#: 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 "установить метки для файл1/ориг-файл/файл2" + +#: builtin/mktree.c:64 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:150 +msgid "input is NUL terminated" +msgstr "ввод отделенный НУЛЕВЫМИ символами" + +#: builtin/mktree.c:151 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "допустить отсутствие объектов" + +#: builtin/mktree.c:152 +msgid "allow creation of more than one tree" +msgstr "допустить создание более одного дерева" + +#: builtin/mv.c:15 +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<опции>] <источник>… <назначение>" + +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "Каталог %s в индексе и не является подмодулем?" + +#: builtin/mv.c:71 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules" + +#: builtin/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s в индесе" + +#: builtin/mv.c:111 +msgid "force move/rename even if target exists" +msgstr "принудительно перемещать/переименовать, даже если цель существует" + +#: builtin/mv.c:112 +msgid "skip move/rename errors" +msgstr "пропускать ошибки при перемещении/переименовании" + +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "целевой путь «%s» не является каталогом" + +#: builtin/mv.c:162 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "Проверка переименования из «%s» в «%s»\n" + +#: builtin/mv.c:166 +msgid "bad source" +msgstr "плохой источник" + +#: builtin/mv.c:169 +msgid "can not move directory into itself" +msgstr "нельзя переместить каталог в самого себя" + +#: builtin/mv.c:172 +msgid "cannot move directory over file" +msgstr "нельзя переместить каталог в файл" + +#: builtin/mv.c:181 +msgid "source directory is empty" +msgstr "исходный каталог пуст" + +#: builtin/mv.c:206 +msgid "not under version control" +msgstr "не под версионным контролем" + +#: builtin/mv.c:209 +msgid "destination exists" +msgstr "целевой путь уже существует" + +#: builtin/mv.c:217 +#, c-format +msgid "overwriting '%s'" +msgstr "перезапись «%s»" + +#: builtin/mv.c:220 +msgid "Cannot overwrite" +msgstr "Не удалось перезаписать" + +#: builtin/mv.c:223 +msgid "multiple sources for the same target" +msgstr "несколько источников для одного целевого пути" + +#: builtin/mv.c:225 +msgid "destination directory does not exist" +msgstr "целевой каталог не существует" + +#: builtin/mv.c:232 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, откуда=%s, куда=%s" + +#: builtin/mv.c:253 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Переименование %s в %s\n" + +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 +#, c-format +msgid "renaming '%s' failed" +msgstr "сбой при переименовании «%s»" + +#: builtin/name-rev.c:255 +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<опции>] <коммит>…" + +#: builtin/name-rev.c:256 +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<опции>] --all" + +#: builtin/name-rev.c:257 +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<опции>] --stdin" + +#: builtin/name-rev.c:309 +msgid "print only names (no SHA-1)" +msgstr "выводить только имена (без SHA-1)" + +#: builtin/name-rev.c:310 +msgid "only use tags to name the commits" +msgstr "использовать только метки для именования коммитов" + +#: builtin/name-rev.c:312 +msgid "only use refs matching <pattern>" +msgstr "использовать только ссылки, соответствующие <шаблону> " + +#: builtin/name-rev.c:314 +msgid "list all commits reachable from all refs" +msgstr "вывести список всех коммитов, достижимых со всех ссылок" + +#: builtin/name-rev.c:315 +msgid "read from stdin" +msgstr "прочитать из стандартного ввода" + +#: builtin/name-rev.c:316 +msgid "allow to print `undefined` names (default)" +msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)" + +#: builtin/name-rev.c:322 +msgid "dereference tags in the input (internal use)" +msgstr "разыменовывать введенные метки (для внутреннего использования)" + +#: builtin/notes.c:24 +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "git notes [--ref <ссылка-на-заметку>] [list [<объект>]]" + +#: builtin/notes.c:25 +msgid "" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file>" +" | (-c | -C) <object>] [<object>]" +msgstr "git notes [--ref <ссылка-на-заметку>] add [-f] [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" +msgstr "git notes [--ref <ссылка-на-заметку>] copy [-f] <из-объекта> <в-объект>" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |" +" (-c | -C) <object>] [<object>]" +msgstr "git notes [--ref <ссылка-на-заметку>] append [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "git notes [--ref <ссылка-на-заметку>] edit [--allow-empty] [<объект>]" + +#: builtin/notes.c:29 +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <ссылка-на-заметку>] show [<объект>]" + +#: builtin/notes.c:30 +msgid "" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" +msgstr "git notes [--ref <ссылка-на-заметку>] merge [-v | -q] [-s <стратегия>] <ссылка-на-заметку>" + +#: builtin/notes.c:31 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:32 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:33 +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "git notes [--ref <ссылка-на-заметку>] remove [<объект>…]" + +#: builtin/notes.c:34 +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgstr "git notes [--ref <ссылка-на-заметку>] prune [-n | -v]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "git notes [--ref <ссылка-на-заметку>] get-ref" + +#: builtin/notes.c:40 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<объект>]]" + +#: builtin/notes.c:45 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<опции>] [<объект>]" + +#: builtin/notes.c:50 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<опции>] <из-объекта> <в-объект>" + +#: builtin/notes.c:51 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<из-объекта> <в-объект>]…" + +#: builtin/notes.c:56 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<опции>] [<объект>]" + +#: builtin/notes.c:61 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<объект>]" + +#: builtin/notes.c:66 +msgid "git notes show [<object>]" +msgstr "git notes show [<объект>]" + +#: builtin/notes.c:71 +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<опции>] <ссылка-на-заметку>" + +#: builtin/notes.c:72 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<опции>]" + +#: builtin/notes.c:73 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<опции>]" + +#: builtin/notes.c:78 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<опции>]" + +#: builtin/notes.c:83 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<опции>]" + +#: builtin/notes.c:88 +msgid "git notes get-ref" +msgstr "git notes get-ref" + +#: builtin/notes.c:146 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "не удалось запустить «show» для объекта «%s»" + +#: builtin/notes.c:150 +msgid "could not read 'show' output" +msgstr "не удалось прочитать вывод «show»" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "не удалось завершить «show» для объекта «%s»" + +#: builtin/notes.c:173 builtin/tag.c:477 +#, c-format +msgid "could not create file '%s'" +msgstr "не удалось создать файл «%s»" + +#: builtin/notes.c:192 +msgid "Please supply the note contents using either -m or -F option" +msgstr "Пожалуйста, укажите содержимое заметки, используя опцию -m или -F" + +#: builtin/notes.c:201 +msgid "unable to write note object" +msgstr "не удалось записать объект заметки" + +#: builtin/notes.c:203 +#, c-format +msgid "The note contents have been left in %s" +msgstr "Содержимое заметки осталось в %s" + +#: builtin/notes.c:231 builtin/tag.c:693 +#, c-format +msgid "cannot read '%s'" +msgstr "не удалось прочитать «%s»" + +#: builtin/notes.c:233 builtin/tag.c:696 +#, c-format +msgid "could not open or read '%s'" +msgstr "не удалось открыть или прочитать «%s»" + +#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 +#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 +#: builtin/notes.c:854 builtin/tag.c:709 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Не удалось разрешить «%s» как ссылку." + +#: builtin/notes.c:255 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Не удалось прочитать объект «%s»." + +#: builtin/notes.c:259 +#, c-format +msgid "Cannot read note data from non-blob object '%s'." +msgstr "Не удалось прочитать данные заметки из недвоичного объекта «%s»." + +#: builtin/notes.c:299 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Плохая строка ввода: «%s»." + +#: builtin/notes.c:314 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Не удалось скопировать заметку из «%s» в «%s»" + +#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 +#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 +#: builtin/notes.c:919 +msgid "too many parameters" +msgstr "передано слишком много параметров" + +#: builtin/notes.c:371 builtin/notes.c:658 +#, c-format +msgid "No note found for object %s." +msgstr "Не найдена заметка для объекта %s." + +#: builtin/notes.c:392 builtin/notes.c:555 +msgid "note contents as a string" +msgstr "текстовое содержимое заметки" + +#: builtin/notes.c:395 builtin/notes.c:558 +msgid "note contents in a file" +msgstr "содержимое заметки в файле" + +#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 +#: builtin/notes.c:563 builtin/tag.c:628 +msgid "object" +msgstr "объект" + +#: builtin/notes.c:398 builtin/notes.c:561 +msgid "reuse and edit specified note object" +msgstr "использовать и отредактировать указанный объект заметки" + +#: builtin/notes.c:401 builtin/notes.c:564 +msgid "reuse specified note object" +msgstr "использовать указанный объект заметки" + +#: builtin/notes.c:404 builtin/notes.c:567 +msgid "allow storing empty note" +msgstr "разрешить сохранение пустой заметки" + +#: builtin/notes.c:405 builtin/notes.c:476 +msgid "replace existing notes" +msgstr "заменить существующие заметки" + +#: builtin/notes.c:430 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." + +#: builtin/notes.c:445 builtin/notes.c:524 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Перезапись существующих заметок у объекта %s\n" + +#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Удаление заметки у объекта %s\n" + +#: builtin/notes.c:477 +msgid "read objects from stdin" +msgstr "прочитать объекты из стандартного ввода" + +#: builtin/notes.c:479 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)" + +#: builtin/notes.c:497 +msgid "too few parameters" +msgstr "передано слишком мало параметров" + +#: builtin/notes.c:518 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite" +" existing notes" +msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." + +#: builtin/notes.c:530 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Нет заметок у исходного объекта %s. Нельзя скопировать." + +#: builtin/notes.c:582 +#, 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 "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n" + +#: builtin/notes.c:750 +msgid "General options" +msgstr "Общие опции" + +#: builtin/notes.c:752 +msgid "Merge options" +msgstr "Опции слияния" + +#: builtin/notes.c:754 +msgid "" +"resolve notes conflicts using the given strategy " +"(manual/ours/theirs/union/cat_sort_uniq)" +msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)" + +#: builtin/notes.c:756 +msgid "Committing unmerged notes" +msgstr "Коммит не слитых заметок" + +#: builtin/notes.c:758 +msgid "finalize notes merge by committing unmerged notes" +msgstr "завершить слияние заметок коммитом не слитых заметок" + +#: builtin/notes.c:760 +msgid "Aborting notes merge resolution" +msgstr "Отмена разрешения слияния заметок" + +#: builtin/notes.c:762 +msgid "abort notes merge" +msgstr "отменить слияние заметок" + +#: builtin/notes.c:857 +#, c-format +msgid "Object %s has no note\n" +msgstr "У объекта %s нет заметки\n" + +#: builtin/notes.c:869 +msgid "attempt to remove non-existent note is not an error" +msgstr "попытка удаления несуществующей заметки не является ошибкой" + +#: builtin/notes.c:872 +msgid "read object names from the standard input" +msgstr "прочитать имена объектов из стандартного ввода" + +#: builtin/notes.c:953 +msgid "notes-ref" +msgstr "ссылка-на-заметку" + +#: builtin/notes.c:954 +msgid "use notes from <notes-ref>" +msgstr "использовать заметку из <ссылка-на-заметку>" + +#: builtin/notes.c:989 builtin/remote.c:1621 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Неизвестная подкоманда: %s" + +#: builtin/pack-objects.c:28 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "git pack-objects --stdout [опции…] [< список-ссылок | < список-объектов]" + +#: builtin/pack-objects.c:29 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "git pack-objects [опции…] имя-базы [< список-ссылок | < список-объектов]" + +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#, c-format +msgid "deflate error (%d)" +msgstr "ошибка сжатия (%d)" + +#: builtin/pack-objects.c:771 +msgid "Writing objects" +msgstr "Запись объектов" + +#: builtin/pack-objects.c:1013 +msgid "disabling bitmap writing, as some objects are not being packed" +msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы" + +#: builtin/pack-objects.c:2173 +msgid "Compressing objects" +msgstr "Сжатие объектов" + +#: builtin/pack-objects.c:2570 +#, c-format +msgid "unsupported index version %s" +msgstr "неподдерживаемая версия индекса %s" + +#: builtin/pack-objects.c:2574 +#, c-format +msgid "bad index version '%s'" +msgstr "плохая версия индекса «%s»" + +#: builtin/pack-objects.c:2597 +#, c-format +msgid "option %s does not accept negative form" +msgstr "опция %s не принимает отрицательные значения" + +#: builtin/pack-objects.c:2601 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "не удалось разобрать значение «%s» для опции %s" + +#: builtin/pack-objects.c:2621 +msgid "do not show progress meter" +msgstr "не выводить прогресс выполнения" + +#: builtin/pack-objects.c:2623 +msgid "show progress meter" +msgstr "показать прогресс выполнения" + +#: builtin/pack-objects.c:2625 +msgid "show progress meter during object writing phase" +msgstr "показать прогресс выполнения во время записи объектов" + +#: builtin/pack-objects.c:2628 +msgid "similar to --all-progress when progress meter is shown" +msgstr "похоже на --all-progress при включенном прогрессе выполнения" + +#: builtin/pack-objects.c:2629 +msgid "version[,offset]" +msgstr "версия[,смещение]" + +#: builtin/pack-objects.c:2630 +msgid "write the pack index file in the specified idx format version" +msgstr "записать файл индекса пакета в указанной версии формата" + +#: builtin/pack-objects.c:2633 +msgid "maximum size of each output pack file" +msgstr "максимальный размер каждого выходного файла пакета" + +#: builtin/pack-objects.c:2635 +msgid "ignore borrowed objects from alternate object store" +msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов" + +#: builtin/pack-objects.c:2637 +msgid "ignore packed objects" +msgstr "игнорировать упакованные объекты" + +#: builtin/pack-objects.c:2639 +msgid "limit pack window by objects" +msgstr "ограничить окно пакета по количеству объектов" + +#: builtin/pack-objects.c:2641 +msgid "limit pack window by memory in addition to object limit" +msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти" + +#: builtin/pack-objects.c:2643 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете" + +#: builtin/pack-objects.c:2645 +msgid "reuse existing deltas" +msgstr "использовать повторно существующие дельты" + +#: builtin/pack-objects.c:2647 +msgid "reuse existing objects" +msgstr "использовать повторно существующие объекты" + +#: builtin/pack-objects.c:2649 +msgid "use OFS_DELTA objects" +msgstr "использовать объекты OFS_DELTA" + +#: builtin/pack-objects.c:2651 +msgid "use threads when searching for best delta matches" +msgstr "использовать многопоточность при поиске лучших совпадений дельт" + +#: builtin/pack-objects.c:2653 +msgid "do not create an empty pack output" +msgstr "не создавать пустые выходные пакеты" + +#: builtin/pack-objects.c:2655 +msgid "read revision arguments from standard input" +msgstr "прочитать аргументы редакций из стандартного ввода" + +#: builtin/pack-objects.c:2657 +msgid "limit the objects to those that are not yet packed" +msgstr "ограничиться объектами, которые еще не упакованы" + +#: builtin/pack-objects.c:2660 +msgid "include objects reachable from any reference" +msgstr "включить объекты, которые достижимы по любой из ссылок" + +#: builtin/pack-objects.c:2663 +msgid "include objects referred by reflog entries" +msgstr "включить объекты, на которые ссылаются записи журнала ссылок" + +#: builtin/pack-objects.c:2666 +msgid "include objects referred to by the index" +msgstr "включить объекты, на которые ссылается индекс" + +#: builtin/pack-objects.c:2669 +msgid "output pack to stdout" +msgstr "вывести пакет на стандартный вывод" + +#: builtin/pack-objects.c:2671 +msgid "include tag objects that refer to objects to be packed" +msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты" + +#: builtin/pack-objects.c:2673 +msgid "keep unreachable objects" +msgstr "сохранять ссылки на недоступные объекты" + +#: builtin/pack-objects.c:2674 parse-options.h:140 +msgid "time" +msgstr "время" + +#: builtin/pack-objects.c:2675 +msgid "unpack unreachable objects newer than <time>" +msgstr "распаковать недоступные объекты, которые новее, чем <время>" + +#: builtin/pack-objects.c:2678 +msgid "create thin packs" +msgstr "создавать тонкие пакеты" + +#: builtin/pack-objects.c:2680 +msgid "create packs suitable for shallow fetches" +msgstr "создавать пакеты, подходящие для частичных извлечений" + +#: builtin/pack-objects.c:2682 +msgid "ignore packs that have companion .keep file" +msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл" + +#: builtin/pack-objects.c:2684 +msgid "pack compression level" +msgstr "уровень сжатия пакета" + +#: builtin/pack-objects.c:2686 +msgid "do not hide commits by grafts" +msgstr "не скрывать коммиты сращениями" + +#: builtin/pack-objects.c:2688 +msgid "use a bitmap index if available to speed up counting objects" +msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов" + +#: builtin/pack-objects.c:2690 +msgid "write a bitmap index together with the pack index" +msgstr "запись индекса в битовых картах вместе с индексом пакета" + +#: builtin/pack-objects.c:2781 +msgid "Counting objects" +msgstr "Подсчет объектов" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<опции>]" + +#: 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 "git prune-packed [-n | --dry-run] [-q | --quiet]" + +#: builtin/prune-packed.c:40 +msgid "Removing duplicate objects" +msgstr "Удаление дублирующихся объектов" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <время>] [--] [<имя-ветки>…]" + +#: builtin/prune.c:106 +msgid "do not remove, show only" +msgstr "не удалять, только показать список" + +#: builtin/prune.c:107 +msgid "report pruned objects" +msgstr "вывести список удаленных объектов" + +#: builtin/prune.c:110 +msgid "expire objects older than <time>" +msgstr "удалить объекты старее чем <дата-окончания>" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<опции>] [<репозиторий> [<спецификация-ссылки>…]]" + +#: builtin/push.c:85 +msgid "tag shorthand without <tag>" +msgstr "указано сокращение tag, но не указана сама <метка>" + +#: builtin/push.c:95 +msgid "--delete only accepts plain target ref names" +msgstr "опция --delete принимает только простые целевые имена ссылок" + +#: builtin/push.c:139 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»." + +#: builtin/push.c:142 +#, 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 "Имя вышестоящей ветки и вашей текущей ветки различаются. Чтобы отправить изменения в вышестоящую ветку на внешнем репозитории, используйте:\n\n git push %s HEAD:%s\n\nЧтобы отправить изменения в ветку с таким же именем на внешнем репозитории, используйте:\n\n git push %s %s\n%s" + +#: builtin/push.c:157 +#, 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 "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделенный HEAD) состоянию, используйте\n\n git push %s HEAD:<имя-внешней-ветки>\n" + +#: builtin/push.c:171 +#, 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 "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n git push --set-upstream %s %s\n" + +#: builtin/push.c:179 +#, c-format +msgid "" +"The current branch %s has multiple upstream branches, refusing to push." +msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений." + +#: builtin/push.c:182 +#, c-format +msgid "" +"You are pushing to remote '%s', which is not the upstream of\n" +"your current branch '%s', without telling me what to push\n" +"to update which remote branch." +msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку." + +#: builtin/push.c:205 +msgid "" +"push.default is unset; its implicit value has changed in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the traditional behavior, 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" +"Since Git 2.0, Git defaults 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» на «simple». Чтобы прекратить вывод этого сообщения и сохранить старое поведение, используйте:\n\n git config --global push.default matching\n\nЧтобы прекратить вывод этого сообщения и использовать новое поведение, используйте:\n\n git config --global push.default simple\n\nКогда push.default установлено в «matching», git будет отправлять изменения локальных веток в существующие внешние ветки с таким же именем.\n\nНачиная с Git версии 2.0, по умолчанию используется более консервативное поведение «simple», которое отправляет изменения текущей ветки в соответствующую внешнюю ветку, из которой «git pull» забирает изменения.\n\nСмотрите «git help config» и ищите «push.default» для дополнительной информации.\n(режим «simple» появился в Git версии 1.7.11. Используйте похожий режим «current» вместо «simple», если вы иногда используете старые версии Git)" + +#: builtin/push.c:272 +msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "Вы не указали спецификацию ссылки для отправки, а push.default указан как \"nothing\"." + +#: builtin/push.c:279 +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 "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации смотрите «Note about fast-forwards»\nв «git push --help»." + +#: builtin/push.c:285 +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 "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации смотрите «Note about fast-forwards»\nв «git push --help»." + +#: builtin/push.c:291 +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 "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации смотрите «Note about fast-forwards»\nв «git push --help»." + +#: builtin/push.c:298 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "Обновления были отклонены, так как метка уже существует во внешнем репозитории." + +#: builtin/push.c:301 +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 "Вы не можете обновить внешнюю ссылку, которая указывает на объект, не являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на объект, не являющийся коммитом, без указания опции «--force».\n" + +#: builtin/push.c:360 +#, c-format +msgid "Pushing to %s\n" +msgstr "Отправка в %s\n" + +#: builtin/push.c:364 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "не удалось отправить некоторые ссылки в «%s»" + +#: builtin/push.c:394 +#, c-format +msgid "bad repository '%s'" +msgstr "плохой репозитория «%s»" + +#: builtin/push.c:395 +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 "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью коммандной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n" + +#: builtin/push.c:410 +msgid "--all and --tags are incompatible" +msgstr "--all и --tags нельзя использовать одновременно" + +#: builtin/push.c:411 +msgid "--all can't be combined with refspecs" +msgstr "--all нельзя использовать вместе со спецификациями ссылок" + +#: builtin/push.c:416 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror и --tags нельзя использовать одновременно" + +#: builtin/push.c:417 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror нельзя использовать вместе со спецификациями ссылок" + +#: builtin/push.c:422 +msgid "--all and --mirror are incompatible" +msgstr "--all и --mirror нельзя использовать одновременно" + +#: builtin/push.c:502 +msgid "repository" +msgstr "репозиторий" + +#: builtin/push.c:503 +msgid "push all refs" +msgstr "отправить все ссылки" + +#: builtin/push.c:504 +msgid "mirror all refs" +msgstr "сделать зеркало всех ссылок" + +#: builtin/push.c:506 +msgid "delete refs" +msgstr "удалить ссылки" + +#: builtin/push.c:507 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)" + +#: builtin/push.c:510 +msgid "force updates" +msgstr "принудительное обновление" + +#: builtin/push.c:512 +msgid "refname>:<expect" +msgstr "имя-ссылки>:<ожидается" + +#: builtin/push.c:513 +msgid "require old value of ref to be at this value" +msgstr "требовать, чтобы старое значение ссылки было ожидаемым" + +#: builtin/push.c:516 +msgid "control recursive pushing of submodules" +msgstr "управление рекурсивной отправкой подмодулей" + +#: builtin/push.c:518 +msgid "use thin pack" +msgstr "использовать тонкие пакеты" + +#: builtin/push.c:519 builtin/push.c:520 +msgid "receive pack program" +msgstr "путь к программе упаковки на сервере" + +#: builtin/push.c:521 +msgid "set upstream for git pull/status" +msgstr "установить вышестоящую ветку для git pull/status" + +#: builtin/push.c:524 +msgid "prune locally removed refs" +msgstr "почистить локально удаленные ссылки" + +#: builtin/push.c:526 +msgid "bypass pre-push hook" +msgstr "пропустить перехватчик перед-отправкой" + +#: builtin/push.c:527 +msgid "push missing but relevant tags" +msgstr "отправить пропущенные, но нужные метки" + +#: builtin/push.c:529 +msgid "GPG sign the push" +msgstr "подписать отправку с помощью GPG" + +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "запросить выполнение атомарной транзакции на внешней стороне" + +#: builtin/push.c:539 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete несовместимо с --all, --mirror и --tags" + +#: builtin/push.c:541 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete не имеет смысла без указания ссылок" + +#: builtin/read-tree.c:37 +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 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<префикс>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<файл>] (--empty | <указатель-дерева-1> [<указатель-дерева-2> [<указатель-дерева-3>]])" + +#: builtin/read-tree.c:110 +msgid "write resulting index to <file>" +msgstr "записать результирующий индекс в <файл>" + +#: builtin/read-tree.c:113 +msgid "only empty the index" +msgstr "просто очистить индекс" + +#: builtin/read-tree.c:115 +msgid "Merging" +msgstr "Слияние" + +#: builtin/read-tree.c:117 +msgid "perform a merge in addition to a read" +msgstr "выполнить слияние в дополнение к чтению" + +#: builtin/read-tree.c:119 +msgid "3-way merge if no file level merging required" +msgstr "трехходовое слияние, если не требуется слияние на уровне файлов" + +#: builtin/read-tree.c:121 +msgid "3-way merge in presence of adds and removes" +msgstr "трехходовое слияние в случае присутствия добавлений или удалений файлов" + +#: builtin/read-tree.c:123 +msgid "same as -m, but discard unmerged entries" +msgstr "тоже, что и -m, но отменяет изменения не слитых записей" + +#: builtin/read-tree.c:124 +msgid "<subdirectory>/" +msgstr "<подкаталог>/" + +#: builtin/read-tree.c:125 +msgid "read the tree into the index under <subdirectory>/" +msgstr "прочитать дерево в индекс в <подкаталог>/" + +#: builtin/read-tree.c:128 +msgid "update working tree with merge result" +msgstr "обновить рабочий каталог результатом слияния" + +#: builtin/read-tree.c:130 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:131 +msgid "allow explicitly ignored files to be overwritten" +msgstr "разрешить перезапись явно игнорируемых файлов" + +#: builtin/read-tree.c:134 +msgid "don't check the working tree after merging" +msgstr "не проверять рабочий каталог после слияния" + +#: builtin/read-tree.c:135 +msgid "don't update the index or the work tree" +msgstr "не обновлять индекс или рабочий каталог" + +#: builtin/read-tree.c:137 +msgid "skip applying sparse checkout filter" +msgstr "пропустить применение фильтра частичного перехода" + +#: builtin/read-tree.c:139 +msgid "debug unpack-trees" +msgstr "отладка unpack-trees" + +#: builtin/reflog.c:429 +#, c-format +msgid "%s' for '%s' is not a valid timestamp" +msgstr "«%s» для «%s» не является допустимой меткой даты/времени" + +#: builtin/reflog.c:546 builtin/reflog.c:551 +#, 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 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: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] <имя> <новый-url> [<старый-url>]" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <имя> <новый-url>" + +#: builtin/remote.c:23 builtin/remote.c:71 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <имя> <url>" + +#: builtin/remote.c:28 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<опции>] <имя> <url>" + +#: 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используйте вместо него --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 "push|fetch" + +#: 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:187 builtin/remote.c:643 +#, c-format +msgid "remote %s already exists." +msgstr "внешний репозиторий %s уже существует" + +#: builtin/remote.c:191 builtin/remote.c:647 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "«%s» не является допустимым именем внешнего репозитория." + +#: builtin/remote.c:235 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Не удалось настроить мастер ветку «%s»" + +#: builtin/remote.c:335 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "Не удалось извлечь карту для спецификации ссылки %s" + +#: builtin/remote.c:436 builtin/remote.c:444 +msgid "(matching)" +msgstr "(соответствующая)" + +#: builtin/remote.c:448 +msgid "(delete)" +msgstr "(удаленная)" + +#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Не удалось добавить «%s» к «%s»" + +#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#, c-format +msgid "No such remote: %s" +msgstr "Нет такого внешнего репозитория: %s" + +#: builtin/remote.c:653 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»" + +#: builtin/remote.c:659 builtin/remote.c:847 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Не удалось удалить секцию файла конфигурации «%s»" + +#: builtin/remote.c:674 +#, c-format +msgid "" +"Not updating non-default fetch refspec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "Не обновляю нестандартную спецификацию ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную." + +#: builtin/remote.c:680 +#, c-format +msgid "Could not append '%s'" +msgstr "Не удалось добавить «%s»" + +#: builtin/remote.c:691 +#, c-format +msgid "Could not set '%s'" +msgstr "Не удалось установить «%s»" + +#: builtin/remote.c:713 +#, c-format +msgid "deleting '%s' failed" +msgstr "не удалось удалить «%s»" + +#: builtin/remote.c:747 +#, c-format +msgid "creating '%s' failed" +msgstr "не удалось создать «%s»" + +#: builtin/remote.c:766 +#, c-format +msgid "Could not remove branch %s" +msgstr "Не удалось удалить ветку «%s»" + +#: builtin/remote.c:833 +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чтобы удалить их, используйте:" +msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" + +#: builtin/remote.c:948 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " новая (следующее извлечение сохранит ее в remotes/%s)" + +#: builtin/remote.c:951 +msgid " tracked" +msgstr " отслеживается" + +#: builtin/remote.c:953 +msgid " stale (use 'git remote prune' to remove)" +msgstr " недействительна (используйте «git remote prune», чтобы удалить)" + +#: builtin/remote.c:955 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:996 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой" + +#: builtin/remote.c:1003 +#, c-format +msgid "rebases onto remote %s" +msgstr "будет перемещена над внешней веткой %s" + +#: builtin/remote.c:1006 +#, c-format +msgid " merges with remote %s" +msgstr " будет слита с внешней веткой %s" + +#: builtin/remote.c:1007 +msgid " and with remote" +msgstr " и с внешней веткой" + +#: builtin/remote.c:1009 +#, c-format +msgid "merges with remote %s" +msgstr "будет слита с внешней веткой %s" + +#: builtin/remote.c:1010 +msgid " and with remote" +msgstr " и с внешней веткой" + +#: builtin/remote.c:1056 +msgid "create" +msgstr "создана" + +#: builtin/remote.c:1059 +msgid "delete" +msgstr "удалена" + +#: builtin/remote.c:1063 +msgid "up to date" +msgstr "уже актуальна" + +#: builtin/remote.c:1066 +msgid "fast-forwardable" +msgstr "возможна перемотка вперед" + +#: builtin/remote.c:1069 +msgid "local out of date" +msgstr "локальная ветка устарела" + +#: builtin/remote.c:1076 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s будет принудительно отправлена в %-*s (%s)" + +#: builtin/remote.c:1079 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s будет отправлена в %-*s (%s)" + +#: builtin/remote.c:1083 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s будет принудительно отправлена в %s" + +#: builtin/remote.c:1086 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s будет отправлена в %s" + +#: builtin/remote.c:1154 +msgid "do not query remotes" +msgstr "не опрашивать внешние репозитории" + +#: builtin/remote.c:1181 +#, c-format +msgid "* remote %s" +msgstr "* внешний репозиторий %s" + +#: builtin/remote.c:1182 +#, c-format +msgid " Fetch URL: %s" +msgstr " URL для извлечения: %s" + +#: builtin/remote.c:1183 builtin/remote.c:1334 +msgid "(no URL)" +msgstr "(нет URL)" + +#: builtin/remote.c:1192 builtin/remote.c:1194 +#, c-format +msgid " Push URL: %s" +msgstr " URL для отправки: %s" + +#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#, c-format +msgid " HEAD branch: %s" +msgstr " HEAD ветка: %s" + +#: builtin/remote.c:1202 +#, c-format +msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n" + +#: builtin/remote.c:1214 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Внешняя ветка:%s" +msgstr[1] " Внешние ветки:%s" +msgstr[2] " Внешние ветки:%s" + +#: builtin/remote.c:1217 builtin/remote.c:1244 +msgid " (status not queried)" +msgstr " (статус не запрошен)" + +#: builtin/remote.c:1226 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Локальная ветка, настроенная для «git pull»:" +msgstr[1] " Локальные ветки, настроенные для «git pull»:" +msgstr[2] " Локальные ветки, настроенные для «git pull»:" + +#: builtin/remote.c:1234 +msgid " Local refs will be mirrored by 'git push'" +msgstr " Локальные ссылки, зеркалируемые с помощью «git push»" + +#: builtin/remote.c:1241 +#, 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:" +msgstr[2] " Локальные ссылки, настроенные для «git push»%s:" + +#: builtin/remote.c:1262 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория" + +#: builtin/remote.c:1264 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "удалить refs/remotes/<имя>/HEAD" + +#: builtin/remote.c:1279 +msgid "Cannot determine remote HEAD" +msgstr "Не удалось определить внешний HEAD" + +#: builtin/remote.c:1281 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:" + +#: builtin/remote.c:1291 +#, c-format +msgid "Could not delete %s" +msgstr "Не удалось удалить %s" + +#: builtin/remote.c:1299 +#, c-format +msgid "Not a valid ref: %s" +msgstr "Неправильная ссылка: %s" + +#: builtin/remote.c:1301 +#, c-format +msgid "Could not setup %s" +msgstr "Не удалось настроить %s" + +#: builtin/remote.c:1319 +#, c-format +msgid " %s will become dangling!" +msgstr " %s будет висящей веткой!" + +#: builtin/remote.c:1320 +#, c-format +msgid " %s has become dangling!" +msgstr " %s стала висящей веткой!" + +#: builtin/remote.c:1330 +#, c-format +msgid "Pruning %s" +msgstr "Удаление %s" + +#: builtin/remote.c:1331 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1354 +#, c-format +msgid " * [would prune] %s" +msgstr " * [будет удалена] %s" + +#: builtin/remote.c:1357 +#, c-format +msgid " * [pruned] %s" +msgstr " * [удалена] %s" + +#: builtin/remote.c:1402 +msgid "prune remotes after fetching" +msgstr "почистить внешние репозитории после извлечения" + +#: builtin/remote.c:1468 builtin/remote.c:1542 +#, c-format +msgid "No such remote '%s'" +msgstr "Нет такого внешнего репозитория «%s»" + +#: builtin/remote.c:1488 +msgid "add branch" +msgstr "добавить ветку" + +#: builtin/remote.c:1495 +msgid "no remote specified" +msgstr "не указан внешний репозиторий" + +#: builtin/remote.c:1517 +msgid "manipulate push URLs" +msgstr "управление URL отправки" + +#: builtin/remote.c:1519 +msgid "add URL" +msgstr "добавить URL" + +#: builtin/remote.c:1521 +msgid "delete URLs" +msgstr "удалить URL" + +#: builtin/remote.c:1528 +msgid "--add --delete doesn't make sense" +msgstr "--add нельзя использовать одновременно с --delete" + +#: builtin/remote.c:1568 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "Неправильный шаблон старого URL: %s" + +#: builtin/remote.c:1576 +#, c-format +msgid "No such URL found: %s" +msgstr "Не найдены совпадения URL: %s" + +#: builtin/remote.c:1578 +msgid "Will not delete all non-push URLs" +msgstr "Нельзя удалить все URL не-отправки" + +#: builtin/remote.c:1592 +msgid "be verbose; must be placed before a subcommand" +msgstr "быть многословнее; должно стоять перед подкомандой" + +#: builtin/repack.c:17 +msgid "git repack [<options>]" +msgstr "git repack [<опции>]" + +#: builtin/repack.c:159 +msgid "pack everything in a single pack" +msgstr "упаковать всё в один пакет" + +#: builtin/repack.c:161 +msgid "same as -a, and turn unreachable objects loose" +msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты" + +#: builtin/repack.c:164 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "удалите лишние пакеты и запустите git-prune-packed" + +#: builtin/repack.c:166 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "передать опцию --no-reuse-delta в git-pack-objects" + +#: builtin/repack.c:168 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "передать опцию --no-reuse-object в git-pack-objects" + +#: builtin/repack.c:170 +msgid "do not run git-update-server-info" +msgstr "не запускать git-update-server-info" + +#: builtin/repack.c:173 +msgid "pass --local to git-pack-objects" +msgstr "передать опцию --local в git-pack-objects" + +#: builtin/repack.c:175 +msgid "write bitmap index" +msgstr "запись индекса в битовых картах" + +#: builtin/repack.c:176 +msgid "approxidate" +msgstr "примерная-дата" + +#: builtin/repack.c:177 +msgid "with -A, do not loosen objects older than this" +msgstr "с опцией -A, не отбрасывать объекты старее, чем указано" + +#: builtin/repack.c:179 +msgid "size of the window used for delta compression" +msgstr "размер окна, используемый для компрессии дельт" + +#: builtin/repack.c:180 builtin/repack.c:184 +msgid "bytes" +msgstr "количество-байт" + +#: builtin/repack.c:181 +msgid "same as the above, but limit memory size instead of entries count" +msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей" + +#: builtin/repack.c:183 +msgid "limits the maximum delta depth" +msgstr "ограничение на максимальную глубину дельт" + +#: builtin/repack.c:185 +msgid "maximum size of each packfile" +msgstr "максимальный размер каждого из файлов пакета" + +#: builtin/repack.c:187 +msgid "repack objects in packs marked with .keep" +msgstr "переупаковать объекты в пакеты, помеченные файлом .keep" + +#: builtin/repack.c:375 +#, c-format +msgid "removing '%s' failed" +msgstr "не удалось удалить «%s»" + +#: builtin/replace.c:19 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <объект> <замена>" + +#: builtin/replace.c:20 +msgid "git replace [-f] --edit <object>" +msgstr "git replace [-f] --edit <объект>" + +#: builtin/replace.c:21 +msgid "git replace [-f] --graft <commit> [<parent>...]" +msgstr "git replace [-f] --graft <коммит> [<родитель>…]" + +#: builtin/replace.c:22 +msgid "git replace -d <object>..." +msgstr "git replace -d <объект>…" + +#: builtin/replace.c:23 +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<формат>] [-l [<шаблон>]]" + +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#, c-format +msgid "Not a valid object name: '%s'" +msgstr "Недопустимое имя объекта: «%s»" + +#: builtin/replace.c:355 +#, c-format +msgid "bad mergetag in commit '%s'" +msgstr "плохая метка слияния в коммите «%s»" + +#: builtin/replace.c:357 +#, c-format +msgid "malformed mergetag in commit '%s'" +msgstr "поврежденная метка слияния в коммите «%s»" + +#: builtin/replace.c:368 +#, c-format +msgid "" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" +msgstr "оригинальный коммит «%s» содержит метку слияния «%s», которая была отброшена; используйте --edit вместо --graft" + +#: builtin/replace.c:401 +#, c-format +msgid "the original commit '%s' has a gpg signature." +msgstr "оригинальный коммит «%s» содержит подпись gpg." + +#: builtin/replace.c:402 +msgid "the signature will be removed in the replacement commit!" +msgstr "подпись будет удалена в замененном коммите!" + +#: builtin/replace.c:408 +#, c-format +msgid "could not write replacement commit for: '%s'" +msgstr "не удалось записать замену для коммита: «%s»" + +#: builtin/replace.c:432 +msgid "list replace refs" +msgstr "вывести список заменяемых ссылок" + +#: builtin/replace.c:433 +msgid "delete replace refs" +msgstr "удаление заменяемых ссылок" + +#: builtin/replace.c:434 +msgid "edit existing object" +msgstr "изменение существующего объекта" + +#: builtin/replace.c:435 +msgid "change a commit's parents" +msgstr "изменение родителя коммита" + +#: builtin/replace.c:436 +msgid "replace the ref if it exists" +msgstr "замена ссылки, если она существует" + +#: builtin/replace.c:437 +msgid "do not pretty-print contents for --edit" +msgstr "не делать структурированный вывод содержимого для --edit" + +#: builtin/replace.c:438 +msgid "use this format" +msgstr "использовать этот формат" + +#: builtin/rerere.c:12 +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]" + +#: builtin/rerere.c:57 +msgid "register clean resolutions in index" +msgstr "записать чистые разрешения конфликтов в индекс" + +#: builtin/reset.c:26 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]" + +#: builtin/reset.c:27 +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <указатель-дерева> [--] <пути>…" + +#: builtin/reset.c:28 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<указатель-дерева>] [--] [<пути>…]" + +#: builtin/reset.c:34 +msgid "mixed" +msgstr "смешанный" + +#: builtin/reset.c:34 +msgid "soft" +msgstr "мягкий" + +#: builtin/reset.c:34 +msgid "hard" +msgstr "жесткий" + +#: builtin/reset.c:34 +msgid "merge" +msgstr "слиянием" + +#: builtin/reset.c:34 +msgid "keep" +msgstr "оставлением" + +#: builtin/reset.c:74 +msgid "You do not have a valid HEAD." +msgstr "У вас нет верного HEAD." + +#: builtin/reset.c:76 +msgid "Failed to find tree of HEAD." +msgstr "Не удалось найти дерево у HEAD." + +#: builtin/reset.c:82 +#, c-format +msgid "Failed to find tree of %s." +msgstr "Не удалось найти дерево у %s." + +#: builtin/reset.c:100 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD сейчас на %s" + +#: builtin/reset.c:183 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "Нельзя сделать сброс «%s» во время слияния." + +#: builtin/reset.c:276 +msgid "be quiet, only report errors" +msgstr "тихий режим, выводить только ошибки" + +#: builtin/reset.c:278 +msgid "reset HEAD and index" +msgstr "сбросить HEAD и индекс" + +#: builtin/reset.c:279 +msgid "reset only HEAD" +msgstr "сбросить только HEAD" + +#: builtin/reset.c:281 builtin/reset.c:283 +msgid "reset HEAD, index and working tree" +msgstr "сбросить HEAD, индекс и рабочий каталог" + +#: builtin/reset.c:285 +msgid "reset HEAD but keep local changes" +msgstr "сбросить HEAD, но оставить локальные изменения" + +#: builtin/reset.c:288 +msgid "record only the fact that removed paths will be added later" +msgstr "записать только факт того, что удаленные пути будут добавлены позже" + +#: builtin/reset.c:305 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Не удалось распознать «%s» как действительную редакцию." + +#: builtin/reset.c:308 builtin/reset.c:316 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Не удалось разобрать объект «%s»." + +#: builtin/reset.c:313 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Не удалось распознать «%s» как действительное дерево." + +#: builtin/reset.c:322 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}" + +#: builtin/reset.c:331 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead." + +#: builtin/reset.c:333 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Нельзя сделать сброс «%s» с указанием пути." + +#: builtin/reset.c:343 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "сброс «%s» разрешен только с голым репозиторием" + +#: builtin/reset.c:347 +msgid "-N can only be used with --mixed" +msgstr "-N можно использовать вместе с --mixed" + +#: builtin/reset.c:364 +msgid "Unstaged changes after reset:" +msgstr "Непроиндексированные изменения после сброса:" + +#: builtin/reset.c:370 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Не удалось сбросить файл индекса на редакцию «%s»." + +#: builtin/reset.c:374 +msgid "Could not write new index file." +msgstr "Не удалось записать новый файл индекса." + +#: builtin/rev-parse.c:361 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]" + +#: builtin/rev-parse.c:366 +msgid "keep the `--` passed as an arg" +msgstr "передавать далее «--» как аргумент" + +#: builtin/rev-parse.c:368 +msgid "stop parsing after the first non-option argument" +msgstr "остановить разбор после первого аргумента не являющегося опцией" + +#: builtin/rev-parse.c:371 +msgid "output in stuck long form" +msgstr "выводить аргументы в длинном формате" + +#: builtin/rev-parse.c:499 +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 "git rev-parse --parseopt [<опции>] -- [<аргументы>…]\n or: git rev-parse --sq-quote [<аргумент>…]\n or: git rev-parse [<опции>] [<аргумент>…]\n\nЗапустите команду «git rev-parse --parseopt -h» для получения подробной информации о первом использовании." + +#: builtin/revert.c:22 +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<опции>] <указатель-коммита>…" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "git revert <подкоманда>" + +#: builtin/revert.c:28 +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<опции>] <указатель-коммита>…" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <подкоманда>" + +#: builtin/revert.c:71 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s нельзя использовать одновременно с %s" + +#: 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:104 +msgid "append commit name" +msgstr "добавить имя коммита" + +#: builtin/revert.c:105 +msgid "allow fast-forward" +msgstr "разрешить перемотку вперед" + +#: builtin/revert.c:106 +msgid "preserve initially empty commits" +msgstr "сохранить изначально пустые коммиты" + +#: builtin/revert.c:107 +msgid "allow commits with empty messages" +msgstr "разрешить коммиты с пустыми сообщениями" + +#: builtin/revert.c:108 +msgid "keep redundant, empty commits" +msgstr "оставить избыточные, пустые коммиты" + +#: builtin/revert.c:112 +msgid "program error" +msgstr "ошибка в программе" + +#: builtin/revert.c:197 +msgid "revert failed" +msgstr "сбой возврата коммита" + +#: builtin/revert.c:212 +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 their nested submodules)\n" +"use a .git directory:" +msgstr[0] "следующий подмодуль (или один из вложенных подмодулей)\nиспользует каталог .git:" +msgstr[1] "следующие подмодули (или один из вложенных подмодулей)\nиспользуют каталог .git:" +msgstr[2] "следующие подмодули (или один из вложенных подмодулей)\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] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:" +msgstr[1] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:" +msgstr[2] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от 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] "следующие файлы содержат проиндексированные изменения в индексе:" +msgstr[2] "следующие файлы содержат проиндексированные изменения в индексе:" + +#: builtin/rm.c:244 builtin/rm.c:255 +msgid "" +"\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "\n(используйте опцию «--cached» для оставления файла, или «-f» для принудительного удаления)" + +#: builtin/rm.c:252 +msgid "the following file has local modifications:" +msgid_plural "the following files have local modifications:" +msgstr[0] "следующие файлы содержат локальные изменения:" +msgstr[1] "следующие файлы содержат локальные изменения:" +msgstr[2] "следующие файлы содержат локальные изменения:" + +#: 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 "выход с нулевым кодом возврата, даже если ничего не найдено" + +#: builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "Пожалуйста, проиндексируйте ваши изменения в .gitmodules или спрячьте их, чтобы продолжить" + +#: builtin/rm.c:336 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "не удаляю рекурсивно «%s» без указания опции -r" + +#: 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 "git shortlog [<опции>] [<диапазон-редакций>] [[--] [<путь>…]]" + +#: builtin/shortlog.c:131 +#, c-format +msgid "Missing author: %s" +msgstr "Пропущен автор: %s" + +#: 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 "w[,i1[,i2]]" + +#: builtin/shortlog.c:236 +msgid "Linewrap output" +msgstr "Перенос строк на выводе" + +#: builtin/show-branch.c:9 +msgid "" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +msgstr "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n\t\t[--current] [--color[=<когда>] | --no-color] [--sparse]\n\t\t[--more=<n> | --list | --independent | --merge-base]\n\t\t[--no-name | --sha1-name] [--topics] [(<редакция> | <шаблон>)...]" + +#: builtin/show-branch.c:13 +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<база>]] [--list] [<ссылка>]" + +#: builtin/show-branch.c:652 +msgid "show remote-tracking and local branches" +msgstr "показать список и отслеживаемых внешних и локальных веток" + +#: builtin/show-branch.c:654 +msgid "show remote-tracking branches" +msgstr "показать список отслеживаемых внешних веток" + +#: builtin/show-branch.c:656 +msgid "color '*!+-' corresponding to the branch" +msgstr "окрашивать «*!+-» в соответствии с веткой" + +#: builtin/show-branch.c:658 +msgid "show <n> more commits after the common ancestor" +msgstr "показать <n> коммитов после общего предка" + +#: builtin/show-branch.c:660 +msgid "synonym to more=-1" +msgstr "синоним для more=-1" + +#: builtin/show-branch.c:661 +msgid "suppress naming strings" +msgstr "не выводить именованые строки" + +#: builtin/show-branch.c:663 +msgid "include the current branch" +msgstr "включить в вывод текущую ветку" + +#: builtin/show-branch.c:665 +msgid "name commits with their object names" +msgstr "именовать коммиты их именами объектов" + +#: builtin/show-branch.c:667 +msgid "show possible merge bases" +msgstr "вывести возможные базы слияния" + +#: builtin/show-branch.c:669 +msgid "show refs unreachable from any other ref" +msgstr "вывести ссылки, недоступные из любых других ссылок" + +#: builtin/show-branch.c:671 +msgid "show commits in topological order" +msgstr "вывести коммиты в топологическом порядке" + +#: builtin/show-branch.c:674 +msgid "show only commits not on the first branch" +msgstr "вывести только коммиты, отсуцтвующие в первой ветке" + +#: builtin/show-branch.c:676 +msgid "show merges reachable from only one tip" +msgstr "вывести слияния, достижимые только из одной из верхушек" + +#: builtin/show-branch.c:678 +msgid "topologically sort, maintaining date order where possible" +msgstr "топологическая сортировка, с сохранением порядка дат, если возможно" + +#: builtin/show-branch.c:681 +msgid "<n>[,<base>]" +msgstr "<n>[,<база>]" + +#: builtin/show-branch.c:682 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "показать <n> последних записей в журнале ссылок, начиная с базы" + +#: builtin/show-ref.c:10 +msgid "" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | " +"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<шаблон>…]" + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "git show-ref --exclude-existing[=шаблон] < ref-list" + +#: builtin/show-ref.c:168 +msgid "only show tags (can be combined with heads)" +msgstr "вывести только метки (можно использовать одновременно с --heads)" + +#: builtin/show-ref.c:169 +msgid "only show heads (can be combined with tags)" +msgstr "вывести только головы (можно использовать одновременно с --tags)" + +#: 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 "вывести ссылку HEAD, даже если она будет отфильтрована" + +#: builtin/show-ref.c:177 +msgid "dereference tags into object IDs" +msgstr "разыменовать метки в идентификаторы объектов" + +#: builtin/show-ref.c:179 +msgid "only show SHA1 hash using <n> digits" +msgstr "использовать <n> цифр для вывода SHA-1" + +#: builtin/show-ref.c:183 +msgid "do not print results to stdout (useful with --verify)" +msgstr "не печатать результат на стандартный вывод (полезно с опцией «--verify»)" + +#: 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 "git symbolic-ref [<опции>] <имя> [<ссылка>]" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <имя>" + +#: 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:358 +msgid "reason" +msgstr "причина" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +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 "git tag [-a | -s | -u <идентификатор-ключа>] [-f] [-m <сообщение> | -F <файл>] <имя-метки> [<редакция>]" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <имя-метки>…" + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" +"\t\t[<pattern>...]" +msgstr "git tag -l [-n[<количество>]] [--contains <коммит>] [--points-at <объект>]\n\t\t[<шаблон>…]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <имя-метки>…" + +#: builtin/tag.c:69 +#, c-format +msgid "malformed object at '%s'" +msgstr "Поврежденный объект «%s»" + +#: builtin/tag.c:301 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "слишком длинное имя метки: %.*s…" + +#: builtin/tag.c:306 +#, c-format +msgid "tag '%s' not found." +msgstr "метка «%s» не найдена." + +#: builtin/tag.c:321 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Метка «%s» удалена (была %s)\n" + +#: builtin/tag.c:333 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "не удалось проверить метку «%s»" + +#: builtin/tag.c:343 +#, c-format +msgid "" +"\n" +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be ignored.\n" +msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n" + +#: builtin/tag.c:347 +#, c-format +msgid "" +"\n" +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n" + +#: builtin/tag.c:371 +#, c-format +msgid "unsupported sort specification '%s'" +msgstr "неподдерживаемый способ сортировки «%s»" + +#: builtin/tag.c:373 +#, c-format +msgid "unsupported sort specification '%s' in variable '%s'" +msgstr "неподдерживаемый способ сортировки «%s» в переменной «%s»" + +#: builtin/tag.c:428 +msgid "unable to sign the tag" +msgstr "не удалось подписать метку" + +#: builtin/tag.c:430 +msgid "unable to write tag file" +msgstr "не удалось записать файл метки" + +#: builtin/tag.c:455 +msgid "bad object type." +msgstr "неправильный тип объекта" + +#: builtin/tag.c:468 +msgid "tag header too big." +msgstr "заголовок метки слишком большой." + +#: builtin/tag.c:504 +msgid "no tag message?" +msgstr "нет описания метки?" + +#: builtin/tag.c:510 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Сообщение метки было оставлено в %s\n" + +#: builtin/tag.c:559 +msgid "switch 'points-at' requires an object" +msgstr "при указании параметра «points-at» требуется указать объект" + +#: builtin/tag.c:561 +#, c-format +msgid "malformed object name '%s'" +msgstr "Поврежденное имя объекта «%s»" + +#: builtin/tag.c:589 +msgid "list tag names" +msgstr "список названий меток" + +#: builtin/tag.c:591 +msgid "print <n> lines of each tag message" +msgstr "печатать <n> строк описания от каждой метки" + +#: builtin/tag.c:593 +msgid "delete tags" +msgstr "удалить метки" + +#: builtin/tag.c:594 +msgid "verify tags" +msgstr "проверить метки" + +#: builtin/tag.c:596 +msgid "Tag creation options" +msgstr "Настройки создания метки" + +#: builtin/tag.c:598 +msgid "annotated tag, needs a message" +msgstr "для аннотированной метки нужно сообщение" + +#: builtin/tag.c:600 +msgid "tag message" +msgstr "описание метки" + +#: builtin/tag.c:602 +msgid "annotated and GPG-signed tag" +msgstr "аннотированная и подписанная с помощью GPG метка" + +#: builtin/tag.c:606 +msgid "use another key to sign the tag" +msgstr "использовать другой ключ для подписания метки" + +#: builtin/tag.c:607 +msgid "replace the tag if exists" +msgstr "замена метки, если она существует" + +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Настройки вывода списка меток" + +#: builtin/tag.c:610 +msgid "show tag list in columns" +msgstr "показать список меток по столбцам" + +#: builtin/tag.c:612 +msgid "sort tags" +msgstr "отсортировать метки" + +#: builtin/tag.c:617 builtin/tag.c:623 +msgid "print only tags that contain the commit" +msgstr "вывод только меток, которые содержат коммит" + +#: builtin/tag.c:629 +msgid "print only tags of the object" +msgstr "вывод только меток, определенного объекта" + +#: builtin/tag.c:655 +msgid "--column and -n are incompatible" +msgstr "--column и -n нельзя использовать одновременно" + +#: builtin/tag.c:667 +msgid "--sort and -n are incompatible" +msgstr "--sort и -n нельзя использовать одновременно" + +#: builtin/tag.c:674 +msgid "-n option is only allowed with -l." +msgstr "опцию -n можно использовать только вместе с -l." + +#: builtin/tag.c:676 +msgid "--contains option is only allowed with -l." +msgstr "опцию --contains можно использовать только вместе с -l." + +#: builtin/tag.c:678 +msgid "--points-at option is only allowed with -l." +msgstr "опцию --points-at можно использовать только вместе с -l." + +#: builtin/tag.c:686 +msgid "only one -F or -m option is allowed." +msgstr "-F и -m нельзя использовать одновременно." + +#: builtin/tag.c:706 +msgid "too many params" +msgstr "передано слишком много параметров" + +#: builtin/tag.c:712 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "«%s» не является допустимым именем метки." + +#: builtin/tag.c:717 +#, c-format +msgid "tag '%s' already exists" +msgstr "метка «%s» уже существует" + +#: builtin/tag.c:741 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Метка «%s» обновлена (была %s)\n" + +#: builtin/unpack-objects.c:489 +msgid "Unpacking objects" +msgstr "Распаковка объектов" + +#: builtin/update-index.c:403 +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<опции>] [--] [<файл>…]" + +#: builtin/update-index.c:756 +msgid "continue refresh even when index needs update" +msgstr "продолжить обновление, даже если индекс требует обновления" + +#: builtin/update-index.c:759 +msgid "refresh: ignore submodules" +msgstr "обновление: игнорировать подмодули" + +#: builtin/update-index.c:762 +msgid "do not ignore new files" +msgstr "не игнорировать новые файлы" + +#: builtin/update-index.c:764 +msgid "let files replace directories and vice-versa" +msgstr "разрешить файлам заменять каталоги и наоборот" + +#: builtin/update-index.c:766 +msgid "notice files missing from worktree" +msgstr "замечать файлы отсутствующие в рабочем каталоге" + +#: builtin/update-index.c:768 +msgid "refresh even if index contains unmerged entries" +msgstr "обновить, даже если в индексе имеются не слитые записи" + +#: builtin/update-index.c:771 +msgid "refresh stat information" +msgstr "обновить информацию о статусе файлов" + +#: builtin/update-index.c:775 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "как --refresh, но игнорировать настройку assume-unchanged" + +#: builtin/update-index.c:779 +msgid "<mode>,<object>,<path>" +msgstr "<режим доступа>,<объект>,<путь>" + +#: builtin/update-index.c:780 +msgid "add the specified entry to the index" +msgstr "добавить указанную запись в индекс" + +#: builtin/update-index.c:784 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:785 +msgid "override the executable bit of the listed files" +msgstr "переопределить бит выполнения на указанных файлах" + +#: builtin/update-index.c:789 +msgid "mark files as \"not changing\"" +msgstr "пометить файлы как \"не измененные\"" + +#: builtin/update-index.c:792 +msgid "clear assumed-unchanged bit" +msgstr "убрать пометку assumed-unchanged" + +#: builtin/update-index.c:795 +msgid "mark files as \"index-only\"" +msgstr "пометить файлы как \"только в индексе\"" + +#: builtin/update-index.c:798 +msgid "clear skip-worktree bit" +msgstr "убрать пометку skip-worktree" + +#: builtin/update-index.c:801 +msgid "add to index only; do not add content to object database" +msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов" + +#: builtin/update-index.c:803 +msgid "remove named paths even if present in worktree" +msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге" + +#: builtin/update-index.c:805 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом" + +#: builtin/update-index.c:807 +msgid "read list of paths to be updated from standard input" +msgstr "прочитать список обновляемых путей из стандартного ввода" + +#: builtin/update-index.c:811 +msgid "add entries from standard input to the index" +msgstr "добавить записи из стандатрного ввода в индекс" + +#: builtin/update-index.c:815 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "заново заполнить индекс #2 и #3 для указанных путей" + +#: builtin/update-index.c:819 +msgid "only update entries that differ from HEAD" +msgstr "обновить только записи, которые отличаются от HEAD" + +#: builtin/update-index.c:823 +msgid "ignore files missing from worktree" +msgstr "игнорировать файлы, отсутствующие в рабочем каталоге" + +#: builtin/update-index.c:826 +msgid "report actions to standard output" +msgstr "вывести выполняемые действия на стандартный вывод" + +#: builtin/update-index.c:828 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты" + +#: builtin/update-index.c:832 +msgid "write index in this format" +msgstr "записать индекс в указанном формате" + +#: builtin/update-index.c:834 +msgid "enable or disable split index" +msgstr "разрешить или запретить раздельный индекс" + +#: builtin/update-ref.c:9 +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<опции>] -d <имя-ссылки> [<старое-значение>]" + +#: builtin/update-ref.c:10 +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<опции>] <имя-ссылки> <новое-значение> [<старое-значение>]" + +#: builtin/update-ref.c:11 +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<опции>] --stdin [-z]" + +#: builtin/update-ref.c:359 +msgid "delete the reference" +msgstr "удалить ссылку" + +#: builtin/update-ref.c:361 +msgid "update <refname> not the one it points to" +msgstr "обновить <имя-ссылки> а не то, на что она указывает" + +#: builtin/update-ref.c:362 +msgid "stdin has NUL-terminated arguments" +msgstr "ввод отделенный НУЛЕВЫМИ символами" + +#: builtin/update-ref.c:363 +msgid "read updates from stdin" +msgstr "прочитать обновления из стандартного ввода" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "обновить информацию о серверах с нуля" + +#: builtin/verify-commit.c:17 +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <коммит>…" + +#: builtin/verify-commit.c:75 +msgid "print commit contents" +msgstr "вывести содержимое коммита" + +#: builtin/verify-pack.c:54 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <пакет>…" + +#: builtin/verify-pack.c:64 +msgid "verbose" +msgstr "быть многословнее" + +#: builtin/verify-pack.c:66 +msgid "show statistics only" +msgstr "вывести только статистику" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <метка>…" + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "вывести содержимое метки" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]" + +#: 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 "используется только при отладке" + +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "вывод отладочных сообщений на stderr" + +#: git.c:14 +msgid "" +"'git help -a' and 'git help -g' list available subcommands and some\n" +"concept guides. See 'git help <command>' or 'git help <concept>'\n" +"to read about a specific subcommand or concept." +msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме." + +#: 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 "Создание пустого репозитория Git или реинициализация существующего" + +#: 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 "Сброс текущего состояния HEAD на указанное состояние" + +#: 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 "Создание, вывод списка, удаление или проверка метки, подписанной с помощью GPG" + +#: parse-options.h:143 +msgid "expiry-date" +msgstr "дата-окончания" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "ничего не делает (оставлено для обратной совместимости)" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "быть многословнее" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "тихий режим" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "использовать <n> цифр для вывода SHA-1" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно" + +#: git-am.sh:53 +msgid "You need to set your committer info first" +msgstr "Сначала нужно указать вашу информацию о коммитере" + +#: git-am.sh:98 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется" + +#: git-am.sh:108 +#, 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 "Когда вы разрешите этот конфликт, запустите «$cmdline --continue».\nЕсли вы хотите пропустить этот патч, то запустите «$cmdline --skip».\nЧтобы перейти на оригинальную ветку и остановить применение изменений, запустите «$cmdline --abort»." + +#: git-am.sh:124 +msgid "Cannot fall back to three-way merge." +msgstr "Не удалось откатиться к трехходовому слиянию." + +#: git-am.sh:140 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию." + +#: git-am.sh:142 +msgid "Using index info to reconstruct a base tree..." +msgstr "Использую индекс для реконструкции базового дерева…" + +#: git-am.sh:157 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке." + +#: git-am.sh:166 +msgid "Falling back to patching base and 3-way merge..." +msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…" + +#: git-am.sh:182 +msgid "Failed to merge in the changes." +msgstr "Не удалось слить изменения." + +#: git-am.sh:277 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Только серия патчей StGIT может быть применена за раз" + +#: git-am.sh:364 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Неподдерживаемый формат патча $patch_format." + +#: git-am.sh:366 +msgid "Patch format detection failed." +msgstr "Сбой определения формата патча." + +#: git-am.sh:398 +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 "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее." + +#: git-am.sh:496 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "предыдущий каталог перемещения $dotest еще существует, но передан mbox." + +#: git-am.sh:501 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Пожалуйста, определитесь: --skip или --abort?" + +#: git-am.sh:537 +#, sh-format +msgid "" +"Stray $dotest directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "Найден забытый каталог $dotest.\nИспользуйте «git am --abort», чтобы удалить его." + +#: git-am.sh:545 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем." + +#: git-am.sh:612 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "Индекс не пустой: нельзя применять патчи (в индексе: $files)" + +#: git-am.sh:722 +#, 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 "Патч пуст. Возможно, он был неправильно разделен?\nЕсли вы хотите пропустить этот патч, то вместо этого запустите «$cmdline --skip».\nЧтобы перейти на оригинальную ветку и остановить применение изменений, запустите «$cmdline --abort»." + +#: git-am.sh:749 +msgid "Patch does not have a valid e-mail address." +msgstr "Патч не содержит действительный адрес электронной почты." + +#: git-am.sh:796 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу." + +#: git-am.sh:800 +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:807 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить все " + +#: git-am.sh:843 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Применение: $FIRSTLINE" + +#: git-am.sh:864 +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 add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч." + +#: git-am.sh:872 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "У вас все еще имеются не слитые пути в индексе.\nВозможно, вы забыли вызвать «git add»?" + +#: git-am.sh:888 +msgid "No changes -- Patch already applied." +msgstr "Нет изменений — Патч уже применен." + +#: git-am.sh:898 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Ошибка применения изменений на строке $msgnum $FIRSTLINE" + +#: git-am.sh:901 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "Копию изменений, которые не удалось применить, вы можете найти в:\n $dotest/patch" + +#: git-am.sh:919 +msgid "applying to an empty history" +msgstr "применение к пустой истории" + +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "Вам нужно начать с помощью «git bisect start»" + +#. 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 "Вы уверены, что хотите, чтобы я сделал это [Y - да/n - нет]? " + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "неопознанная опция: «$arg»" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "«$arg» не похоже на действительную редакцию" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "Плохой указатель HEAD — Необходим указатель HEAD" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." +msgstr "Сбой перехода на «$start_head». Попробуйте выполнить «git bisect reset <существующая-ветка>»." + +#: git-bisect.sh:140 +msgid "won't bisect on cg-seek'ed tree" +msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "Плохой указатель HEAD — странная символьная ссылка" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Плохой аргумент bisect_write: $state" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "Плохой ввод номера редакции: $arg" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "Пожалуйста, вызывайте «bisect_state» как минимум с одним аргументом." + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "Плохой ввод номера редакции: $rev" + +#: git-bisect.sh:253 +msgid "'git bisect bad' can take only one argument." +msgstr "«git bisect bad» может принимать только один аргумент." + +#: git-bisect.sh:276 +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:282 +msgid "Are you sure [Y/n]? " +msgstr "Вы уверены [Y - да/n - нет]? " + +#: git-bisect.sh:292 +msgid "" +"You need to give me at least one good and one bad revision.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "Вам нужно передать мне как минимум одну хорошую и одну плохую редакцию.\n(Для этого вы можете использовать команды «git bisect bad» и «git bisect good».)" + +#: git-bisect.sh:295 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revision.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "Для начала нужно запустить «git bisect start».\nПосле этого, вам нужно передать мне как минимум одну хорошую и одну плохую редакцию.\n(Для этого вы можете использовать команды «git bisect bad» и «git bisect good».)" + +#: git-bisect.sh:366 git-bisect.sh:493 +msgid "We are not bisecting." +msgstr "Вы сейчас не в процессе бинарного поиска." + +#: git-bisect.sh:373 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "«$invalid» не является действительным коммитом" + +#: git-bisect.sh:382 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "Не удалось перейти на оригинальную ветку HEAD «$branch».\nПопробуйте запустить «git bisect reset <коммит>»." + +#: git-bisect.sh:409 +msgid "No logfile given" +msgstr "Не передан файл журнала" + +#: git-bisect.sh:410 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "не удалось прочитать $file для повтора изменений" + +#: git-bisect.sh:427 +msgid "?? what are you talking about?" +msgstr "?? вы о чем?" + +#: git-bisect.sh:439 +#, sh-format +msgid "running $command" +msgstr "запускаю $command" + +#: git-bisect.sh:446 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "не удалось выполнить двоичный поиск:\nкод завершения $res от «$command» оказался < 0 или >= 128" + +#: git-bisect.sh:472 +msgid "bisect run cannot continue any more" +msgstr "bisect run больше не может продолжать" + +#: git-bisect.sh:478 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "не удалось выполнить двоичный поиск:\n«bisect_state $state» завершился с кодом ошибки $res" + +#: git-bisect.sh:485 +msgid "bisect run success" +msgstr "bisect run выполнен успешно" + +#: 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 and make a commit." +msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы.\nИсправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит." + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы." + +#: git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием." + +#: git-pull.sh:245 +msgid "updating an unborn branch with changes added to the index" +msgstr "обновление еще не начавшейся ветки с изменениями, добавленными в индекс" + +#: git-pull.sh:269 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "Предупреждение: извлечение обновило голову вашей текущей ветки.\nПредупреждение: перемотка вашего рабочего каталога\nПредупреждение: с коммита $orig_head." + +#: git-pull.sh:294 +msgid "Cannot merge multiple branches into empty head" +msgstr "Нельзя слить несколько веток в пустую указатель на коммит" + +#: git-pull.sh:298 +msgid "Cannot rebase onto multiple branches" +msgstr "Невозможно переместить над несколькими ветками" + +#: git-rebase.sh:57 +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 --continue».\nЕсли вы хотите пропустить этот патч, то запустите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и остановить перемещение, запустите «git rebase --abort»." + +#: git-rebase.sh:165 +msgid "Applied autostash." +msgstr "Применено автоматическое прятанье." + +#: git-rebase.sh:168 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "Не удалось сохранить $stash_sha1" + +#: git-rebase.sh:169 +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 "Применение автоматического прятанья вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" + +#: git-rebase.sh:208 +msgid "The pre-rebase hook refused to rebase." +msgstr "Перехватчик пре-перемещения отказал в перемещении." + +#: git-rebase.sh:213 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "Похоже, git-am выполняется. Перемещение невозможно." + +#: git-rebase.sh:351 +msgid "The --exec option must be used with the --interactive option" +msgstr "Опция --exec должна использоваться вместе с опцией --interactive" + +#: git-rebase.sh:356 +msgid "No rebase in progress?" +msgstr "Нет перемещения в процессе?" + +#: git-rebase.sh:367 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении." + +#: git-rebase.sh:374 +msgid "Cannot read HEAD" +msgstr "Не удалось прочитать HEAD" + +#: git-rebase.sh:377 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add" + +#: git-rebase.sh:395 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Не удалось перейти назад на $head_name" + +#: git-rebase.sh:414 +#, 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 "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное." + +#: git-rebase.sh:465 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "недействительная вышестоящая ветка $upstream_name" + +#: git-rebase.sh:489 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: имеется больше одной базы слияния" + +#: git-rebase.sh:492 git-rebase.sh:496 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: нет базы слияния" + +#: git-rebase.sh:501 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "Не указаывает на действительный коммит: $onto_name" + +#: git-rebase.sh:524 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "критическая ошибка: нет такой ветки: $branch_name" + +#: git-rebase.sh:557 +msgid "Cannot autostash" +msgstr "Не удалось выполнить автоматическое прятанье" + +#: git-rebase.sh:562 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "Изменения автоматически спрятаны: $stash_abbrev" + +#: git-rebase.sh:566 +msgid "Please commit or stash them." +msgstr "Сделайте коммит или спрячьте их." + +#: git-rebase.sh:586 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "Текущая ветка $branch_name уже свежая." + +#: git-rebase.sh:590 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "Текущая ветка $branch_name уже свежая, принудительное перемещение." + +#: git-rebase.sh:601 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "Изменения от $mb до $onto:" + +#: git-rebase.sh:610 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…" + +#: git-rebase.sh:620 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "Перемотана вперед $branch_name до $onto_name." + +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash очистка с параметрами не реализована" + +#: 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:124 git-stash.sh:137 +msgid "Cannot save the current worktree state" +msgstr "Не удалось сохранить текущее состояние рабочего каталога" + +#: git-stash.sh:141 +msgid "No changes selected" +msgstr "Изменения не выбраны" + +#: git-stash.sh:144 +msgid "Cannot remove temporary index (can't happen)" +msgstr "Не удалось удалить временный индекс (не должно случаться)" + +#: git-stash.sh:157 +msgid "Cannot record working tree state" +msgstr "Не удалось записать состояние рабочего каталога" + +#: git-stash.sh:191 +#, sh-format +msgid "Cannot update $ref_stash with $w_commit" +msgstr "Не удалось обновить $ref_stash с помощью $w_commit" + +#. TRANSLATORS: $option is an invalid option, like +#. `--blah-blah'. The 7 spaces at the beginning of the +#. second line correspond to "error: ". So you should line +#. 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:238 +#, sh-format +msgid "" +"error: unknown option for 'stash save': $option\n" +" To provide a message, use git stash save -- '$option'" +msgstr "ошибка: неизвестная опция для «stash save»: $option\n Для предоставления сообщения, используйте git stash save -- '$option'" + +#: git-stash.sh:259 +msgid "No local changes to save" +msgstr "Нет локальных изменений для сохранения" + +#: git-stash.sh:263 +msgid "Cannot initialize stash" +msgstr "Не удалось инициализировать спрятанные изменения" + +#: git-stash.sh:267 +msgid "Cannot save the current status" +msgstr "Не удалось сохранить текущий статус" + +#: git-stash.sh:285 +msgid "Cannot remove worktree changes" +msgstr "Не удалось удалить изменения рабочего каталога" + +#: git-stash.sh:384 +msgid "No stash found." +msgstr "Не найдены спрятанные изменения." + +#: git-stash.sh:391 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "Передано слишком много редакций: $REV" + +#: git-stash.sh:397 +#, sh-format +msgid "$reference is not a valid reference" +msgstr "$reference не является действительной ссылкой" + +#: git-stash.sh:425 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "«$args» не похоже на коммит со спрятанными изменениями" + +#: git-stash.sh:436 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "«$args» не является ссылкой на спрятанные изменения" + +#: git-stash.sh:444 +msgid "unable to refresh index" +msgstr "не удалось обновить индекс" + +#: git-stash.sh:448 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "Нельзя применить спрятанные изменения во время выполнения слияния" + +#: git-stash.sh:456 +msgid "Conflicts in index. Try without --index." +msgstr "Конфликты в индексе. Попробуйте без --index." + +#: git-stash.sh:458 +msgid "Could not save index tree" +msgstr "Не удалось сохранить дерево индекса" + +#: git-stash.sh:492 +msgid "Cannot unstage modified files" +msgstr "Невозможно убрать из индекса измененные файлы" + +#: git-stash.sh:507 +msgid "Index was not unstashed." +msgstr "Индекс не был достат из спрятанных изменений." + +#: git-stash.sh:530 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "Отброшено ${REV} ($s)" + +#: git-stash.sh:531 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений" + +#: git-stash.sh:539 +msgid "No branch name specified" +msgstr "Не указано имя ветки" + +#: git-stash.sh:611 +msgid "(To restore them type \"git stash apply\")" +msgstr "(Чтобы восстановить их, наберите «git stash apply»)" + +#: git-submodule.sh:95 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "не удалось отрезать один компонент адреса «$remoteurl»" + +#: git-submodule.sh:237 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "Не найдено соответствие подмодулей в .gitmodules для пути «$sm_path»" + +#: git-submodule.sh:287 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "Не удалось клонировать «$url» в подмодуль по пути «$sm_path»" + +#: git-submodule.sh:296 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "Каталог Git «$a» является частью пути подмодуля «$b» или наоборот" + +#: git-submodule.sh:406 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога" + +#: git-submodule.sh:416 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../" + +#: git-submodule.sh:433 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "«$sm_path» уже содержится в индексе" + +#: git-submodule.sh:437 +#, 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 "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить." + +#: git-submodule.sh:455 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс" + +#: git-submodule.sh:457 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "«$sm_path» уже существует и не является действительным репозиторием git" + +#: git-submodule.sh:465 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:" + +#: git-submodule.sh:467 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "Если вы хотите переиспользовать локальный каталог git вместо повторного клонирования из" + +#: git-submodule.sh:469 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr ", то используйте опцию «--force». Если локальный каталог git не является действительным репозиторием" + +#: git-submodule.sh:470 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "или если вы не поняли, что это значит, то просто используйте другое имя с помощью опции «--name»." + +#: git-submodule.sh:472 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "Восстановление локального каталога git для подмодуля «$sm_name»." + +#: git-submodule.sh:484 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "Не удалось перейти на состояние у подмодуля «$sm_path»" + +#: git-submodule.sh:489 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "Сбой добавления подмодуля «$sm_path»" + +#: git-submodule.sh:498 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "Не удалось зарегистрировать подмодуль «$sm_path»" + +#: git-submodule.sh:542 +#, sh-format +msgid "Entering '$prefix$displaypath'" +msgstr "Заходим в «$prefix$displaypath»" + +#: git-submodule.sh:562 +#, sh-format +msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgstr "Останавливаемся на «$prefix$displaypath»; сценарий вернул не нулевой код возврата." + +#: git-submodule.sh:608 +#, sh-format +msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgstr "Адрес для пути подмодуля «$displaypath» не найден в .gitmodules" + +#: git-submodule.sh:617 +#, sh-format +msgid "Failed to register url for submodule path '$displaypath'" +msgstr "Сбой регистрации адресе для пути подмодуля «$displaypath»" + +#: git-submodule.sh:619 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgstr "Подмодуль «$name» ($url) зарегистрирован для пути «$displaypath»" + +#: git-submodule.sh:636 +#, sh-format +msgid "Failed to register update mode for submodule path '$displaypath'" +msgstr "Сбой регистрации режима обновления для пути подмодуля «$displaypath»" + +#: git-submodule.sh:674 +#, sh-format +msgid "Use '.' if you really want to deinitialize all submodules" +msgstr "Используйте «.», если вы действительно хотите деинициализировать все подмодули" + +#: git-submodule.sh:691 +#, sh-format +msgid "Submodule work tree '$displaypath' contains a .git directory" +msgstr "Рабочий каталог подмодуля «$displaypath» содержит каталог .git" + +#: git-submodule.sh:692 +#, sh-format +msgid "" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "(используйте «rm -rf», если вы действительно хотите удалить его, включая всю его историю)" + +#: git-submodule.sh:698 +#, sh-format +msgid "" +"Submodule work tree '$displaypath' contains local modifications; use '-f' to" +" discard them" +msgstr "Рабочий каталог подмодуля «$displaypath» содержит локальные изменения; используйте «-f», чтобы отменить их" + +#: git-submodule.sh:701 +#, sh-format +msgid "Cleared directory '$displaypath'" +msgstr "Очищен каталог «$displaypath»" + +#: git-submodule.sh:702 +#, sh-format +msgid "Could not remove submodule work tree '$displaypath'" +msgstr "Не удалось удалить рабочий каталог подмодуля «$displaypath»" + +#: git-submodule.sh:705 +#, sh-format +msgid "Could not create empty submodule directory '$displaypath'" +msgstr "Не удалось создать пустой каталог подмодуля «$displaypath»" + +#: git-submodule.sh:714 +#, sh-format +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +msgstr "Подмодуль «$name» ($url) был снят с регистрации по пути «$displaypath»" + +#: git-submodule.sh:830 +#, sh-format +msgid "" +"Submodule path '$displaypath' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "Подмодуль по пути «$displaypath» не инициализирован\nВозможно, вам нужно использовать «update --init»?" + +#: git-submodule.sh:843 +#, sh-format +msgid "Unable to find current revision in submodule path '$displaypath'" +msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»" + +#: git-submodule.sh:852 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»" + +#: git-submodule.sh:876 +#, sh-format +msgid "Unable to fetch in submodule path '$displaypath'" +msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»" + +#: git-submodule.sh:890 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "Не удалось выполнить переход на состояние «$sha1» для подмодуля по пути «$displaypath»" + +#: git-submodule.sh:891 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»" + +#: git-submodule.sh:895 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»" + +#: git-submodule.sh:896 +#, sh-format +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»" + +#: git-submodule.sh:901 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»" + +#: git-submodule.sh:902 +#, sh-format +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»" + +#: git-submodule.sh:907 +#, sh-format +msgid "" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$prefix$sm_path»" + +#: git-submodule.sh:908 +#, sh-format +msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgstr "Подмодуль по пути «$prefix$sm_path»: «$command $sha1»" + +#: git-submodule.sh:938 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»" + +#: git-submodule.sh:1046 +msgid "The --cached option cannot be used with the --files option" +msgstr "Опцию --cached нельзя использовать одновременно с опцией --files" + +#: git-submodule.sh:1098 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "неизвестный режим $mod_dst" + +#: git-submodule.sh:1118 +#, sh-format +msgid " Warn: $display_name doesn't contain commit $sha1_src" +msgstr " Предупреждение: $display_name не содержит коммит $sha1_src" + +#: git-submodule.sh:1121 +#, sh-format +msgid " Warn: $display_name doesn't contain commit $sha1_dst" +msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst" + +#: git-submodule.sh:1124 +#, 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:1149 +msgid "blob" +msgstr "двоичный объект" + +#: git-submodule.sh:1267 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$sm_path»" + +#: git-submodule.sh:1331 +#, sh-format +msgid "Synchronizing submodule url for '$displaypath'" +msgstr "Синхронизация url для подмодуля «$displaypath»" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.0.0\n" +"Project-Id-Version: git 2.4.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" -"PO-Revision-Date: 2015-01-21 14:57+0800\n" +"POT-Creation-Date: 2015-03-27 13:33+0800\n" +"PO-Revision-Date: 2015-03-27 09:56+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,6 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" #: advice.c:55 #, c-format @@ -31,8 +32,8 @@ msgstr "" "som lämpligt för att ange lösning och checka in." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]" #: archive.c:12 msgid "git archive --list" @@ -40,9 +41,9 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> " +"git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> " "[<sökväg>...]" #: archive.c:14 @@ -70,10 +71,10 @@ 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:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fil" @@ -122,7 +123,7 @@ msgstr "kommando" msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -251,7 +252,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:764 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -260,8 +261,8 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -302,21 +303,21 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "index-pack dog" @@ -339,55 +340,55 @@ msgstr "%s %s är inte en incheckning!" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" @@ -479,7 +480,7 @@ msgstr[1] "%lu år sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -507,16 +508,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -525,7 +526,7 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" @@ -1024,7 +1025,7 @@ msgstr "kunde inte tolka format för --pretty" msgid "done" msgstr "klart" -#: read-cache.c:1267 +#: read-cache.c:1273 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1033,7 +1034,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1277 +#: read-cache.c:1283 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1119,23 +1120,31 @@ msgstr[1] "" 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" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent är inkompatibelt med --bisect" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" +#: send-pack.c:366 +msgid "server does not support --atomic push" +msgstr "servern stöder inte push med --atomic" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1166,7 +1175,7 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" @@ -1202,184 +1211,184 @@ msgstr "Kunde inte bestämma HEAD:s incheckning\n" msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "kan inte %s under en %s" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4286 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" @@ -1449,38 +1458,38 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Kunde inte skapa gitlänk %s" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "Kunde inte sätta core.worktree i %s" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "Kunde inte läsa från standard in" @@ -1517,26 +1526,26 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "okänd användare" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" @@ -1565,11 +1574,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -1683,15 +1692,15 @@ msgstr "ospårat innehåll, " msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1699,68 +1708,68 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:936 +#: wt-status.c:952 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:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:949 +#: wt-status.c:965 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:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:960 +#: wt-status.c:976 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:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1032 +#: wt-status.c:1048 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:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1768,118 +1777,118 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1054 +#: wt-status.c:1070 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:1057 +#: wt-status.c:1073 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:1061 +#: wt-status.c:1077 #, 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:1066 +#: wt-status.c:1082 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:1069 +#: wt-status.c:1085 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:1071 +#: wt-status.c:1087 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:1081 +#: wt-status.c:1097 #, 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:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1091 +#: wt-status.c:1107 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:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, 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:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1128 +#: wt-status.c:1144 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:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1891,32 +1900,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1925,44 +1934,44 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, 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:1390 +#: wt-status.c:1406 #, 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:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, 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:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "efter " @@ -1972,8 +1981,8 @@ msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [flaggor] [--] <sökväg>..." +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<flaggor>] [--] <sökväg>..." #: builtin/add.c:65 #, c-format @@ -2024,14 +2033,14 @@ 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:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" @@ -2107,75 +2116,75 @@ msgstr "Inget angivet, inget tillagt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [flaggor] [<patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<flaggor>] [<patch>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2191,77 +2200,77 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2872 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: builtin/apply.c:2884 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: builtin/apply.c:2890 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" @@ -2270,317 +2279,336 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2933 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:3010 +#: builtin/apply.c:3034 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:3016 +#: builtin/apply.c:3040 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3061 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3185 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3238 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" + +#: builtin/apply.c:3266 builtin/apply.c:3488 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3347 builtin/apply.c:3502 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3356 builtin/apply.c:3510 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3432 +#: builtin/apply.c:3458 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3501 +#: builtin/apply.c:3527 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3503 +#: builtin/apply.c:3529 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3688 builtin/apply.c:3690 +#, c-format +msgid "invalid path '%s'" +msgstr "ogiltig sökväg: %s" + +#: builtin/apply.c:3745 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3607 +#: builtin/apply.c:3748 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3627 +#: builtin/apply.c:3768 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3793 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" + +#: builtin/apply.c:3797 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3653 +#: builtin/apply.c:3811 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:3889 +#: builtin/apply.c:4047 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:3918 +#: builtin/apply.c:4076 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4080 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:3927 +#: builtin/apply.c:4085 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4088 builtin/apply.c:4196 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3963 +#: builtin/apply.c:4121 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:4012 +#: builtin/apply.c:4170 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:4099 +#: builtin/apply.c:4257 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:4107 +#: builtin/apply.c:4265 msgid "internal error" msgstr "internt fel" -#: builtin/apply.c:4110 +#: builtin/apply.c:4268 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: builtin/apply.c:4120 +#: builtin/apply.c:4278 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4299 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4144 +#: builtin/apply.c:4302 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4234 +#: builtin/apply.c:4392 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4245 +#: builtin/apply.c:4403 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4363 +#: builtin/apply.c:4521 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4366 +#: builtin/apply.c:4524 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4368 +#: builtin/apply.c:4526 msgid "num" msgstr "antal" -#: builtin/apply.c:4369 +#: builtin/apply.c:4527 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: builtin/apply.c:4372 +#: builtin/apply.c:4530 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4374 +#: builtin/apply.c:4532 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: builtin/apply.c:4378 +#: builtin/apply.c:4536 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4380 +#: builtin/apply.c:4538 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: builtin/apply.c:4382 +#: builtin/apply.c:4540 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: builtin/apply.c:4384 +#: builtin/apply.c:4542 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: builtin/apply.c:4386 +#: builtin/apply.c:4544 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4388 +#: builtin/apply.c:4546 +msgid "accept a patch that touches outside the working area" +msgstr "godta en patch som rör filer utanför arbetskatalogen" + +#: builtin/apply.c:4548 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4550 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: builtin/apply.c:4392 +#: builtin/apply.c:4552 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4397 +#: builtin/apply.c:4557 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4398 +#: builtin/apply.c:4558 msgid "action" msgstr "åtgärd" -#: builtin/apply.c:4399 +#: builtin/apply.c:4559 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4562 builtin/apply.c:4565 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4408 +#: builtin/apply.c:4568 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4410 +#: builtin/apply.c:4570 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4412 +#: builtin/apply.c:4572 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4414 +#: builtin/apply.c:4574 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4417 +#: builtin/apply.c:4577 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4420 +#: builtin/apply.c:4580 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4422 +#: builtin/apply.c:4582 msgid "root" msgstr "rot" -#: builtin/apply.c:4423 +#: builtin/apply.c:4583 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4445 +#: builtin/apply.c:4605 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4453 +#: builtin/apply.c:4613 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4456 +#: builtin/apply.c:4616 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4472 +#: builtin/apply.c:4635 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4486 +#: builtin/apply.c:4649 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4655 builtin/apply.c:4665 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2635,102 +2663,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] fil" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 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:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 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:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 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:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "poäng" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" @@ -2740,25 +2768,25 @@ msgstr "Behandla endast radintervallet n,m, med början på 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [flaggor] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [flaggor] [-l] [-f] <grennamn> [<startpunkt>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" #: builtin/branch.c:152 #, c-format @@ -2898,237 +2926,242 @@ msgstr "(ingen gren, ombaserar %s)" msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "(frånkopplad från %s)" +msgid "(HEAD detached at %s)" +msgstr "(HEAD frånkopplat vid %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD frånkopplat från %s)" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "objektet \"%s\" pekar på en incheckning" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:704 +#: builtin/branch.c:711 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:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, 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:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:815 +#: builtin/branch.c:822 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:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "incheckning" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:991 +#: builtin/branch.c:998 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:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3137,7 +3170,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3148,12 +3181,12 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3171,53 +3204,53 @@ 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: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:326 +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:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "git cat-file (--batch|--batch-check) < <objektlista>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <objektlista>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 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:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 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:375 +#: builtin/cat-file.c:373 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:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr...] [--] sökväg..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" -msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <sökvägslista>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...] < <sökvägslista>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3272,8 +3305,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching är endast giltig med --verbose" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [flaggor] <kontakt>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<flaggor>] <kontakt>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3289,8 +3322,8 @@ msgid "no contacts specified" msgstr "inga kontakter angavs" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [flaggor] [--] [<fil>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3333,12 +3366,12 @@ msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [flaggor] <gren>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<flaggor>] <gren>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [flaggor] [<gren>] -- <fil>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3467,13 +3500,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" "Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n" "att göra så, med:\n" "\n" -" git branch nytt_grennamn %s\n" +" git branch <nytt_grennamn> %s\n" "\n" #: builtin/checkout.c:777 @@ -3589,8 +3622,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "förutspå \"git checkout gren-saknas\"" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "förutspå \"git checkout <gren-saknas>\"" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3713,16 +3746,17 @@ msgstr "VARNING: Hittar inte poster som motsvarar: %s" msgid "Select items to delete" msgstr "Välj poster att ta bort" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "ta bort %s?" +msgid "Remove %s [y/N]? " +msgstr "Ta bort %s [Y=ja / N=nej]?" -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Hej då." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3740,62 +3774,62 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "tvinga" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3803,7 +3837,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3812,11 +3846,11 @@ msgstr "" "angavs; vägrar städa" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -3876,7 +3910,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:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "djup" @@ -4023,7 +4057,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" @@ -4038,59 +4072,59 @@ msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." +msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate angavs, men --reference har inte angivits" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [flaggor]" +msgid "git column [<options>]" +msgstr "git column [<flaggor>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4121,12 +4155,12 @@ msgid "--command must be the first argument" msgstr "--command måste vara första argument" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [flaggor] [--] <sökväg>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<flaggor>] [--] <sökväg>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [flaggor] [--] <sökväg>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<flaggor>] [--] <sökväg>..." #: builtin/commit.c:47 msgid "" @@ -4268,26 +4302,26 @@ msgstr "kan inte läsa indexet" msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:584 +#: builtin/commit.c:578 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:586 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:605 +#: builtin/commit.c:599 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:613 +#: builtin/commit.c:607 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: builtin/commit.c:657 +#: builtin/commit.c:651 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4295,43 +4329,43 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:700 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:702 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:712 +#: builtin/commit.c:706 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:734 +#: builtin/commit.c:728 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:732 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:736 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:789 +#: builtin/commit.c:783 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:807 +#: builtin/commit.c:801 #, c-format msgid "" "\n" @@ -4346,7 +4380,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:806 #, c-format msgid "" "\n" @@ -4361,7 +4395,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:819 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4371,7 +4405,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:826 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4382,144 +4416,145 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:846 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:854 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:867 +#: builtin/commit.c:861 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:879 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:942 +#: builtin/commit.c:936 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:951 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1053 #, c-format -msgid "No existing author found with '%s'" -msgstr "Hittade ingen befintlig författare med \"%s\"" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1068 builtin/commit.c:1308 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1111 +#: builtin/commit.c:1105 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1141 +#: builtin/commit.c:1135 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1150 +#: builtin/commit.c:1144 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1153 +#: builtin/commit.c:1147 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1155 +#: builtin/commit.c:1149 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1158 +#: builtin/commit.c:1152 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1168 +#: builtin/commit.c:1162 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1170 +#: builtin/commit.c:1164 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." -#: builtin/commit.c:1178 +#: builtin/commit.c:1172 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1195 +#: builtin/commit.c:1189 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1197 +#: builtin/commit.c:1191 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:1199 +#: builtin/commit.c:1193 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1201 +#: builtin/commit.c:1195 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1207 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1212 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1322 builtin/commit.c:1602 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1329 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1332 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "läge" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1335 builtin/commit.c:1614 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1338 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1339 parse-options.h:153 msgid "when" msgstr "när" -#: builtin/commit.c:1346 +#: builtin/commit.c:1340 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4527,209 +4562,209 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1342 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1435 +#: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1437 +#: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1482 +#: builtin/commit.c:1476 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1485 +#: builtin/commit.c:1479 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1579 +#: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1581 +#: builtin/commit.c:1575 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1576 builtin/tag.c:601 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "author" msgstr "författare" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1578 builtin/gc.c:275 msgid "date" msgstr "datum" -#: builtin/commit.c:1584 +#: builtin/commit.c:1578 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1585 +#: builtin/commit.c:1579 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1586 +#: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1587 +#: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1588 +#: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1589 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1590 +#: builtin/commit.c:1584 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1592 +#: builtin/commit.c:1586 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1593 +#: builtin/commit.c:1587 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1594 +#: builtin/commit.c:1588 msgid "default" msgstr "standard" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1588 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1595 +#: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "nyckel-id" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1600 +#: builtin/commit.c:1594 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1601 +#: builtin/commit.c:1595 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1602 +#: builtin/commit.c:1596 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1603 +#: builtin/commit.c:1597 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1604 +#: builtin/commit.c:1598 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1605 +#: builtin/commit.c:1599 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1606 +#: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "förbigå pre-commit-krok" -#: builtin/commit.c:1607 +#: builtin/commit.c:1601 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1618 +#: builtin/commit.c:1612 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1619 +#: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1624 +#: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1626 +#: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1655 +#: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1688 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1701 +#: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1732 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1743 +#: builtin/commit.c:1737 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1791 +#: builtin/commit.c:1785 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4741,8 +4776,8 @@ msgstr "" "\"git reset HEAD\" för att återställa." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [flaggor]" +msgid "git config [<options>]" +msgstr "git config [<flaggor>]" #: builtin/config.c:53 msgid "Config file location" @@ -4897,12 +4932,12 @@ msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [flaggor] <incheckning-igt>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<flaggor>] [<incheckning-igt>...]" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [flaggor] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<flaggor>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5117,177 +5152,177 @@ msgstr "Applicera referensspecifikation på exporterade referenser" msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 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:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "kat" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, 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:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, 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:622 +#: builtin/fetch.c:623 #, 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:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5296,55 +5331,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:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, 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:837 +#: builtin/fetch.c:838 #, 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:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5352,39 +5387,40 @@ 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:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" +"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5413,53 +5449,53 @@ msgstr "inled meddelande med <text>" msgid "file to read from" msgstr "fil att läsa från" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "kan inte tolka formatet" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [flaggor] [<mönster>]" +#: 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:1079 +#: 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:1081 +#: 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:1083 +#: 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:1085 +#: 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:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1089 +#: 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:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "nyckel" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "fältnamn att sortera på" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" @@ -5468,8 +5504,8 @@ msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [flaggor] [<objekt>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<flaggor>] [<objekt>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5516,8 +5552,8 @@ msgid "Checking objects" msgstr "Kontrollerar objekt" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [flaggor]" +msgid "git gc [<options>]" +msgstr "git gc [<flaggor>]" #: builtin/gc.c:79 #, c-format @@ -5576,8 +5612,8 @@ msgstr "" "dem." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" #: builtin/grep.c:218 #, c-format @@ -5617,8 +5653,8 @@ msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "sök även i ignorerade filer" +msgid "ignore files specified via '.gitignore'" +msgstr "ignorera filer angivna i \".gitignore\"" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5802,17 +5838,17 @@ msgstr "både --cached och träd angavs." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] " +"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] " "<fil>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <sökvägslista>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "typ" @@ -5863,8 +5899,8 @@ msgid "show info page" msgstr "visa info-sida" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [kommando]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]" #: builtin/help.c:64 #, c-format @@ -6072,8 +6108,8 @@ msgstr "allvarlig inflate-inkonsekvens" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" @@ -6160,97 +6196,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -6362,10 +6398,10 @@ msgstr " delat" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" -"shared[=<behörigheter>]] [katalog]" +"shared[=<behörigheter>]] [<katalog>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6428,8 +6464,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [flaggor] <objekt>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<flaggor>] <objekt>..." #: builtin/log.c:81 #, c-format @@ -6507,8 +6543,8 @@ msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6704,95 +6740,95 @@ msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [flaggor] [<fil>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -6833,12 +6869,12 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [flaggor] [<incheckning>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<flaggor>] [<incheckning>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7186,12 +7222,12 @@ msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <incheckning>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <incheckning>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7227,10 +7263,11 @@ 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 " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [alternativ] [-L namn1 [-L orig [-L namn2]]] fil1 origfil fil2" +"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> " +"<origfil> <fil2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7261,7 +7298,7 @@ msgid "do not warn about conflicts" msgstr "varna inte om konflikter" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" +msgid "set labels for file1/orig-file/file2" msgstr "sätt etiketter för fil1/origfil/fil2" #: builtin/mktree.c:64 @@ -7281,8 +7318,8 @@ msgid "allow creation of more than one tree" msgstr "tillåt skapa mer än ett träd" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [flaggor] <källa>... <mål>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<flaggor>] <källa>... <mål>" #: builtin/mv.c:69 #, c-format @@ -7368,22 +7405,22 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [flaggor] <incheckning>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<flaggor>] <incheckning>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [flaggor] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<flaggor>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [flaggor] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<flaggor>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7414,43 +7451,43 @@ msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <anteckningsref>] show [<objekt>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi> ] " +"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] " "<anteckningsref>" #: builtin/notes.c:31 @@ -7462,15 +7499,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <anteckningsref>] get-ref" #: builtin/notes.c:40 @@ -7502,7 +7539,7 @@ msgid "git notes show [<object>]" msgstr "git notes show [<objekt>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<flaggor>] <anteckningsref>" #: builtin/notes.c:72 @@ -7741,7 +7778,7 @@ msgid "notes-ref" msgstr "anteckningar-ref" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" +msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" #: builtin/notes.c:989 builtin/remote.c:1621 @@ -7757,186 +7794,186 @@ msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]" msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, 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:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsmätaren visas" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 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:2645 +#: builtin/pack-objects.c:2643 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:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 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:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 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:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Räknar objekt" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [flaggor]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<flaggor>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -7947,8 +7984,8 @@ msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8224,75 +8261,79 @@ msgstr "--mirror kan inte kombineras med referensspecifikationer" msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "arkiv" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:498 +#: builtin/push.c:507 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:501 +#: builtin/push.c:510 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:504 +#: builtin/push.c:513 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:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "begär atomiska transaktioner på fjärrsidan" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -8370,12 +8411,12 @@ msgstr "hoppa över att applicera filter för gles utcheckning" msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" @@ -8386,10 +8427,10 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <namn> <url>" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8400,8 +8441,8 @@ msgstr "git remote rename <gammal> <ny>" msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" #: builtin/remote.c:17 @@ -8438,10 +8479,6 @@ msgstr "git remote set-url --delete <namn> <url>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: 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:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." @@ -8874,8 +8911,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [flaggor]" +msgid "git repack [<options>]" +msgstr "git repack [<flaggor>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -8941,7 +8978,7 @@ msgstr "maximal storlek på varje paketfil" msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "misslyckades ta bort \"%s\"" @@ -9033,8 +9070,8 @@ 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]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9173,8 +9210,8 @@ msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [options] -- [<argument>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9190,30 +9227,30 @@ msgstr "utdata fast i lång form" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [flaggor] -- [<argument>...]\n" +"git rev-parse --parseopt [<flaggor>] -- [<argument>...]\n" " eller: git rev-parse --sq-quote [<argument>...]\n" -" eller: git rev-parse [flaggor] [<argument>...]\n" +" eller: git rev-parse [<flaggor>] [<argument>...]\n" "\n" "Kör \"git rev-parse --parseopt -h\" för mer information om den första " "varianten." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [flaggor] <incheckning-igt>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<flaggor>] <incheckning-igt>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <underkommando>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [flaggor] <incheckning-igt>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9293,8 +9330,8 @@ msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [flaggor] [--] <fil>..." +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<flaggor>] [--] <fil>..." #: builtin/rm.c:65 msgid "" @@ -9394,7 +9431,7 @@ msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" #: builtin/shortlog.c:131 @@ -9424,19 +9461,19 @@ msgstr "Radbryt utdata" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9504,11 +9541,11 @@ msgstr "visa <n> nyaste refloggposter med början på bas" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9547,12 +9584,12 @@ msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [flaggor] namn [ref]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] namn" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <namn>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9577,9 +9614,11 @@ msgstr "skäl till uppdateringen" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a|-s|-u <nyckel-id>] [-f] [-m <medd>|-F <fil>] <taggnamn> [<huvud>]" +"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> " +"[<huvud>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -9587,10 +9626,10 @@ msgstr "git tag -d <taggnamn>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>] \n" +"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n" "\t\t[<mönster>...]" #: builtin/tag.c:26 @@ -9734,18 +9773,18 @@ msgstr "använd annan nyckel för att signera taggen" msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Alternativ för listning av taggar" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "sortera taggar" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Alternativ för listning av taggar" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" @@ -9802,8 +9841,8 @@ msgid "Unpacking objects" msgstr "Packar upp objekt" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [flaggor] [--] [<fil>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<flaggor>] [--] [<fil>...]" #: builtin/update-index.c:756 msgid "continue refresh even when index needs update" @@ -9918,16 +9957,16 @@ msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [flaggor] -d <refnamn> [<gammaltvärde>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [flaggor] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<flaggor>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -9954,16 +9993,16 @@ msgid "update the info files from scratch" msgstr "uppdatera informationsfilerna från grunden" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <incheckning>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <incheckning>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "visa innehåll för incheckning" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paket>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -9974,8 +10013,8 @@ msgid "show statistics only" msgstr "visa endast statistik" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <tagg>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <tagg>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10325,10 +10364,10 @@ msgstr "Felaktigt HEAD - Jag behöver ett HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" "Misslyckades checka ut \"$start_head\". Försök \"git bisect reset " -"<giltiggren>\"" +"<giltig_gren>\"" # cogito-relaterat #: git-bisect.sh:140 @@ -11083,6 +11122,18 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "(detached from %s)" +#~ msgstr "(frånkopplad från %s)" + +#~ msgid "No existing author found with '%s'" +#~ msgstr "Hittade ingen befintlig författare med \"%s\"" + +#~ msgid "search also in ignored files" +#~ msgstr "sök även i ignorerade filer" + +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#~ msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" + #~ msgid "no files added" #~ msgstr "inga filer har lagts till" @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.3.0\n" +"Project-Id-Version: git v2.4.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" -"PO-Revision-Date: 2015-01-21 14:58+0800\n" +"POT-Creation-Date: 2015-03-27 13:33+0800\n" +"PO-Revision-Date: 2015-03-27 16:01+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" @@ -37,8 +37,8 @@ msgstr "" "dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [các-tùy-chọn] <tree-ish> [<đường-dẫn>…]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>…]" #: archive.c:12 msgid "git archive --list" @@ -46,10 +46,10 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <kho> [--exec <lệnh>] [các-tùy-chọn] <tree-ish> [<đường-" -"dẫn>…]" +"git archive --remote <kho> [--exec <lệnh>] [<các-tùy-chọn>] <tree-ish> " +"[<đường-dẫn>…]" #: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -76,10 +76,10 @@ 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:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "tập_tin" @@ -128,7 +128,7 @@ msgstr "lệnh" msgid "path to the remote git-upload-archive command" msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -258,7 +258,7 @@ msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump c msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu không được thừa nhận: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:764 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" @@ -267,8 +267,8 @@ msgstr "không thể mở “%s”" msgid "Repository lacks these prerequisite commits:" msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -307,21 +307,21 @@ msgstr "rev-list đã chết" 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:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Từ chối tạo một bundle trống rỗng." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "không thể tạo “%s”" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "mục lục gói đã chết" @@ -344,55 +344,55 @@ msgstr "%s %s không phải là một lần chuyển giao!" msgid "memory exhausted" msgstr "hết bộ nhớ" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "tập tin cấu hình sai tại dòng %d trong %s" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "mức nén zlib %d là sai" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "không thể phân tích cấu hình dòng lệnh" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s có đa giá trị" @@ -475,7 +475,7 @@ msgstr[0] "%lu năm trước" msgid "failed to read orderfile '%s'" msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Đang thực hiện dò tìm đổi tên không chính xác" @@ -503,16 +503,16 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -521,7 +521,7 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, 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”" @@ -1020,7 +1020,7 @@ msgstr "không thể phân tích định dạng --pretty" msgid "done" msgstr "xong" -#: read-cache.c:1267 +#: read-cache.c:1273 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1029,7 +1029,7 @@ msgstr "" "index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1277 +#: read-cache.c:1283 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1114,23 +1114,31 @@ msgstr "" " (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của " "bạn)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent xung khắc với --bisect" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "gặp lỗi khi mở “/dev/null”" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) gặp lỗi" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "gặp lỗi khi ký chứng thực đẩy" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "kết thúc nhận không hỗ trợ đẩy --signed" +#: send-pack.c:366 +msgid "server does not support --atomic push" +msgstr "máy phục vụ không hỗ trợ đẩy lên --atomic" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1161,7 +1169,7 @@ msgstr "" "với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n" "và chuyển giao kết quả bằng lệnh “git commit”" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "Không thể ghi vào %s" @@ -1197,31 +1205,31 @@ msgstr "Không thể phân giải commit (lần chuyển giao) HEAD\n" msgid "Unable to update cache tree\n" msgstr "Không thể cập nhật cây bộ nhớ đệm\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Không thể phân tích lần chuyển giao cha mẹ “%s”\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "Tập tin lưu mục lục của bạn không được hòa trộn." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." 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:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Lần chuyển giao %s không có cha mẹ %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1230,153 +1238,153 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "Không thể lấy ghi chú lần chuyển giao cho %s" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "không thể revert %s… %s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "không thể apply (áp dụng miếng vá) %s… %s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: gặp lỗi đọc bảng mục lục" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "Không thể %s trong khi %s" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Không phân tích được dòng %d." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Không có lần chuyển giao nào được phân tích." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Không thể mở %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "Không thể đọc %s." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Khóa không đúng: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Giá trị không hợp lệ %s: %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Bảng tùy chọn dị hình: %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "Không thể tạo thư mục xếp dãy %s" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Lỗi bao bọc %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay revert trong tiến trình" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4286 #, c-format msgid "cannot open %s: %s" msgstr "không thể mở %s: %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "gặp kết thúc tập tin đột xuất" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Không thể định dạng “%s”." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Không thể revert một lần chuyển giao khởi tạo" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" @@ -1449,38 +1457,38 @@ msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s" msgid "staging updated .gitmodules failed" msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Không thể tạo liên kết git “%s”" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "Không thể đặt “core.worktree” trong “%s”." -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "không hiểu giá trị “%s” cho khóa “%s”" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "nhiều hơn một %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "không đọc được tập tin đầu vào “%s”" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "không thể đọc từ đầu vào tiêu chuẩn" @@ -1517,26 +1525,26 @@ msgstr "tên cổng không hợp lệ" msgid "invalid '..' path segment" msgstr "đoạn đường dẫn “..” không hợp lệ" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "không thể truy cập “%s”: %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "không thể truy cập “%s”" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "không có người dùng như vậy" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "Không thể lấy thư mục làm việc hiện hành" @@ -1567,11 +1575,11 @@ msgstr "" 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:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:" @@ -1685,15 +1693,15 @@ msgstr "nội dung chưa được theo dõi, " msgid "bug: unhandled diff status %c" msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c" -#: wt-status.c:758 +#: wt-status.c:753 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:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Những mô-đun-con thay đổi đã được chuyển giao:" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1701,72 +1709,72 @@ msgstr "" "Không động đến đường ở trên.\n" "Mọi thứ phía dưới sẽ được xóa bỏ." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột rồi chạy \"git commit\")" -#: wt-status.c:936 +#: wt-status.c:952 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:939 +#: wt-status.c:955 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:949 +#: wt-status.c:965 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:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:956 +#: wt-status.c:972 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:958 +#: wt-status.c:974 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:960 +#: wt-status.c:976 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:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"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:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --" "continue\")" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1774,126 +1782,126 @@ msgstr "" "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:1054 +#: wt-status.c:1070 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:1057 +#: wt-status.c:1073 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 lệnh “cải tổ” \"git " "rebase --continue\")" -#: wt-status.c:1061 +#: wt-status.c:1077 #, 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 trong khi đang " "rebase nhánh “%s” trên “%s”." -#: wt-status.c:1066 +#: wt-status.c:1082 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:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (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:1081 +#: wt-status.c:1097 #, 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:1086 +#: wt-status.c:1102 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:1089 +#: wt-status.c:1105 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:1091 +#: wt-status.c:1107 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:1100 +#: wt-status.c:1116 #, 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:1105 +#: wt-status.c:1121 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:1108 +#: wt-status.c:1124 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:1110 +#: wt-status.c:1126 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:1121 +#: wt-status.c:1137 #, 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:1125 +#: wt-status.c:1141 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:1128 +#: wt-status.c:1144 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:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD được tách rời tại " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD được tách rời từ " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1905,32 +1913,32 @@ msgstr "" "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n" "tự thêm các tập tin mới (xem “git help status”.." -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s" -#: wt-status.c:1367 +#: wt-status.c:1383 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:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "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:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "không có thay đổi nào được thêm vào để chuyển giao\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1939,49 +1947,49 @@ msgstr "" "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:1387 +#: wt-status.c:1403 #, 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 nhưng có những tập tin chưa được " "theo dõi hiện diện\n" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "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:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "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:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Lần chuyển giao khởi tạo trên " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "đã ra đi" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "đằng sau " @@ -1991,8 +1999,8 @@ msgid "failed to unlink '%s'" msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [các-tùy-chọn] [--] <pathspec>…" +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<các-tùy-chọn>] [--] <pathspec>…" #: builtin/add.c:65 #, c-format @@ -2046,14 +2054,14 @@ 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:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "chạy thử" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "chi tiết" @@ -2133,78 +2141,78 @@ msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Có lẽ ý bạn là “git add .” phải không?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 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:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431 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" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [các-tùy-chọn] [<miếng-vá>…]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<các-tùy-chọn>] [<miếng-vá>…]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "không nhận ra tùy chọn về khoảng trắng “%s”" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" "Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) " "%s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" 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:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %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:952 +#: builtin/apply.c:948 #, 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 không nhất quán trên dòng %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, 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ũ không nhất quán trên dòng %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, 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" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "chi tiết: dòng không cần: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2216,76 +2224,76 @@ msgstr[0] "" "phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong " "thành phần dẫn đầu tên của đường dẫn (dòng %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "tập tin mới phụ thuộc vào nội dung cũ" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "tập tin đã xóa vẫn còn nội dung" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá hỏng tại dòng %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "tập tin mới %s phụ thuộc vào nội dung cũ" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "tập tin đã xóa %s vẫn còn nội dung" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "vá chỉ với “rác” tại dòng %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "không thể mở hay đọc %s" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: “%c”" -#: builtin/apply.c:2872 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." -#: builtin/apply.c:2884 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %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:2890 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" @@ -2294,322 +2302,341 @@ msgstr "" "trong khi đang tìm kiếm cho:\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2933 #, c-format msgid "missing binary patch data for '%s'" msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”" -#: builtin/apply.c:3010 +#: builtin/apply.c:3034 #, c-format msgid "binary patch does not apply to '%s'" msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”" -#: builtin/apply.c:3016 +#: builtin/apply.c:3040 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận " "%s)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3061 #, c-format msgid "patch failed: %s:%ld" msgstr "gặp lỗi khi vá: %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3185 #, c-format msgid "cannot checkout %s" msgstr "không thể lấy ra %s" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286 #, c-format msgid "read of %s failed" msgstr "đọc %s gặp lỗi" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3238 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm" + +#: builtin/apply.c:3266 builtin/apply.c:3488 #, c-format msgid "path %s has been renamed/deleted" msgstr "đường dẫn %s đã bị xóa hoặc đổi tên" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3347 builtin/apply.c:3502 #, c-format msgid "%s: does not exist in index" msgstr "%s: không tồn tại trong bảng mục lục" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3356 builtin/apply.c:3510 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: builtin/apply.c:3432 +#: builtin/apply.c:3458 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: builtin/apply.c:3501 +#: builtin/apply.c:3527 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3503 +#: builtin/apply.c:3529 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, cần %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3688 builtin/apply.c:3690 +#, c-format +msgid "invalid path '%s'" +msgstr "đường dẫn không hợp lệ “%s”" + +#: builtin/apply.c:3745 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: builtin/apply.c:3607 +#: builtin/apply.c:3748 #, c-format msgid "%s: already exists in working directory" msgstr "%s: đã sẵn có trong thư mục đang làm việc" -#: builtin/apply.c:3627 +#: builtin/apply.c:3768 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3793 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm" + +#: builtin/apply.c:3797 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3653 +#: builtin/apply.c:3811 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s…" -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”" -#: builtin/apply.c:3889 +#: builtin/apply.c:4047 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: builtin/apply.c:3918 +#: builtin/apply.c:4076 #, c-format msgid "corrupt patch for submodule %s" msgstr "miếng vá sai hỏng cho mô-đun-con %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4080 #, c-format msgid "unable to stat newly created file '%s'" msgstr "không thể lấy thống kề về tập tin %s mới hơn đã được tạo" -#: builtin/apply.c:3927 +#: builtin/apply.c:4085 #, c-format msgid "unable to create backing store for newly created file %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:3930 builtin/apply.c:4038 +#: builtin/apply.c:4088 builtin/apply.c:4196 #, c-format msgid "unable to add cache entry for %s" msgstr "không thể thêm mục nhớ đệm cho %s" -#: builtin/apply.c:3963 +#: builtin/apply.c:4121 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin “%s”" -#: builtin/apply.c:4012 +#: builtin/apply.c:4170 #, c-format msgid "unable to write file '%s' mode %o" msgstr "không thể ghi vào tập tin “%s” chế độ %o" -#: builtin/apply.c:4099 +#: builtin/apply.c:4257 #, c-format msgid "Applied patch %s cleanly." msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ." -#: builtin/apply.c:4107 +#: builtin/apply.c:4265 msgid "internal error" msgstr "lỗi nội bộ" -#: builtin/apply.c:4110 +#: builtin/apply.c:4268 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…" -#: builtin/apply.c:4120 +#: builtin/apply.c:4278 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4299 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: builtin/apply.c:4144 +#: builtin/apply.c:4302 #, c-format msgid "Rejected hunk #%d." msgstr "đoạn dữ liệu #%d bị từ chối." -#: builtin/apply.c:4234 +#: builtin/apply.c:4392 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: builtin/apply.c:4245 +#: builtin/apply.c:4403 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:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "đường-dẫn" -#: builtin/apply.c:4363 +#: builtin/apply.c:4521 msgid "don't apply changes matching the given path" msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" -#: builtin/apply.c:4366 +#: builtin/apply.c:4524 msgid "apply changes matching the given path" msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" -#: builtin/apply.c:4368 +#: builtin/apply.c:4526 msgid "num" msgstr "số" -#: builtin/apply.c:4369 +#: builtin/apply.c:4527 msgid "remove <num> leading slashes from traditional diff paths" msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển" -#: builtin/apply.c:4372 +#: builtin/apply.c:4530 msgid "ignore additions made by the patch" msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá" -#: builtin/apply.c:4374 +#: builtin/apply.c:4532 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" -#: builtin/apply.c:4378 +#: builtin/apply.c:4536 msgid "show number of added and deleted lines in decimal notation" msgstr "" "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" -#: builtin/apply.c:4380 +#: builtin/apply.c:4538 msgid "instead of applying the patch, output a summary for the input" msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" -#: builtin/apply.c:4382 +#: builtin/apply.c:4540 msgid "instead of applying the patch, see if the patch is applicable" msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" -#: builtin/apply.c:4384 +#: builtin/apply.c:4542 msgid "make sure the patch is applicable to the current index" msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" -#: builtin/apply.c:4386 +#: builtin/apply.c:4544 msgid "apply a patch without touching the working tree" msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" -#: builtin/apply.c:4388 +#: builtin/apply.c:4546 +msgid "accept a patch that touches outside the working area" +msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc" + +#: builtin/apply.c:4548 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4550 msgid "attempt three-way merge if a patch does not apply" msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" -#: builtin/apply.c:4392 +#: builtin/apply.c:4552 msgid "build a temporary index based on embedded index information" msgstr "" "xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" -#: builtin/apply.c:4397 +#: builtin/apply.c:4557 msgid "ensure at least <n> lines of context match" msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp" -#: builtin/apply.c:4398 +#: builtin/apply.c:4558 msgid "action" msgstr "hành động" -#: builtin/apply.c:4399 +#: builtin/apply.c:4559 msgid "detect new or modified lines that have whitespace errors" msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4562 builtin/apply.c:4565 msgid "ignore changes in whitespace when finding context" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung" -#: builtin/apply.c:4408 +#: builtin/apply.c:4568 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: builtin/apply.c:4410 +#: builtin/apply.c:4570 msgid "don't expect at least one line of context" msgstr "đừng hy vọng có ít nhất một dòng nội dung" -#: builtin/apply.c:4412 +#: builtin/apply.c:4572 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" -#: builtin/apply.c:4414 +#: builtin/apply.c:4574 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: builtin/apply.c:4417 +#: builtin/apply.c:4577 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" -#: builtin/apply.c:4420 +#: builtin/apply.c:4580 msgid "do not trust the line counts in the hunk headers" msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" -#: builtin/apply.c:4422 +#: builtin/apply.c:4582 msgid "root" msgstr "root" -#: builtin/apply.c:4423 +#: builtin/apply.c:4583 msgid "prepend <root> to all filenames" msgstr "treo thêm <root> vào tất cả các tên tập tin" -#: builtin/apply.c:4445 +#: builtin/apply.c:4605 msgid "--3way outside a repository" msgstr "--3way ở ngoài một kho chứa" -#: builtin/apply.c:4453 +#: builtin/apply.c:4613 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: builtin/apply.c:4456 +#: builtin/apply.c:4616 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: builtin/apply.c:4472 +#: builtin/apply.c:4635 #, c-format msgid "can't open patch '%s'" msgstr "không thể mở miếng vá “%s”" -#: builtin/apply.c:4486 +#: builtin/apply.c:4649 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4655 builtin/apply.c:4665 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2664,104 +2691,104 @@ msgstr "" "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:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [các-tùy-chọn] [rev-opts] [rev] [--] tập-tin" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<các-tùy-chọn>] [rev-opts] [rev] [--] tập-tin" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[rev-opts] được mô tả trong git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 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:2502 +#: builtin/blame.c:2501 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:2503 +#: builtin/blame.c:2502 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:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Hiển thị thống kê công sức làm việc" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 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:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "Hiển thị số dòng gốc (Mặc định: off)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 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:2509 +#: builtin/blame.c:2508 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:2510 +#: builtin/blame.c:2509 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:2511 +#: builtin/blame.c:2510 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:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 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:2514 +#: builtin/blame.c:2513 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:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 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:2517 +#: builtin/blame.c:2516 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:2518 +#: builtin/blame.c:2517 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:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "điểm số" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 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:2520 +#: builtin/blame.c:2519 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:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" @@ -2771,25 +2798,25 @@ msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "4 năm, 11 tháng trước" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [các-tùy-chọn] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [các-tùy-chọn] [-l] [-f] <tên-nhánh> [<điểm-đầu>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<các-tùy-chọn>] [-l] [-f] <tên-nhánh> [<điểm-đầu>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [các-tùy-chọn] [-r] (-d | -D) <tên-nhánh> …" +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<các-tùy-chọn>] [-r] (-d | -D) <tên-nhánh> …" #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [các-tùy-chọn] (-m | -M) [<nhánh-cũ>] <nhánh-mới>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<các-tùy-chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>" #: builtin/branch.c:152 #, c-format @@ -2929,195 +2956,200 @@ msgstr "(không nhánh, đang cải tổ %s)" msgid "(no branch, bisect started on %s)" msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD được tách rời tại %s)" + +#: builtin/branch.c:599 #, c-format -msgid "(detached from %s)" -msgstr "(được tách rời từ %s)" +msgid "(HEAD detached from %s)" +msgstr "(HEAD được tách rời từ %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(không nhánh)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, 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 nào cả" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "một số tham chiếu đã không thể đọc được" -#: builtin/branch.c:704 +#: builtin/branch.c:711 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:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Tên nhánh không hợp lệ: “%s”" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "Gặp lỗi khi đổi tên nhánh" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Đã đổi tên nhánh khuyết danh “%s” đi" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, 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:744 +#: builtin/branch.c:751 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:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, 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:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Tùy chọn chung" -#: builtin/branch.c:815 +#: builtin/branch.c:822 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:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "không xuất các thông tin" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "cài đặt chế độ theo dõi (xem git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "tô màu kết xuất" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Hành động git-branch:" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "xóa một toàn bộ nhánh đã hòa trộn" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "xóa nhánh (cho dù là chưa được hòa trộn)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 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:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "liệt kê các tên nhánh" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "tạo reflog của nhánh" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "sửa mô tả cho nhánh" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "buộc tạo, di chuyển/đổi tên, xóa" -#: builtin/branch.c:854 +#: builtin/branch.c:861 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:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "chỉ hiển thị các nhánh đã hòa trộn" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "liệt kê các nhánh trong các cột" -#: builtin/branch.c:877 +#: builtin/branch.c:884 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 hợp lệ." -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "tùy chọn --column và --verbose xung khắc nhau" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "cần chỉ ra tên nhánh" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "Không thể đưa ra mô tả HEAD đã tách rời" -#: builtin/branch.c:934 +#: builtin/branch.c:941 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:941 +#: builtin/branch.c:948 #, 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:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "Không có nhánh nào có tên “%s”." -#: builtin/branch.c:959 +#: builtin/branch.c:966 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:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "quá nhiều nhánh được đặt cho thượng nguồn mới" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3125,40 +3157,40 @@ msgstr "" "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:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "không có nhánh nào như thế “%s”" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "chưa có nhánh “%s”" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "quá nhiều nhánh để bỏ đặt thượng nguồn" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." 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:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Nhánh “%s” không có thông tin thượng nguồn" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "không hợp lý khi tạo “HEAD” thủ công" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "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:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3167,7 +3199,7 @@ msgstr "" "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:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3178,12 +3210,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:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3201,55 +3233,55 @@ msgstr "Cần một kho chứa để có thể tạo một bundle." msgid "Need a repository to unbundle." msgstr "Cần một kho chứa để có thể giải nén một bundle." -#: 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:326 +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: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:327 +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:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "hiển thị kích thước đối tượng" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 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:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "in nội dung đối tượng dạng dễ đọc" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 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:375 +#: builtin/cat-file.c:373 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:378 +#: builtin/cat-file.c:376 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" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr…] [--] tên-đường-dẫn…" +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <attr>…] [--] tên-đường-dẫn…" #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "" -"git check-attr --stdin [-z] [-a | --all | attr…] < <danh-sách-đường-dẫn>" +"git check-attr --stdin [-z] [-a | --all | <attr>…] < <danh-sách-đường-dẫn>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3304,8 +3336,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "tùy-chọn --non-matching chỉ hợp lệ khi dùng với --verbose" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [các-tùy-chọn] <danh-bạ>…" +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<các-tùy-chọn>] <danh-bạ>…" #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3321,8 +3353,8 @@ msgid "no contacts specified" msgstr "chưa chỉ ra danh bạ" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [các-tùy-chọn] [--] [<tập-tin>…]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<các-tùy-chọn>] [--] [<tập-tin>…]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3366,12 +3398,12 @@ msgid "copy out the files from named stage" 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>" -msgstr "git checkout [các-tùy-chọn] <nhánh>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<các-tùy-chọn>] <nhánh>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [các-tùy-chọn] [<nhánh>] -- <tập-tin>…" +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<các-tùy-chọn>] [<nhánh>] -- <tập-tin>…" #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3497,14 +3529,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" -"Nếu bạn muốn giữ chúng bằng cách tạo ra một nhánh mới, đây có lẽ là một thời " -"điểm thích hợp\n" -"để làm thế bằng lệnh:\n" +"Nếu bạn muốn giữ chúng bằng cách tạo ra một nhánh mới, đây có lẽ là\n" +"một thời điểm thích hợp để làm thế bằng lệnh:\n" "\n" -" git branch tên_nhánh_mới %s\n" +" git branch <tên_nhánh_mới> %s\n" "\n" #: builtin/checkout.c:777 @@ -3622,8 +3653,8 @@ msgid "do not limit pathspecs to sparse entries only" 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:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "gợi ý thứ hai “git checkout không-nhánh-nào-như-vậy”" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\"" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3746,16 +3777,17 @@ msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s" msgid "Select items to delete" msgstr "Chọn mục muốn xóa" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "gỡ bỏ “%s”? " +msgid "Remove %s [y/N]? " +msgstr "Xóa bỏ “%s” [y/N]? " -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Tạm biệt." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3773,61 +3805,61 @@ msgstr "" "help - hiển thị chính trợ giúp này\n" "? - trợ giúp dành cho chọn bằng cách nhắc" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Lệnh ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Giờ thì sao" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "không hiển thị tên của các tập tin đã gỡ bỏ" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "ép buộc" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "dọn bằng kiểu tương tác" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "mẫu" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "thêm <mẫu> vào trong qui tắc bỏ qua" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x và -X không thể dùng cùng nhau" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3835,7 +3867,7 @@ msgstr "" "clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà " "cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3844,11 +3876,11 @@ msgstr "" "mà cũng không -f; từ chối lệnh dọn dẹp (clean)" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [các-tùy-chọn] [--] <kho> [<t.mục>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến triển công việc" @@ -3908,7 +3940,7 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" msgid "path to git-upload-pack on the remote" msgstr "đường dẫn đến git-upload-pack trên máy chủ" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "độ-sâu" @@ -4052,7 +4084,7 @@ msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "độ sâu %s không phải là một số nguyên dương" @@ -4067,59 +4099,59 @@ msgstr "đường dẫn đích “%s” đã có từ trước và không phải 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:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, 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:851 +#: builtin/clone.c:853 #, 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”." +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:870 +#: builtin/clone.c:871 #, 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:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”…\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "đã đưa ra --dissociate, nhưng ở đây lại không có --reference" -#: builtin/clone.c:912 +#: builtin/clone.c:913 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:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "kho nguồn là nông, nên bỏ qua --local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, 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:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" -#: builtin/clone.c:986 +#: builtin/clone.c:987 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." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [các-tùy-chọn]" +msgid "git column [<options>]" +msgstr "git column [<các-tùy-chọn>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4150,12 +4182,12 @@ msgid "--command must be the first argument" msgstr "--command phải là đối số đầu tiên" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [các-tùy-chọn] [--] <pathspec>…" +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<các-tùy-chọn>] [--] <pathspec>…" #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [các-tùy-chọn] [--] <pathspec>…" +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<các-tùy-chọn>] [--] <pathspec>…" #: builtin/commit.c:47 msgid "" @@ -4310,26 +4342,26 @@ msgstr "không đọc được bảng mục lục" msgid "unable to write temporary index file" msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" -#: builtin/commit.c:584 +#: builtin/commit.c:578 #, c-format msgid "commit '%s' lacks author header" msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu" -#: builtin/commit.c:586 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' has malformed author line" msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng" -#: builtin/commit.c:605 +#: builtin/commit.c:599 msgid "malformed --author parameter" msgstr "đối số cho --author bị dị hình" -#: builtin/commit.c:613 +#: builtin/commit.c:607 #, c-format msgid "invalid date format: %s" msgstr "ngày tháng không hợp lệ: %s" -#: builtin/commit.c:657 +#: builtin/commit.c:651 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4337,43 +4369,43 @@ msgstr "" "không thể chọn một ký tự ghi chú cái mà không được dùng\n" "trong phần ghi chú hiện tại" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:700 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:702 msgid "could not read log from standard input" msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" -#: builtin/commit.c:712 +#: builtin/commit.c:706 #, c-format msgid "could not read log file '%s'" msgstr "không đọc được tệp nhật ký “%s”" -#: builtin/commit.c:734 +#: builtin/commit.c:728 msgid "could not read MERGE_MSG" msgstr "không thể đọc MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:732 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:736 #, c-format msgid "could not read '%s'" msgstr "Không thể đọc “%s”." -#: builtin/commit.c:789 +#: builtin/commit.c:783 msgid "could not write commit template" msgstr "không thể ghi mẫu chuyển giao" -#: builtin/commit.c:807 +#: builtin/commit.c:801 #, c-format msgid "" "\n" @@ -4388,7 +4420,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:806 #, c-format msgid "" "\n" @@ -4403,7 +4435,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:819 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4414,7 +4446,7 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " "chuyển giao.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:826 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4426,154 +4458,156 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" "Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:846 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTác giả: %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:854 #, c-format msgid "%sDate: %s" msgstr "%sNgày tháng: %s" -#: builtin/commit.c:867 +#: builtin/commit.c:861 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgười chuyển giao: %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:879 msgid "Cannot read index" msgstr "Không đọc được bảng mục lục" -#: builtin/commit.c:942 +#: builtin/commit.c:936 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:951 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1053 #, c-format -msgid "No existing author found with '%s'" -msgstr "Không tìm thấy tác giả có sẵn với “%s”" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"--author “%s” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ " +"tác giả nào sẵn có" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1068 builtin/commit.c:1308 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”" -#: builtin/commit.c:1111 +#: builtin/commit.c:1105 msgid "--long and -z are incompatible" msgstr "hai tùy chọn -long và -z không tương thích với nhau" -#: builtin/commit.c:1141 +#: builtin/commit.c:1135 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:1150 +#: builtin/commit.c:1144 msgid "You have nothing to amend." msgstr "Không có gì để mà “tu bổ” cả." -#: builtin/commit.c:1153 +#: builtin/commit.c:1147 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 việc “tu bổ”." -#: builtin/commit.c:1155 +#: builtin/commit.c:1149 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 việc “tu " "bổ”." -#: builtin/commit.c:1158 +#: builtin/commit.c:1152 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1168 +#: builtin/commit.c:1162 msgid "Only one of -c/-C/-F/--fixup can be used." 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:1170 +#: builtin/commit.c:1164 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F/--fixup." -#: builtin/commit.c:1178 +#: builtin/commit.c:1172 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1195 +#: builtin/commit.c:1189 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " "sử dụng." -#: builtin/commit.c:1197 +#: builtin/commit.c:1191 msgid "No paths with --include/--only does not make sense." msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." -#: builtin/commit.c:1199 +#: builtin/commit.c:1193 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." -#: builtin/commit.c:1201 +#: builtin/commit.c:1195 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; coi " "là --only những đường dẫn" -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1207 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1212 msgid "Paths with -a does not make sense." msgstr "Các đường dẫn với tùy chọn -a không hợp lý." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1322 builtin/commit.c:1602 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1329 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dài (mặc định)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1332 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1335 builtin/commit.c:1614 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1338 msgid "show ignored files" msgstr "hiển thị các tập tin ẩn" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1339 parse-options.h:153 msgid "when" msgstr "khi" -#: builtin/commit.c:1346 +#: builtin/commit.c:1340 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4581,213 +4615,213 @@ msgstr "" "bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1342 msgid "list untracked files in columns" msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" -#: builtin/commit.c:1435 +#: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo" -#: builtin/commit.c:1437 +#: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "" "không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo" -#: builtin/commit.c:1482 +#: builtin/commit.c:1476 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1485 +#: builtin/commit.c:1479 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" -#: builtin/commit.c:1579 +#: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" -#: builtin/commit.c:1581 +#: builtin/commit.c:1575 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1576 builtin/tag.c:601 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1578 builtin/gc.c:275 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1584 +#: builtin/commit.c:1578 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "chú thích" -#: builtin/commit.c:1585 +#: builtin/commit.c:1579 msgid "commit message" msgstr "chú thích của lần chuyển giao" -#: builtin/commit.c:1586 +#: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" 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:1587 +#: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho" -#: builtin/commit.c:1588 +#: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra" -#: builtin/commit.c:1589 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to squash specified commit" msgstr "" "dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ " "ra" -#: builtin/commit.c:1590 +#: builtin/commit.c:1584 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "(nên dùng) thêm dòng Signed-off-by:" -#: builtin/commit.c:1592 +#: builtin/commit.c:1586 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1593 +#: builtin/commit.c:1587 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1594 +#: builtin/commit.c:1588 msgid "default" msgstr "mặc định" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1588 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn" -#: builtin/commit.c:1595 +#: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "mã-số-khóa" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "ký lần chuyển giao dùng GPG" -#: builtin/commit.c:1600 +#: builtin/commit.c:1594 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1601 +#: builtin/commit.c:1595 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1602 +#: builtin/commit.c:1596 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" -#: builtin/commit.c:1603 +#: builtin/commit.c:1597 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1604 +#: builtin/commit.c:1598 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1605 +#: builtin/commit.c:1599 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1606 +#: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "vòng qua móc (hook) pre-commit" -#: builtin/commit.c:1607 +#: builtin/commit.c:1601 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1618 +#: builtin/commit.c:1612 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1619 +#: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1624 +#: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1626 +#: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" -#: builtin/commit.c:1655 +#: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1688 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" -#: builtin/commit.c:1701 +#: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "không thể đọc phần chú thích (message) của llần chuyển giao: %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1732 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" "Đ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:1743 +#: builtin/commit.c:1737 #, c-format msgid "Aborting commit due to empty commit message.\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:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao" -#: builtin/commit.c:1791 +#: builtin/commit.c:1785 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4799,8 +4833,8 @@ msgstr "" "và sau đó \"git reset HEAD\" để khắc phục." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [các-tùy-chọn]" +msgid "git config [<options>]" +msgstr "git config [<các-tùy-chọn>]" #: builtin/config.c:53 msgid "Config file location" @@ -4955,12 +4989,12 @@ msgid "print sizes in human readable format" msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [các-tùy-chọn] <commit-ish>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<các-tùy-chọn>] <commit-ish>*" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [các-tùy-chọn] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<các-tùy-chọn>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5175,179 +5209,179 @@ msgstr "Áp dụng refspec cho refs đã xuất" msgid "anonymize output" msgstr "kết xuất anonymize" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<các-tùy-chọn>] [<nhóm>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)…]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<các-tùy-chọn>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "lấy về từ tất cả các máy chủ" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 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:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "đường dẫn đến gói tải lên trên máy chủ cuối" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "ép buộc ghi đè lên nhánh nội bộ" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "lấy từ nhiều máy chủ cùng lúc" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 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:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "không lấy tất cả các thẻ (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 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:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "khi-cần" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 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:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "giữ lại gói đã tải về" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "cho phép cập nhật th.chiếu HEAD" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "làm sâu hơn lịch sử của bản sao" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "chuyển đổi hoàn toàn sang kho git" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "tmục" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 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:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "chế độ mặc định cho đệ qui" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "chấp nhận tham chiếu cập nhật .git/shallow" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy về" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 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:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, 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:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (không thể cập nhật tham chiếu nội bộ)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "không thể cập nhật tham chiếu nội bộ" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(non-fast-forward)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, 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:622 +#: builtin/fetch.c:623 #, 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:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5356,57 +5390,57 @@ msgstr "" "một số tham chiếu 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:773 +#: builtin/fetch.c:774 #, 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:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "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:837 +#: builtin/fetch.c:838 #, 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:840 +#: builtin/fetch.c:841 #, 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:896 +#: builtin/fetch.c:897 #, 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:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy “%s” về\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "không thể “%s” về" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5414,39 +5448,41 @@ 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:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 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:1145 +#: builtin/fetch.c:1146 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:1168 +#: builtin/fetch.c:1169 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:1170 +#: builtin/fetch.c:1171 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:1181 +#: builtin/fetch.c:1182 #, 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:1189 +#: builtin/fetch.c:1190 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>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <chú_thích>] [--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:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5475,51 +5511,51 @@ 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:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "không thể phân tích định dạng" -#: builtin/for-each-ref.c:1064 -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: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:1079 +#: 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:1081 +#: 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:1083 +#: 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:1085 +#: 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:1088 +#: 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:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "định dạng" -#: builtin/for-each-ref.c:1089 +#: 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:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "khóa" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "tên trường cần sắp xếp" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Đang kiểm tra kết nối" @@ -5528,8 +5564,8 @@ msgid "Checking object directories" msgstr "Đang kiểm tra các thư mục đối tượng" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [các-tùy-chọn] [<đối-tượng>…]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<các-tùy-chọn>] [<đối-tượng>…]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5576,8 +5612,8 @@ msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [các-tùy-chọn]" +msgid "git gc [<options>]" +msgstr "git gc [<các-tùy-chọn>]" #: builtin/gc.c:79 #, c-format @@ -5638,8 +5674,8 @@ msgstr "" "để xóa bỏ chúng đi." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [các-tùy-chọn] [-e] <mẫu> [<rev>…] [[--] <đường-dẫn>…]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<các-tùy-chọn>] [-e] <mẫu> [<rev>…] [[--] <đường-dẫn>…]" #: builtin/grep.c:218 #, c-format @@ -5679,8 +5715,8 @@ msgid "search in both tracked and untracked files" msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "tìm cả trong các tập tin đã bị lờ đi" +msgid "ignore files specified via '.gitignore'" +msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5867,17 +5903,17 @@ msgstr "cả hai --cached và các cây phải được chỉ ra." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <kiểu>] [-w] [--path=<tập-tin>|--no-filters] [--stdin] " +"git hash-object [-t <kiểu>] [-w] [--path=<tập-tin> | --no-filters] [--stdin] " "[--] <tập-tin>…" #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <danh-sách-đường-dẫn>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "kiểu" @@ -5927,8 +5963,8 @@ msgid "show info page" msgstr "hiện trang info" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [lệnh]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<lệnh>]" #: builtin/help.c:64 #, c-format @@ -6134,8 +6170,8 @@ msgstr "sự mâu thuẫn xả nén nghiêm trọng" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "không thể đọc %s" @@ -6221,95 +6257,95 @@ msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "gói có %d delta chưa được giải quyết" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "không thể xả nén đối tượng nối thêm (%d)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "không thể ghi tập tin giữ lại “%s”" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "không thể đóng tập tin giữ lại đã được ghi “%s”" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Không thể mở tập tin gói đã sẵn có “%s”" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Không thể mở tập tin idx của gói cho “%s”" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "không delta: %d đối tượng" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "chiều dài xích = %d: %lu đối tượng" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin không thể được dùng mà không có --stdin" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "tên tập tin tập tin gói “%s” không được kết thúc bằng đuôi “.pack”" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" @@ -6420,8 +6456,8 @@ msgstr " đã chia sẻ" #: builtin/init-db.c:475 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" +"[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-" "quyền>]] [thư-mục]" @@ -6487,8 +6523,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<các-tùy-chọn>] [<vùng xem xét>] [[--] <đường-dẫn>…]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [các-tùy-chọn] <đối-tượng>…" +msgid "git show [<options>] <object>..." +msgstr "git show [<các-tùy-chọn>] <đối-tượng>…" #: builtin/log.c:81 #, c-format @@ -6566,8 +6602,8 @@ msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [các-tùy-chọn] [<kể-từ> | <vùng-xem-xét>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<các-tùy-chọn>] [<kể-từ> | <vùng-xem-xét>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6766,98 +6802,98 @@ msgstr "" msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [các-tùy-chọn] [<tập-tin>…]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<các-tùy-chọn>] [<tập-tin>…]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "nhận dạng các trạng thái tập tin với thẻ" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không " "thay đổi)" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "hiển thị các tập tin đã xóa trong kết xuất" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "hiển thị các tập tin khác trong kết xuất" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" 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:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "chỉ hiển thị tên của các thư mục “khác”" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "không hiển thị thư mục rỗng" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "hiển thị thông tin resolve-undo" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "bỏ qua những tập tin khớp với một mẫu" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "mẫu loại trừ được đọc từ <tập tin>" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "thêm loại trừ tiêu chuẩn kiểu git" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "tree-ish" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "hiển thị dữ liệu gỡ lỗi" @@ -6898,12 +6934,12 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [các-tùy-chọn] [<commit>…]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<các-tùy-chọn>] [<commit>…]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [các-tùy-chọn] <tin-nhắn> HEAD <commit>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<các-tùy-chọn>] <tin-nhắn> HEAD <commit>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7257,12 +7293,12 @@ msgstr "" "cầu\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <commit> <lần_chuyển_giao>…" +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <lần_chuyển_giao> <lần_chuyển_giao>…" #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <lần_chuyển_giao>…" +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <lần_chuyển_giao>…" #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7298,11 +7334,11 @@ msgstr "tìm xem <commit> được rẽ nhánh ở đâu từ reflog của <th.c #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [các-tùy-chọn] [-L tên1 [-L gốc [-L tên2]]] tập-tin1 tập-tin-" -"gốc tập-tin2" +"git merge-file [<các-tùy-chọn>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <tập-" +"tin1> <tập-tin-gốc> <tập-tin2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7333,7 +7369,7 @@ msgid "do not warn about conflicts" msgstr "không cảnh báo về các xung đột xảy ra" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" +msgid "set labels for file1/orig-file/file2" msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2" #: builtin/mktree.c:64 @@ -7353,8 +7389,8 @@ msgid "allow creation of more than one tree" msgstr "cho phép tạo nhiều hơn một cây" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [các-tùy-chọn] <nguồn>… <đích>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<các-tùy-chọn>] <nguồn>… <đích>" #: builtin/mv.c:69 #, c-format @@ -7440,22 +7476,22 @@ msgstr "%s, nguồn=%s, đích=%s" msgid "Renaming %s to %s\n" msgstr "Đổi tên %s thành %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "gặp lỗi khi đổi tên “%s”" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [các-tùy-chọn] <commit>…" +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<các-tùy-chọn>] <commit>…" #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [các-tùy-chọn] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<các-tùy-chọn>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [các-tùy-chọn] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<các-tùy-chọn>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7487,42 +7523,42 @@ msgid "dereference tags in the input (internal use)" msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" -msgstr "git notes [--ref <notes_ref>] [list [<đối-tượng>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "git notes [--ref <notes-ref>] [list [<đối-tượng>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <lời-nhắn> | -F " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <lời-nhắn> | -F " "<tập-tin> | (-c | -C) <đối-tượng>] [<đối-tượng>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" -msgstr "git notes [--ref <notes_ref>] copy [-f] <từ-đối-tượng> <đến-đối-tượng>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" +msgstr "git notes [--ref <notes-ref>] copy [-f] <từ-đối-tượng> <đến-đối-tượng>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <lời-nhắn> | -F " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <lời-nhắn> | -F " "<tập-tin> | (-c | -C) <đối-tượng>] [<đối-tượng>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" -msgstr "git notes [--ref <notes_ref>] edit [--allow-empty] [<đối-tượng>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<đối-tượng>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "git notes [--ref <notes_ref>] show [<đối-tượng>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <notes-ref>] show [<đối-tượng>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <chiến-lược> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <chiến-lược> ] <notes-ref>" #: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" @@ -7533,16 +7569,16 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" -msgstr "git notes [--ref <notes_ref>] remove [<đối-tượng>…]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "git notes [--ref <notes-ref>] remove [<đối-tượng>…]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" -msgstr "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgstr "git notes [--ref <notes-ref>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" -msgstr "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "git notes [--ref <notes-ref>] get-ref" #: builtin/notes.c:40 msgid "git notes [list [<object>]]" @@ -7573,8 +7609,8 @@ msgid "git notes show [<object>]" msgstr "git notes show [<đối tượng>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" -msgstr "git notes merge [<các-tùy-chọn>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<các-tùy-chọn>] <notes-ref>" #: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" @@ -7813,8 +7849,8 @@ msgid "notes-ref" msgstr "notes-ref" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" -msgstr "dùng “notes” từ <notes_ref>" +msgid "use notes from <notes-ref>" +msgstr "dùng “notes” từ <notes-ref>" #: builtin/notes.c:989 builtin/remote.c:1621 #, c-format @@ -7833,187 +7869,187 @@ msgstr "" "git pack-objects [các-tùy-chọn…] base-name [< danh-sách-ref | < danh-sách-" "đối-tượng]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "lỗi giải nén (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Đang ghi lại các đối tượng" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, 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:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, 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:2603 +#: builtin/pack-objects.c:2601 #, 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:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 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:2630 +#: builtin/pack-objects.c:2628 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:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "phiên bản[,offset]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 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:2635 +#: builtin/pack-objects.c:2633 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:2637 +#: builtin/pack-objects.c:2635 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:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 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:2643 +#: builtin/pack-objects.c:2641 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:2645 +#: builtin/pack-objects.c:2643 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:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 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:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "không thể tạo kết xuất gói trống rỗng" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 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:2662 +#: builtin/pack-objects.c:2660 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:2665 +#: builtin/pack-objects.c:2663 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:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 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:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "thời-gian" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 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:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "tạo gói để phù hợp cho lấy về nông (shallow)" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 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:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "không ẩn các lần chuyển giao bởi “grafts”" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "ghi một mục lục ánh xạ cùng với mục lục gói" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Đang đếm các đối tượng" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [các-tùy-chọn]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<các-tùy-chọn>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -8024,8 +8060,8 @@ msgid "prune loose refs (default)" msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8306,75 +8342,79 @@ msgstr "--mirror không thể được tổ hợp cùng với đặc tả đư msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "kho" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "đẩy tất cả các tham chiếu" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "mirror tất cả các tham chiếu" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "xóa các tham chiếu" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "ép buộc cập nhật" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "tên-tham-chiếu>:<cần" -#: builtin/push.c:504 +#: builtin/push.c:513 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:507 +#: builtin/push.c:516 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:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "tạo gói nhẹ" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "chương trình nhận gói" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "đặt thượng nguồn cho git pull/status" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "xén tỉa những tham chiếu bị gỡ bỏ" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "vòng qua móc tiền-đẩy (pre-push)" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "ký lần đẩy dùng GPG" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ" + +#: builtin/push.c:539 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:531 +#: builtin/push.c:541 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 nào" @@ -8454,12 +8494,12 @@ msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt" msgid "debug unpack-trees" msgstr "gỡ lỗi “unpack-trees”" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, 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 vết thời gian hợp lệ" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "“%s” không phải là dấu thời gian hợp lệ" @@ -8470,7 +8510,7 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" "git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--" @@ -8484,8 +8524,8 @@ msgstr "git remote rename <tên-cũ> <tên-mới>" msgid "git remote remove <name>" msgstr "git remote remove <tên>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)" #: builtin/remote.c:17 @@ -8522,10 +8562,6 @@ msgstr "git remote set-url --delete <tên> <url>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<các-tùy-chọn>] <tên> <url>" -#: 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:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <tên> <nhánh>…" @@ -8953,8 +8989,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trước một lệnh-con" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [các-tùy-chọn]" +msgid "git repack [<options>]" +msgstr "git repack [<các-tùy-chọn>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -9020,7 +9056,7 @@ msgstr "kcíh thước tối đa cho từng tập tin gói" msgid "repack objects in packs marked with .keep" msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "gặp lỗi khi xóa bỏ “%s”" @@ -9112,8 +9148,9 @@ 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]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "" +"git rerere [clear | forget <đường dẫn>… | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9253,8 +9290,8 @@ 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:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [các-tùy-chọn] -- [<th.số>…]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<các-tùy-chọn>] -- [<các tham số>…]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9270,29 +9307,29 @@ msgstr "kết xuất trong định dạng gậy dài" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [các-tùy-chọn] -- [<đ.số>…]\n" +"git rev-parse --parseopt [<các-tùy-chọn>] -- [<các đối số>…]\n" " hoặc: git rev-parse --sq-quote [<đ.số>…]\n" -" hoặc: git rev-parse [các-tùy-chọn] [<đ.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." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [các-tùy-chọn] <commit-ish>…" +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<các-tùy-chọn>] <commit-ish>…" #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <lệnh-con>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [các-tùy-chọn] <commit-ish>…" +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<các-tùy-chọn>] <commit-ish>…" #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9372,8 +9409,8 @@ msgid "cherry-pick failed" msgstr "cherry-pick gặp lỗi" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [các-tùy-chọn] [--] <tập-tin>…" +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<các-tùy-chọn>] [--] <tập-tin>…" #: builtin/rm.c:65 msgid "" @@ -9469,8 +9506,8 @@ msgid "git rm: unable to remove %s" msgstr "git rm: không thể gỡ bỏ %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" -msgstr "git shortlog [các-tùy-chọn] [<vùng-xét-duyệt>] [[--] [<đường-dẫn>…]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<các-tùy-chọn>] [<vùng-xét-duyệt>] [[--] [<đường-dẫn>…]]" #: builtin/shortlog.c:131 #, c-format @@ -9499,19 +9536,19 @@ msgstr "Ngắt dòng khi quá dài" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<khi>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<nền>]] [--list] [<ref>]" +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:652 msgid "show remote-tracking and local branches" @@ -9579,11 +9616,11 @@ msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền ( #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mẫu*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mẫu>…] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9626,12 +9663,12 @@ msgstr "" "bộ" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [các-tùy-chọn] tên [t.chiếu]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<các-tùy-chọn>] <tên> [<t.chiếu>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] tên" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <tên>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9655,9 +9692,11 @@ msgstr "lý do cập nhật" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <tập-tin>] <tên-thẻ> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg>|-F <tập-tin>] <tên-thẻ> " +"[<head>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -9665,10 +9704,11 @@ msgstr "git tag -d <tên-thẻ>…" #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <đối-tượng>] \n" +"git tag -l [-n[<số>]] [--contains <lần_chuyển_giao>] [--points-at <đối-" +"tượng>]\n" "\t\t[<mẫu>…]" #: builtin/tag.c:26 @@ -9812,18 +9852,18 @@ msgstr "dùng kháo khác để ký thẻ" msgid "replace the tag if exists" msgstr "thay thế nếu tag đó đã có trước" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Các tùy chọn liệt kê thẻ" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "hiển thị danh sách thẻ trong các cột" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "sắp xếp các thẻ" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Các tùy chọn liệt kê thẻ" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" @@ -9880,8 +9920,8 @@ msgid "Unpacking objects" msgstr "Đang giải nén các đối tượng" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [các-tùy-chọn] [<tập-tin>…]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<các-tùy-chọn>] [--] [<tập-tin>…]" #: builtin/update-index.c:756 msgid "continue refresh even when index needs update" @@ -10000,16 +10040,16 @@ msgid "enable or disable split index" msgstr "bật/tắt chia cắt bảng mục lục" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [các-tùy-chọn] -d <refname> [<biến-cũ>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<các-tùy-chọn>] -d <refname> [<biến-cũ>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "git update-ref [các-tùy-chọn] <refname> <biến-mới> [<biến-cũ>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<các-tùy-chọn>] <refname> <biến-mới> [<biến-cũ>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [các-tùy-chọn] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<các-tùy-chọn>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -10036,16 +10076,16 @@ msgid "update the info files from scratch" msgstr "cập nhật các tập tin thông tin từ điểm xuất phát" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <lần_chuyển_giao>…" +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <lần_chuyển_giao>…" #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "hiển thị nội dung của lần chuyển giao" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <gói>…" +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <gói>…" #: builtin/verify-pack.c:64 msgid "verbose" @@ -10056,8 +10096,8 @@ msgid "show statistics only" msgstr "chỉ hiển thị thống kê" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <thẻ>…" +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <thẻ>…" #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10416,10 +10456,10 @@ msgstr "HEAD sai - Tôi cần một HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" -"Việc checkout “$start_head” gặp lỗi. Hãy thử “git bisect reset " -"<nhánh_hợp_lệ>”." +"Việc lấy “$start_head” ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>" +"\"." #: git-bisect.sh:140 msgid "won't bisect on cg-seek'ed tree" @@ -11194,6 +11234,18 @@ msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm msgid "Synchronizing submodule url for '$displaypath'" msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" +#~ msgid "(detached from %s)" +#~ msgstr "(được tách rời từ %s)" + +#~ msgid "No existing author found with '%s'" +#~ msgstr "Không tìm thấy tác giả có sẵn với “%s”" + +#~ msgid "search also in ignored files" +#~ msgstr "tìm cả trong các tập tin đã bị lờ đi" + +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#~ msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)" + #~ msgid "no files added" #~ msgstr "chưa có tập tin nào được thêm vào" diff --git a/po/zh_CN.po b/po/zh_CN.po index 2b8d2cbb77..fc457693c0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,7 +2,7 @@ # Git 软件包的简体中文翻译. # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. -# Contributers: +# Contributors: # - Jiang Xin <worldhello.net AT gmail.com> # - Riku <lu.riku AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> @@ -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: 2015-01-21 14:21+0800\n" -"PO-Revision-Date: 2015-01-21 14:58+0800\n" +"POT-Creation-Date: 2015-03-27 13:33+0800\n" +"PO-Revision-Date: 2015-03-31 09:43+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -36,8 +36,8 @@ msgstr "" "解决方案并提交。" #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [选项] <树或提交> [<路径>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<选项>] <树或提交> [<路径>...]" #: archive.c:12 msgid "git archive --list" @@ -45,9 +45,9 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]" +"git archive --remote <版本库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" #: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -74,10 +74,10 @@ msgstr "前缀" msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "文件" @@ -126,7 +126,7 @@ msgstr "命令" msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -251,7 +251,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:764 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -260,8 +260,8 @@ msgstr "不能打开 '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -302,21 +302,21 @@ msgstr "rev-list 终止" msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "index-pack 终止" @@ -339,55 +339,55 @@ msgstr "%s %s 不是一个提交!" msgid "memory exhausted" msgstr "内存耗尽" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "配置文件 %2$s 出错于第 %1$d 行" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展 '%s' 中的用户目录" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" @@ -479,7 +479,7 @@ msgstr[1] "%lu 年前" msgid "failed to read orderfile '%s'" msgstr "无法读取排序文件 '%s'" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名检测" @@ -509,16 +509,16 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow 参数后只跟一个 pathspec" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -527,7 +527,7 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" @@ -1024,7 +1024,7 @@ msgstr "不能解析 --pretty 格式" msgid "done" msgstr "完成" -#: read-cache.c:1267 +#: read-cache.c:1273 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1033,7 +1033,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1277 +#: read-cache.c:1283 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1119,23 +1119,31 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent 与 --bisect 不兼容" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "不能调用 dup2(%d,%d)" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "无法为推送证书签名" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "接收端不支持签名推送" +#: send-pack.c:366 +msgid "server does not support --atomic push" +msgstr "服务器端不支持原子（--atomic）推送" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1165,7 +1173,7 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" @@ -1201,184 +1209,184 @@ msgstr "不能解析 HEAD 提交\n" msgid "Unable to update cache tree\n" msgstr "不能更新缓存\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "指定了主线但提交 %s 不是一个合并。" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "没有提交被解析。" -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4286 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" @@ -1445,38 +1453,38 @@ msgstr "无法移除 %s 的 .gitmodules 条目" msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "不能创建 git link %s" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "不能在 %s 中设置 core.worktree" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "键 '%2$s' 的未知取值 '%1$s'" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "多于一个 %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "签名 '%.*s' 的键为空" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "不能读取输入文件 '%s'" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "不能自标准输入读取" @@ -1513,26 +1521,26 @@ msgstr "无效的端口号" msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "不能访问 '%s'：%s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "无法在口令文件中查询到当前用户：%s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "无此用户" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "不能获取当前工作目录" @@ -1566,11 +1574,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" @@ -1686,15 +1694,15 @@ msgstr "未跟踪的内容, " msgid "bug: unhandled diff status %c" msgstr "bug：无法处理的差异状态 %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1702,198 +1710,198 @@ msgstr "" "不要改动上面的一行。\n" "下面的所有内容均将被删除。" -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1903,80 +1911,80 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "初始提交于 " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "丢失" # 译者：注意保持句尾空格 -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "落后 " @@ -1986,8 +1994,8 @@ msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [选项] [--] <路径规则>..." +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<选项>] [--] <路径规则>..." #: builtin/add.c:65 #, c-format @@ -2038,14 +2046,14 @@ msgstr "不能应用 '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "演习" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "冗长输出" @@ -2121,75 +2129,75 @@ msgstr "没有指定文件，也没有文件被添加。\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [选项] [<补丁>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<选项>] [<补丁>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2200,77 +2208,77 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2872 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）" msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）" -#: builtin/apply.c:2884 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2890 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" @@ -2279,317 +2287,336 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2933 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:3010 +#: builtin/apply.c:3034 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:3016 +#: builtin/apply.c:3040 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: builtin/apply.c:3037 +#: builtin/apply.c:3061 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3185 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3238 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "读取位于符号链接中的 '%s'" + +#: builtin/apply.c:3266 builtin/apply.c:3488 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3347 builtin/apply.c:3502 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3356 builtin/apply.c:3510 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3432 +#: builtin/apply.c:3458 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: builtin/apply.c:3501 +#: builtin/apply.c:3527 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3503 +#: builtin/apply.c:3529 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3688 builtin/apply.c:3690 +#, c-format +msgid "invalid path '%s'" +msgstr "无效路径 '%s'" + +#: builtin/apply.c:3745 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3607 +#: builtin/apply.c:3748 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: builtin/apply.c:3627 +#: builtin/apply.c:3768 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3632 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配" -#: builtin/apply.c:3640 +#: builtin/apply.c:3793 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "受影响的文件 '%s' 位于符号链接中" + +#: builtin/apply.c:3797 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3653 +#: builtin/apply.c:3811 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:3889 +#: builtin/apply.c:4047 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:3918 +#: builtin/apply.c:4076 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: builtin/apply.c:3922 +#: builtin/apply.c:4080 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:3927 +#: builtin/apply.c:4085 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4088 builtin/apply.c:4196 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:3963 +#: builtin/apply.c:4121 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:4012 +#: builtin/apply.c:4170 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:4099 +#: builtin/apply.c:4257 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:4107 +#: builtin/apply.c:4265 msgid "internal error" msgstr "内部错误" -#: builtin/apply.c:4110 +#: builtin/apply.c:4268 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." -#: builtin/apply.c:4120 +#: builtin/apply.c:4278 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4299 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:4144 +#: builtin/apply.c:4302 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:4234 +#: builtin/apply.c:4392 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4245 +#: builtin/apply.c:4403 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "路径" -#: builtin/apply.c:4363 +#: builtin/apply.c:4521 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:4366 +#: builtin/apply.c:4524 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:4368 +#: builtin/apply.c:4526 msgid "num" msgstr "数字" -#: builtin/apply.c:4369 +#: builtin/apply.c:4527 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: builtin/apply.c:4372 +#: builtin/apply.c:4530 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:4374 +#: builtin/apply.c:4532 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:4378 +#: builtin/apply.c:4536 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: builtin/apply.c:4380 +#: builtin/apply.c:4538 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:4382 +#: builtin/apply.c:4540 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:4384 +#: builtin/apply.c:4542 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:4386 +#: builtin/apply.c:4544 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:4388 +#: builtin/apply.c:4546 +msgid "accept a patch that touches outside the working area" +msgstr "接受修改工作区之外文件的补丁" + +#: builtin/apply.c:4548 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: builtin/apply.c:4390 +#: builtin/apply.c:4550 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三路合并" -#: builtin/apply.c:4392 +#: builtin/apply.c:4552 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4397 +#: builtin/apply.c:4557 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4398 +#: builtin/apply.c:4558 msgid "action" msgstr "动作" -#: builtin/apply.c:4399 +#: builtin/apply.c:4559 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4562 builtin/apply.c:4565 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4408 +#: builtin/apply.c:4568 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4410 +#: builtin/apply.c:4570 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4412 +#: builtin/apply.c:4572 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4414 +#: builtin/apply.c:4574 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4417 +#: builtin/apply.c:4577 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4420 +#: builtin/apply.c:4580 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4422 +#: builtin/apply.c:4582 msgid "root" msgstr "根目录" -#: builtin/apply.c:4423 +#: builtin/apply.c:4583 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4445 +#: builtin/apply.c:4605 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" -#: builtin/apply.c:4453 +#: builtin/apply.c:4613 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4456 +#: builtin/apply.c:4616 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4472 +#: builtin/apply.c:4635 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4486 +#: builtin/apply.c:4649 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4655 builtin/apply.c:4665 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2644,102 +2671,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非检出当前提交" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [选项] [版本选项] [版本] [--] 文件" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] 文件" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的SHA1提交号（默认：关闭）" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "得分" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" @@ -2749,25 +2776,25 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [选项] [-r] (-d | -D) <分支名>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c:152 @@ -2909,232 +2936,237 @@ msgstr "（非分支，正变基 %s）" msgid "(no branch, bisect started on %s)" msgstr "（非分支，二分查找开始于 %s）" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "（分离自 %s）" +msgid "(HEAD detached at %s)" +msgstr "（头指针分离于 %s）" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "（头指针分离自 %s）" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "对象 '%s' 没有指向一个提交" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "一些引用不能读取" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "不能写分支描述模版：%s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "改变上游信息" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "提交" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "只打印没有合并的分支" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "只打印合并的分支" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "为重命名操作提供了太多的分支名" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "为设置新上游提供了太多的分支名" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "为取消上游设置操作提供了太多的分支名" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有意义" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3142,7 +3174,7 @@ msgid "" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3153,12 +3185,12 @@ msgstr "" "如果你想用 '%s' 跟踪 '%s', 这么做：\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3176,53 +3208,53 @@ msgstr "需要一个版本库来创建包。" msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: 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:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | <类型> | --textconv) <对象>" -#: 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:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <对象列表>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "对于数据（blob）对象，对其内容执行 textconv" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr...] [--] 路径名..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" -msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3277,8 +3309,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项只在使用 --verbose 时有效" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [选项] <联系地址>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<选项>] <联系地址>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3294,8 +3326,8 @@ msgid "no contacts specified" msgstr "未指定联系地址" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [选项] [--] [<文件>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<选项>] [--] [<文件>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3338,12 +3370,12 @@ msgid "copy out the files from named stage" msgstr "从指定暂存区中拷出文件" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [选项] <分支>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<选项>] <分支>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [选项] [<分支>] -- <文件>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<选项>] [<分支>] -- <文件>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3471,13 +3503,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" "如果您想要通过创建新分支保存他们，这可能是一个好时候。\n" "如下操作：\n" "\n" -" git branch new_branch_name %s\n" +" git branch <新分支名> %s\n" "\n" #: builtin/checkout.c:777 @@ -3593,8 +3625,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "再者猜测'git checkout no-such-branch'" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "二次猜测'git checkout <无此分支>'" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3715,16 +3747,17 @@ msgstr "警告：无法找到和 %s 匹配的条目" msgid "Select items to delete" msgstr "选择要删除的条目" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "删除 %s？" +msgid "Remove %s [y/N]? " +msgstr "删除 %s [y/N]？" -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "再见。" -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3742,69 +3775,69 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "请选择" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "强制" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "模式" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "添加<模式>到忽略规则" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3812,11 +3845,11 @@ msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [选项] [--] <版本库> [<路径>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<选项>] [--] <版本库> [<路径>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "强制显示进度报告" @@ -3876,7 +3909,7 @@ msgstr "检出<分支>而不是远程HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "深度" @@ -4020,7 +4053,7 @@ msgstr "--bare 和 --separate-git-dir 选项不兼容。" msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" @@ -4035,59 +4068,59 @@ msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "不能为 '%s' 创建工作区目录。" +msgid "could not create work tree dir '%s'" +msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯版本库 '%s'...\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "提供了参数 --dissociate，但未提供 --reference" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "源版本库是浅克隆，忽略 --local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [选项]" +msgid "git column [<options>]" +msgstr "git column [<选项>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4118,12 +4151,12 @@ msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [选项] [--] <路径规则>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<选项>] [--] <路径规则>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [选项] [--] <路径规则>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<选项>] [--] <路径规则>..." #: builtin/commit.c:47 msgid "" @@ -4259,68 +4292,68 @@ msgstr "无法读取索引" msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:584 +#: builtin/commit.c:578 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" -#: builtin/commit.c:586 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有非法的作者信息" -#: builtin/commit.c:605 +#: builtin/commit.c:599 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:613 +#: builtin/commit.c:607 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: builtin/commit.c:657 +#: builtin/commit.c:651 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:700 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:708 +#: builtin/commit.c:702 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:712 +#: builtin/commit.c:706 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:734 +#: builtin/commit.c:728 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:732 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:736 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/commit.c:789 +#: builtin/commit.c:783 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:807 +#: builtin/commit.c:801 #, c-format msgid "" "\n" @@ -4334,7 +4367,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:812 +#: builtin/commit.c:806 #, c-format msgid "" "\n" @@ -4348,7 +4381,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:825 +#: builtin/commit.c:819 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4357,7 +4390,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:832 +#: builtin/commit.c:826 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4368,353 +4401,353 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:852 +#: builtin/commit.c:846 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:860 +#: builtin/commit.c:854 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:867 +#: builtin/commit.c:861 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:879 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:942 +#: builtin/commit.c:936 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:951 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1053 #, c-format -msgid "No existing author found with '%s'" -msgstr "没有找到匹配 '%s' 的作者" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1068 builtin/commit.c:1308 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1111 +#: builtin/commit.c:1105 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1141 +#: builtin/commit.c:1135 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1150 +#: builtin/commit.c:1144 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1153 +#: builtin/commit.c:1147 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1155 +#: builtin/commit.c:1149 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1158 +#: builtin/commit.c:1152 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1168 +#: builtin/commit.c:1162 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1170 +#: builtin/commit.c:1164 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1178 +#: builtin/commit.c:1172 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1195 +#: builtin/commit.c:1189 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1197 +#: builtin/commit.c:1191 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1199 +#: builtin/commit.c:1193 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1201 +#: builtin/commit.c:1195 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..." -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1207 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1212 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1322 builtin/commit.c:1602 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1329 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1332 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "条目以NUL字符结尾" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "模式" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1335 builtin/commit.c:1614 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1344 +#: builtin/commit.c:1338 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1339 parse-options.h:153 msgid "when" msgstr "何时" -#: builtin/commit.c:1346 +#: builtin/commit.c:1340 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1348 +#: builtin/commit.c:1342 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1435 +#: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1437 +#: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1482 +#: builtin/commit.c:1476 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1485 +#: builtin/commit.c:1479 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1578 +#: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1579 +#: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1581 +#: builtin/commit.c:1575 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1576 builtin/tag.c:601 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "author" msgstr "作者" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1578 builtin/gc.c:275 msgid "date" msgstr "日期" -#: builtin/commit.c:1584 +#: builtin/commit.c:1578 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "说明" -#: builtin/commit.c:1585 +#: builtin/commit.c:1579 msgid "commit message" msgstr "提交说明" -#: builtin/commit.c:1586 +#: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1587 +#: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1588 +#: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1589 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1590 +#: builtin/commit.c:1584 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1592 +#: builtin/commit.c:1586 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1593 +#: builtin/commit.c:1587 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1594 +#: builtin/commit.c:1588 msgid "default" msgstr "default" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1588 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1595 +#: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "key-id" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 提交签名" -#: builtin/commit.c:1600 +#: builtin/commit.c:1594 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1601 +#: builtin/commit.c:1595 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1602 +#: builtin/commit.c:1596 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1603 +#: builtin/commit.c:1597 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1604 +#: builtin/commit.c:1598 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1605 +#: builtin/commit.c:1599 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1606 +#: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "绕过 pre-commit 钩子" -#: builtin/commit.c:1607 +#: builtin/commit.c:1601 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1618 +#: builtin/commit.c:1612 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1619 +#: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1624 +#: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1626 +#: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1655 +#: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1688 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1701 +#: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1708 +#: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1732 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1743 +#: builtin/commit.c:1737 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1791 +#: builtin/commit.c:1785 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4724,8 +4757,8 @@ msgstr "" "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。" #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [选项]" +msgid "git config [<options>]" +msgstr "git config [<选项>]" #: builtin/config.c:53 msgid "Config file location" @@ -4880,12 +4913,12 @@ msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [选项] <提交号>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<选项>] [<提交号>...]" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [选项] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<选项>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5100,179 +5133,179 @@ msgstr "对导出的引用应用引用表达式" msgid "anonymize output" msgstr "匿名输出" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "抓取所有的 tags 和关联对象" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何 tags (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" # 译者：可选值，不能翻译 -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "转换为一个完整的版本库" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "目录" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "递归的默认模式" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[tag更新]" # 译者：注意保持前导空格 -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " （不能更新本地引用）" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[新tag]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "（非快进式）" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "无法打开 %s：%s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5282,93 +5315,94 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非纯版本库的当前分支 %s" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "您需要指定一个 tag 名称。" -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的版本库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个版本库参数" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规则没有任何意义" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规则没有意义" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" -msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5397,51 +5431,51 @@ msgstr "使用 <文本> 作为提交说明的开始" msgid "file to read from" msgstr "从文件中读取" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "不能解析格式" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [选项] [<模式>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<选项>] [<模式>]" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "引用占位符适用于 Tcl" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "格式" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "输出格式" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "key" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "排序的字段名" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "检查连接中" @@ -5450,8 +5484,8 @@ msgid "Checking object directories" msgstr "检查对象目录中" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [选项] [<对象>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<选项>] [<对象>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5498,8 +5532,8 @@ msgid "Checking objects" msgstr "检查对象中" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [选项]" +msgid "git gc [<options>]" +msgstr "git gc [<选项>]" #: builtin/gc.c:79 #, c-format @@ -5555,8 +5589,8 @@ msgid "" msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [选项] [-e] <模式> [<版本>...] [[--] <路径>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" #: builtin/grep.c:218 #, c-format @@ -5597,8 +5631,8 @@ msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "也在忽略的文件中搜索" +msgid "ignore files specified via '.gitignore'" +msgstr "忽略 '.gitignore' 包含的文件" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5782,17 +5816,17 @@ msgstr "同时给出了 --cached 和树对象。" #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] " -"<文件>..." +"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " +"[--] <文件>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <路径列表>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "类型" @@ -5842,8 +5876,8 @@ msgid "show info page" msgstr "显示 info 手册" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" #: builtin/help.c:64 #, c-format @@ -6051,8 +6085,8 @@ msgstr "解压缩严重的不一致" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "不能读 %s" @@ -6139,97 +6173,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包名参数" @@ -6342,10 +6376,10 @@ msgstr "共享" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " -"[目录]" +"[<目录>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6406,8 +6440,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [选项] <对象>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<选项>] <对象>..." #: builtin/log.c:81 #, c-format @@ -6485,8 +6519,8 @@ msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [选项] [<从> | <版本范围>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<选项>] [<从> | <版本范围>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6682,95 +6716,95 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" msgid "Unknown commit %s" msgstr "未知提交 %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [选项] [<文件>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "树或提交" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "显示调试数据" @@ -6811,12 +6845,12 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [选项] [<提交>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<选项>] [<提交>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [选项] <说明> HEAD <提交>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<选项>] <说明> HEAD <提交>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7156,12 +7190,12 @@ msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <提交> <提交>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <提交> <提交>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <提交>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <提交>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7197,10 +7231,11 @@ msgstr "查找 <提交> 从<引用>日志的何处分支的" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2" +"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" +"件> <文件2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7231,8 +7266,8 @@ msgid "do not warn about conflicts" msgstr "不要警告冲突" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "为 file1/orig_file/file2 设置标签" +msgid "set labels for file1/orig-file/file2" +msgstr "为 文件1/初始文件/文件2 设置标签" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7251,8 +7286,8 @@ msgid "allow creation of more than one tree" msgstr "允许创建一个以上的树" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [选项] <源>... <目标>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<选项>] <源>... <目标>" #: builtin/mv.c:69 #, c-format @@ -7337,22 +7372,22 @@ msgstr "%s，源=%s，目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [选项] <提交>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<选项>] <提交>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [选项] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<选项>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [选项] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<选项>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7383,40 +7418,40 @@ msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的 tags（内部使用）" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " "| (-c | -C) <对象>] [<对象>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " "(-c | -C) <对象>] [<对象>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <注解引用>] show [<对象>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" #: builtin/notes.c:31 @@ -7428,15 +7463,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <注解引用>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" #: builtin/notes.c:40 @@ -7468,7 +7503,7 @@ msgid "git notes show [<object>]" msgstr "git notes show [<对象>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<选项>] <注解引用>" #: builtin/notes.c:72 @@ -7699,7 +7734,7 @@ msgid "notes-ref" msgstr "注解引用" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" +msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" #: builtin/notes.c:989 builtin/remote.c:1621 @@ -7715,186 +7750,186 @@ msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "不能解析选项 %1$s 的值 '%2$s'" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从替代对象存储里借用对象" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "包括引用了打包对象的 tag" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "时间" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆版本库获取的包" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "显示被嫁接隐藏的提交" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "对象计数中" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [选项]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<选项>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -7905,8 +7940,8 @@ msgid "prune loose refs (default)" msgstr "清除松散的引用（默认）" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8167,75 +8202,79 @@ msgstr "--mirror 不能和引用规则同时使用" msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "版本库" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送 tags（不能使用 --all or --mirror）" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "引用名>:<期望值" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "推送缺失的有关的 tags" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "用 GPG 为推送签名" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "需要远端支持原子事务" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" @@ -8313,12 +8352,12 @@ msgstr "跳过应用稀疏检出过滤器" msgid "debug unpack-trees" msgstr "调试 unpack-trees" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一个有效的时间戳" @@ -8329,10 +8368,10 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <名称> <地址>" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8343,9 +8382,9 @@ msgstr "git remote rename <旧名称> <新名称>" 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:16 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:17 msgid "git remote [-v | --verbose] show [-n] <name>" @@ -8380,10 +8419,6 @@ msgstr "git remote set-url --delete <名称> <地址>" 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 <名称> <分支>..." @@ -8815,8 +8850,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [选项]" +msgid "git repack [<options>]" +msgstr "git repack [<选项>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -8882,7 +8917,7 @@ msgstr "每个包的最大尺寸" msgid "repack objects in packs marked with .keep" msgstr "对标记为 .keep 的包中的对象重新打包" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "删除 '%s' 失败" @@ -8972,8 +9007,8 @@ 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]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9113,8 +9148,8 @@ msgid "Could not write new index file." msgstr "不能写入新的索引文件。" #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [选项] -- [<参数>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9130,29 +9165,29 @@ msgstr "以固定长格式输出" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [选项] -- [<参数>...]\n" +"git rev-parse --parseopt [<选项>] -- [<参数>...]\n" " 或者：git rev-parse --sq-quote [<参数>...]\n" -" 或者：git rev-parse [选项] [<参数>...]\n" +" 或者：git rev-parse [<选项>] [<参数>...]\n" "\n" "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [选项] <提交号>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<选项>] <提交号>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <子命令>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [选项] <提交号>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<选项>] <提交号>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9232,8 +9267,8 @@ msgid "cherry-pick failed" msgstr "拣选失败" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [选项] [--] <文件>..." +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<选项>] [--] <文件>..." #: builtin/rm.c:65 msgid "" @@ -9326,7 +9361,7 @@ msgid "git rm: unable to remove %s" msgstr "git rm：不能删除 %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" #: builtin/shortlog.c:131 @@ -9356,19 +9391,19 @@ msgstr "折行输出" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<引用>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9436,11 +9471,11 @@ msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9479,12 +9514,12 @@ 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 "git symbolic-ref [选项] 名称 [引用]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] 名称" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <名称>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9508,8 +9543,10 @@ msgstr "更新的原因" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" -msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" +msgstr "" +"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -9517,11 +9554,10 @@ msgstr "git tag -d <标签名>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] \n" -"\t\t[<模式>...]" +"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]" #: builtin/tag.c:26 msgid "git tag -v <tagname>..." @@ -9663,18 +9699,18 @@ msgstr "使用另外的私钥签名 tag" msgid "replace the tag if exists" msgstr "如果存在，替换现有的 tag" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Tag 列表选项" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "以列的方式显示 tag" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "排序 tags" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Tag 列表选项" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "只打印包含提交的tags" @@ -9731,8 +9767,8 @@ msgid "Unpacking objects" msgstr "展开对象中" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [选项] [--] [<文件>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<选项>] [--] [<文件>...]" #: builtin/update-index.c:756 msgid "continue refresh even when index needs update" @@ -9847,16 +9883,16 @@ msgid "enable or disable split index" msgstr "启用或禁用索引拆分" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [选项] -d <引用名> [<旧值>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [选项] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<选项>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -9883,16 +9919,16 @@ msgid "update the info files from scratch" msgstr "从头开始更新文件信息" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <提交>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <提交>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "打印提交内容" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <包>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -9903,8 +9939,8 @@ msgid "show statistics only" msgstr "只显示统计" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <标签>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <标签>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10248,7 +10284,7 @@ msgstr "坏的 HEAD - 我需要一个 HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" #: git-bisect.sh:140 @@ -10981,385 +11017,3 @@ msgstr "无法递归进子模组路径 '$sm_path'" #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' 同步子模组 url" - -#~ msgid "no files added" -#~ msgstr "没有文件被添加" - -#~ msgid "force creation (when already exists)" -#~ msgstr "强制创建（当已经存在）" - -#~ msgid "Malformed ident string: '%s'" -#~ msgstr "非法的身份字符串：'%s'" - -#~ msgid "slot" -#~ msgstr "slot" - -#~ msgid "Failed to lock ref for update" -#~ msgstr "无法为更新锁定引用" - -#~ msgid "Failed to write ref" -#~ msgstr "不能写引用" - -#~ msgid "Failed to lock HEAD during fast_forward_to" -#~ msgstr "在快进时无法为 HEAD 加锁" - -#~ msgid "invalid commit: %s" -#~ msgstr "无效的提交：%s" - -#~ msgid "cannot lock HEAD ref" -#~ msgstr "无法锁定 HEAD 引用" - -#~ msgid "cannot update HEAD ref" -#~ msgstr "无法更新 HEAD 引用" - -#~ msgid "Invalid %s: '%s'" -#~ msgstr "无效的 %s：'%s'" - -#~ msgid "cannot tell cwd" -#~ msgstr "无法获知当前路径" - -#~ msgid "%s: cannot lock the ref" -#~ msgstr "%s：不能锁定引用" - -#~ msgid "%s: cannot update the ref" -#~ msgstr "%s：不能更新引用" - -#~ msgid "commit has empty message" -#~ msgstr "提交说明为空" - -#~ msgid "Failed to chdir: %s" -#~ msgstr "无法切换目录：%s" - -#~ msgid "key id" -#~ msgstr "key id" - -#~ msgid "Tracking not set up: name too long: %s" -#~ msgstr "跟踪未设置：名字太长：%s" - -#~ msgid "bug" -#~ msgstr "bug" - -# 译者：注意保持句尾空格 -#~ msgid "ahead " -#~ msgstr "领先 " - -# 译者：注意保持句尾空格 -#~ msgid ", behind " -#~ msgstr "，落后 " - -#~ msgid "could not find .gitmodules in index" -#~ msgstr "无法在索引中找到 .gitmodules" - -#~ msgid "reading updated .gitmodules failed" -#~ msgstr "读取更新后的 .gitmodules 失败" - -#~ msgid "unable to stat updated .gitmodules" -#~ msgstr "不能枚举更新后的 .gitmodules" - -#~ msgid "unable to remove .gitmodules from index" -#~ msgstr "不能从索引中移除 .gitmodules" - -#~ msgid "adding updated .gitmodules failed" -#~ msgstr "添加更新后的 .gitmodules 失败" - -# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 -#~ 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 "" -#~ "在 Git 2.0 版本，位于一个子目录下不带任何路径参数地执行命令\n" -#~ "'git add %s (或 %s)' 的行为将被改变，不要再继续使用了。\n" -#~ "如果要添加整个目录树的内容，执行：\n" -#~ "\n" -#~ " git add %s :/\n" -#~ " (或 git add %s :/)\n" -#~ "\n" -#~ "如果要限制该命令只作用于当前目录，执行：\n" -#~ "\n" -#~ " git add %s .\n" -#~ " (或 git add %s .)\n" -#~ "\n" -#~ "对于当前版本的 Git，这条命令只作用于当前目录。\n" - -#~ 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 "" -#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal'，\n" -#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n" -#~ "像本地工作区移除的路径 '%s'\n" -#~ "在此版本的 Git 中被忽略。\n" -#~ "\n" -#~ "* 'git add --ignore-removal <路径规则>'，是当前版本的默认操作，\n" -#~ " 忽略您本地工作区中移除的文件。\n" -#~ "\n" -#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n" -#~ "\n" -#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n" - -#~ 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 "" -#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" -#~ "参见 \"git help gc\" 以获取更多信息。\n" - -#~ 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 "" -#~ "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n" -#~ "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n" -#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" -#~ "以便只推送当前分支。" - -# 译者：为保证在输出中对齐，注意调整句中空格！ -#~ 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 "input paths are terminated by a null character" -#~ msgstr "输入路径以null字符终止" - -#~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除：" - -#~ msgid "" -#~ "Aborting. Consider using either the --force or --include-untracked option." -#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。" - -#~ msgid "" -#~ "the following submodule (or one of its nested submodule)\n" -#~ "uses a .git directory:" -#~ msgid_plural "" -#~ "the following submodules (or one of its nested submodule)\n" -#~ "use a .git directory:" -#~ msgstr[0] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录：" -#~ msgstr[1] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录：" - -# 译者：注意保持前导空格 -#~ msgid " (fix conflicts and then run \"git am --resolved\")" -#~ msgstr " （解决冲突，然后运行 \"git am --resolved\"）" - -# 译者：注意保持前导空格 -#~ msgid " (all conflicts fixed: run \"git commit\")" -#~ msgstr " （解决所有冲突后，执行 \"git commit\"）" - -#~ msgid "more than %d trees given: '%s'" -#~ msgstr "提供了超过 %d 个树对象：'%s'" - -#~ msgid "You cannot combine --no-ff with --ff-only." -#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" - -#~ msgid "" -#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n" -#~ "(use 'rm -rf' if you really want to remove it including all of its " -#~ "history)" -#~ msgstr "" -#~ "子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n" -#~ "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" - -#~ msgid "" -#~ "'%s' has changes staged in the index\n" -#~ "(use --cached to keep the file, or -f to force removal)" -#~ msgstr "" -#~ "'%s' 有变更已暂存至索引中\n" -#~ "（使用 --cached 保存文件，或用 -f 强制删除）" - -#~ msgid "show commits where no parent comes before its children" -#~ msgstr "显示提交时以时间为序且父提交不能领先子提交" - -#~ msgid "show the HEAD reference" -#~ msgstr "显示 HEAD 引用" - -#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'" -#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" - -#~ msgid "Change flags" -#~ msgstr "修改参数" - -#~ msgid "" -#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean." -#~ msgstr "注意：没有要清理的文件；尝试按 \"t\" 切换 git-clean 的选项。" - -#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'" -#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'" - -#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" -#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]" - -#~ msgid "See 'git help <command>' for more information on a specific command." -#~ msgstr "参见 'git help <命令>' 以获得该特定命令的详细信息。" - -#~ msgid "BUG: impossible combination of %d and %p" -#~ msgstr "BUG: 无法组合 %d 和 %p" - -# 译者：以下三条实际为一个段落 -#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'" -#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'" - -# 译者：为对齐，下面两句内容有调整 -#~ msgid "may speed it up, but you have to be careful not to forget to add" -#~ msgstr "也许能提高速度，但您需要小心不要忘了添加新文件" - -#~ msgid "new files yourself (see 'git help status')." -#~ msgstr "（参见 'git help status'）。" - -#~ msgid "use any ref in .git/refs" -#~ msgstr "使用 .git/refs 里的任意引用" - -#~ msgid "use any tag in .git/refs/tags" -#~ msgstr "使用 .git/refs/tags 里的任意 tag" - -#~ msgid "bad object %s" -#~ msgstr "坏对象 %s" - -#~ msgid "bogus committer info %s" -#~ msgstr "虚假的提交者信息 %s" - -#~ msgid "can't fdopen 'show' output fd" -#~ msgstr "不能打开 'show' 输出文件句柄" - -#~ msgid "failed to close pipe to 'show' for object '%s'" -#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道" - -#~ msgid " 0 files changed" -#~ msgstr " 0 个文件被修改" - -#~ msgid " %d file changed" -#~ msgid_plural " %d files changed" -#~ msgstr[0] " %d 个文件被修改" -#~ msgstr[1] " %d 个文件被修改" - -#~ msgid ", %d insertion(+)" -#~ msgid_plural ", %d insertions(+)" -#~ msgstr[0] "，插入 %d 行(+)" -#~ msgstr[1] "，插入 %d 行(+)" - -#~ msgid ", %d deletion(-)" -#~ msgid_plural ", %d deletions(-)" -#~ msgstr[0] "，删除 %d 行(-)" -#~ msgstr[1] "，删除 %d 行(-)" - -#~ msgid "You do not have a valid HEAD" -#~ msgstr "您没有一个有效的 HEAD" - -#~ msgid "oops" -#~ msgstr "哎哟" - -#~ msgid "Would not remove %s\n" -#~ msgstr "不会删除 %s\n" - -#~ msgid "Not removing %s\n" -#~ msgstr "未删除 %s\n" - -#~ msgid "git remote set-head <name> (-a | -d | <branch>])" -#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])" - -#~ msgid "Could not read index" -#~ msgstr "不能读取索引" - -# 译者：中文字符串拼接，可删除前导空格 -#~ msgid " (use \"git add\" to track)" -#~ msgstr "（使用 \"git add\" 建立跟踪）" - -#~ msgid "--detach cannot be used with -b/-B/--orphan" -#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用" - -#~ msgid "--detach cannot be used with -t" -#~ msgstr "--detach 不能和 -t 同时使用" - -#~ msgid "--orphan and -b|-B are mutually exclusive" -#~ msgstr "--orphan 和 -b|-B 互斥" - -#~ msgid "--orphan cannot be used with -t" -#~ msgstr "--orphan 不能和 -t 同时使用" - -#~ msgid "git checkout: -f and -m are incompatible" -#~ msgstr "git checkout：-f 和 -m 不兼容" - -#~ msgid "" -#~ "git checkout: updating paths is incompatible with switching branches." -#~ msgstr "git checkout：更新路径和切换分支不兼容。" - -#~ msgid "diff setup failed" -#~ msgstr "diff 设置失败" - -#~ msgid "merge-recursive: disk full?" -#~ msgstr "merge-recursive：磁盘已满？" - -#~ msgid "diff_setup_done failed" -#~ msgstr "diff_setup_done 失败" |