diff options
| -rw-r--r-- | po/README.md | 395 | ||||
| -rw-r--r-- | po/TEAMS | 6 | ||||
| -rw-r--r-- | po/de.po | 1023 | ||||
| -rw-r--r-- | po/es.po | 7806 | ||||
| -rw-r--r-- | po/sv.po | 1038 | ||||
| -rw-r--r-- | po/tr.po | 1052 | ||||
| -rw-r--r-- | po/zh_CN.po | 4553 | ||||
| -rw-r--r-- | po/zh_TW.po | 5091 |
8 files changed, 10146 insertions, 10818 deletions
diff --git a/po/README.md b/po/README.md index a7e6f2014c..dcd8436c25 100644 --- a/po/README.md +++ b/po/README.md @@ -1,5 +1,4 @@ -Core GIT Translations -===================== +# Core GIT Translations This directory holds the translations for the core of Git. This document describes how you can contribute to the effort of enhancing the language @@ -8,14 +7,14 @@ coverage and maintaining the translation. The localization (l10n) coordinator, Jiang Xin <worldhello.net@gmail.com>, coordinates our localization effort in the l10 coordinator repository: - https://github.com/git-l10n/git-po/ + https://github.com/git-l10n/git-po/ -The two character language translation codes are defined by ISO_639-1, as +The two character language translation codes are defined by ISO\_639-1, as stated in the gettext(1) full manual, appendix A.1, Usual Language Codes. -Contributing to an existing translation ---------------------------------------- +## Contributing to an existing translation + As a contributor for a language XX, you should first check TEAMS file in this directory to see whether a dedicated repository for your language XX exists. Fork the dedicated repository and start to work if it exists. @@ -28,10 +27,10 @@ For this case, wrong translations should be reported and fixed through their workflows. -Creating a new language translation ------------------------------------ +## Creating a new language translation + If you are the first contributor for the language XX, please fork this -repository, prepare and/or update the translated message file po/XX.po +repository, prepare and/or update the translated message file "po/XX.po" (described later), and ask the l10n coordinator to pull your work. If there are multiple contributors for the same language, please first @@ -40,8 +39,8 @@ language, so that the l10n coordinator only needs to interact with one person per language. -Core translation ----------------- +## Core translation + The core translation is the smallest set of work that must be completed for a new language translation. Because there are more than 5000 messages in the template message file "po/git.pot" that need to be translated, @@ -51,21 +50,25 @@ The core template message file which contains a small set of messages will be generated in "po-core/core.pot" automatically by running a helper program named "git-po-helper" (described later). - git-po-helper init --core XX.po +```shell +git-po-helper init --core XX.po +``` After translating the generated "po-core/XX.po", you can merge it to "po/XX.po" using the following commands: - msgcat po-core/XX.po po/XX.po -s -o /tmp/XX.po - mv /tmp/XX.po po/XX.po - git-po-helper update XX.po +```shell +msgcat po-core/XX.po po/XX.po -s -o /tmp/XX.po +mv /tmp/XX.po po/XX.po +git-po-helper update XX.po +``` Edit "po/XX.po" by hand to fix "fuzzy" messages, which may have misplaced translated messages and duplicate messages. -Translation Process Flow ------------------------- +## Translation Process Flow + The overall data-flow looks like this: +-------------------+ +------------------+ @@ -79,21 +82,20 @@ The overall data-flow looks like this: | Language Team XX | +------------------+ - * Translatable strings are marked in the source file. - * L10n coordinator pulls from the source (1) - * L10n coordinator updates the message template po/git.pot - * Language team pulls from L10n coordinator (2) - * Language team updates the message file po/XX.po - * L10n coordinator pulls from Language team (3) - * L10n coordinator asks the result to be pulled (4). +- Translatable strings are marked in the source file. +- L10n coordinator pulls from the source (1) +- L10n coordinator updates the message template "po/git.pot" +- Language team pulls from L10n coordinator (2) +- Language team updates the message file "po/XX.po" +- L10n coordinator pulls from Language team (3) +- L10n coordinator asks the result to be pulled (4). -Maintaining the po/git.pot file -------------------------------- +## Maintaining the "po/git.pot" file (This is done by the l10n coordinator). -The po/git.pot file contains a message catalog extracted from Git's +The "po/git.pot" file contains a message catalog extracted from Git's sources. The l10n coordinator maintains it by adding new translations with msginit(1), or update existing ones with msgmerge(1). In order to update the Git sources to extract the messages from, the l10n coordinator is @@ -105,62 +107,68 @@ Language contributors use this file to prepare translations for their language, but they are not expected to modify it. -Initializing a XX.po file -------------------------- +## Initializing a "XX.po" file (This is done by the language teams). -If your language XX does not have translated message file po/XX.po yet, +If your language XX does not have translated message file "po/XX.po" yet, you add a translation for the first time by running: - msginit --locale=XX +```shell +msginit --locale=XX +``` -in the po/ directory, where XX is the locale, e.g. "de", "is", "pt_BR", -"zh_CN", etc. +in the "po/" directory, where XX is the locale, e.g. "de", "is", "pt\_BR", +"zh\_CN", etc. -Then edit the automatically generated copyright info in your new XX.po +Then edit the automatically generated copyright info in your new "XX.po" to be correct, e.g. for Icelandic: - @@ -1,6 +1,6 @@ - -# Icelandic translations for PACKAGE package. - -# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER - -# This file is distributed under the same license as the PACKAGE package. - +# Icelandic translations for Git. - +# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com> - +# This file is distributed under the same license as the Git package. - # Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010. +```diff +@@ -1,6 +1,6 @@ +-# Icelandic translations for PACKAGE package. +-# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. ++# Icelandic translations for Git. ++# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com> ++# This file is distributed under the same license as the Git package. + # Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010. +``` And change references to PACKAGE VERSION in the PO Header Entry to just "Git": - perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po +```shell +perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po +``` Once you are done testing the translation (see below), commit the result and ask the l10n coordinator to pull from you. -Updating a XX.po file ---------------------- +## Updating a "XX.po" file (This is done by the language teams). -If you are replacing translation strings in an existing XX.po file to +If you are replacing translation strings in an existing "XX.po" file to improve the translation, just edit the file. -If there's an existing XX.po file for your language, but the repository -of the l10n coordinator has newer po/git.pot file, you would need to first +If there's an existing "XX.po" file for your language, but the repository +of the l10n coordinator has newer "po/git.pot" file, you would need to first pull from the l10n coordinator (see the beginning of this document for its URL), and then update the existing translation by running: - msgmerge --add-location --backup=off -U XX.po git.pot +```shell +msgmerge --add-location --backup=off -U XX.po git.pot +``` -in the po/ directory, where XX.po is the file you want to update. +in the "po/" directory, where "XX.po" is the file you want to update. Once you are done testing the translation (see below), commit the result and ask the l10n coordinator to pull from you. -Fuzzy translation ------------------ + +## Fuzzy translation Fuzzy translation is a translation marked by comment "fuzzy" to let you know that the translation is out of date because the "msgid" has been @@ -172,14 +180,15 @@ After fixing the corresponding translation, you must remove the "fuzzy" tag in the comment. -Testing your changes --------------------- +## Testing your changes -(This is done by the language teams, after creating or updating XX.po file). +(This is done by the language teams, after creating or updating "XX.po" file). Before you submit your changes go back to the top-level and do: - make +```shell +make +``` On systems with GNU gettext (i.e. not Solaris) this will compile your changed PO file with `msgfmt --check`, the --check option flags many @@ -188,8 +197,7 @@ messages that deviate from the originals in whether they begin/end with a newline or not. -Marking strings for translation -------------------------------- +## Marking strings for translation (This is done by the core developers). @@ -202,132 +210,155 @@ gettext library, so most of the advice in your gettext documentation General advice: - - Don't mark everything for translation, only strings which will be - read by humans (the porcelain interface) should be translated. +- Don't mark everything for translation, only strings which will be + read by humans (the porcelain interface) should be translated. - The output from Git's plumbing utilities will primarily be read by - programs and would break scripts under non-C locales if it was - translated. Plumbing strings should not be translated, since - they're part of Git's API. + The output from Git's plumbing utilities will primarily be read by + programs and would break scripts under non-C locales if it was + translated. Plumbing strings should not be translated, since + they're part of Git's API. - - Adjust the strings so that they're easy to translate. Most of the - advice in `info '(gettext)Preparing Strings'` applies here. +- Adjust the strings so that they're easy to translate. Most of the + advice in `info '(gettext)Preparing Strings'` applies here. - - If something is unclear or ambiguous you can use a "TRANSLATORS" - comment to tell the translators what to make of it. These will be - extracted by xgettext(1) and put in the po/*.po files, e.g. from - git-am.sh: +- If something is unclear or ambiguous you can use a "TRANSLATORS" + comment to tell the translators what to make of it. These will be + extracted by xgettext(1) and put in the "po/\*.po" files, e.g. from + git-am.sh: - # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] - # in your translation. The program will only accept English - # input at this point. - gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " + ```shell + # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] + # in your translation. The program will only accept English + # input at this point. + gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " + ``` - Or in C, from builtin/revert.c: + Or in C, from builtin/revert.c: - /* TRANSLATORS: %s will be "revert" or "cherry-pick" */ - die(_("%s: Unable to write new index file"), action_name(opts)); + ```c + /* TRANSLATORS: %s will be "revert" or "cherry-pick" */ + die(_("%s: Unable to write new index file"), action_name(opts)); + ``` We provide wrappers for C, Shell and Perl programs. Here's how they're used: -C: - - Include builtin.h at the top, it'll pull in gettext.h, which - defines the gettext interface. Consult with the list if you need to - use gettext.h directly. +### C + +Include builtin.h at the top, it'll pull in gettext.h, which +defines the gettext interface. Consult with the list if you need to +use gettext.h directly. + +The C interface is a subset of the normal GNU gettext +interface. We currently export these functions: + +- \_() - - The C interface is a subset of the normal GNU gettext - interface. We currently export these functions: + Mark and translate a string. E.g.: - - _() + ```c + printf(_("HEAD is now at %s"), hex); + ``` - Mark and translate a string. E.g.: +- Q\_() - printf(_("HEAD is now at %s"), hex); + Mark and translate a plural string. E.g.: - - Q_() + ```c + printf(Q_("%d commit", "%d commits", number_of_commits)); + ``` - Mark and translate a plural string. E.g.: + This is just a wrapper for the ngettext() function. - printf(Q_("%d commit", "%d commits", number_of_commits)); +- N\_() - This is just a wrapper for the ngettext() function. + A no-op pass-through macro for marking strings inside static + initializations, e.g.: - - N_() + ```c + static const char *reset_type_names[] = { + N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL + }; + ``` - A no-op pass-through macro for marking strings inside static - initializations, e.g.: + And then, later: - static const char *reset_type_names[] = { - N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL - }; + ```c + die(_("%s reset is not allowed in a bare repository"), + _(reset_type_names[reset_type])); + ``` - And then, later: + Here `_()` couldn't have statically determined what the translation + string will be, but since it was already marked for translation + with `N_()` the look-up in the message catalog will succeed. - die(_("%s reset is not allowed in a bare repository"), - _(reset_type_names[reset_type])); - Here _() couldn't have statically determined what the translation - string will be, but since it was already marked for translation - with N_() the look-up in the message catalog will succeed. +### Shell -Shell: +The Git gettext shell interface is just a wrapper for +gettext.sh. Import it right after git-sh-setup like this: - - The Git gettext shell interface is just a wrapper for - gettext.sh. Import it right after git-sh-setup like this: +```shell +. git-sh-setup +. git-sh-i18n +``` - . git-sh-setup - . git-sh-i18n +And then use the `gettext` or `eval_gettext` functions: - And then use the gettext or eval_gettext functions: +```shell +# For constant interface messages: +gettext "A message for the user"; echo - # For constant interface messages: - gettext "A message for the user"; echo +# To interpolate variables: +details="oh noes" +eval_gettext "An error occurred: \$details"; echo +``` - # To interpolate variables: - details="oh noes" - eval_gettext "An error occurred: \$details"; echo +In addition we have wrappers for messages that end with a trailing +newline. I.e. you could write the above as: - In addition we have wrappers for messages that end with a trailing - newline. I.e. you could write the above as: +```shell +# For constant interface messages: +gettextln "A message for the user" - # For constant interface messages: - gettextln "A message for the user" +# To interpolate variables: +details="oh noes" +eval_gettextln "An error occurred: \$details" +``` - # To interpolate variables: - details="oh noes" - eval_gettextln "An error occurred: \$details" +More documentation about the interface is available in the GNU info +page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell +command to be translated) for examples is also useful: - More documentation about the interface is available in the GNU info - page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell - command to be translated) for examples is also useful: +```shell +git log --reverse -p --grep=i18n git-am.sh +``` - git log --reverse -p --grep=i18n git-am.sh -Perl: +### Perl - - The Git::I18N module provides a limited subset of the - Locale::Messages functionality, e.g.: +The Git::I18N module provides a limited subset of the +Locale::Messages functionality, e.g.: - use Git::I18N; - print __("Welcome to Git!\n"); - printf __("The following error occurred: %s\n"), $error; +```perl +use Git::I18N; +print __("Welcome to Git!\n"); +printf __("The following error occurred: %s\n"), $error; +``` - Run `perldoc perl/Git/I18N.pm` for more info. +Run `perldoc perl/Git/I18N.pm` for more info. -Testing marked strings ----------------------- +## Testing marked strings -Git's tests are run under LANG=C LC_ALL=C. So the tests do not need be +Git's tests are run under `LANG=C LC_ALL=C`. So the tests do not need be changed to account for translations as they're added. -PO helper ---------- +## PO helper -To make the maintenance of XX.po easier, the l10n coordinator and l10n +To make the maintenance of "XX.po" easier, the l10n coordinator and l10n team leaders can use a helper program named "git-po-helper". It is a wrapper to gettext suite, specifically written for the purpose of Git l10n workflow. @@ -337,64 +368,84 @@ To build and install the helper program from source, see Usage for git-po-helper: - - To start a new language translation: +- To start a new language translation: - git-po-helper init XX.po + ```shell + git-po-helper init XX.po + ``` - - To update your XX.po file: +- To update your "XX.po" file: - git-po-helper update XX.po + ```shell + git-po-helper update XX.po + ``` - - To check commit log and syntax of XX.po: +- To check commit log and syntax of "XX.po": - git-po-helper check-po XX.po - git-po-helper check-commits + ```shell + git-po-helper check-po XX.po + git-po-helper check-commits + ``` Run "git-po-helper" without arguments to show usage. -Conventions ------------ +## Conventions There are some conventions that l10n contributors must follow: -1. The subject of each l10n commit should be prefixed with "l10n: ". -2. Do not use non-ASCII characters in the subject of a commit. -3. The length of commit subject (first line of the commit log) should - be less than 50 characters, and the length of other lines of the - commit log should be no more than 72 characters. -4. Add "Signed-off-by" trailer to your commit log, like other commits - in Git. You can automatically add the trailer by committing with - the following command: +- The subject of each l10n commit should be prefixed with "l10n: ". - git commit -s +- Do not use non-ASCII characters in the subject of a commit. -5. Check syntax with "msgfmt" or the following command before creating - your commit: +- The length of commit subject (first line of the commit log) should + be less than 50 characters, and the length of other lines of the + commit log should be no more than 72 characters. - git-po-helper check-po <XX.po> +- Add "Signed-off-by" trailer to your commit log, like other commits + in Git. You can automatically add the trailer by committing with + the following command: + + ```shell + git commit -s + ``` + +- Check syntax with "msgfmt" or the following command before creating + your commit: + + ```shell + git-po-helper check-po <XX.po> + ``` + +- Squash trivial commits to make history clear. + +- DO NOT edit files outside "po/" directory. + +- Other subsystems ("git-gui", "gitk", and Git itself) have their + own workflow. See [Documentation/SubmittingPatches][] for + instructions on how to contribute patches to these subsystems. -6. Squash trivial commits to make history clear. -7. DO NOT edit files outside "po/" directory. -8. Other subsystems ("git-gui", "gitk", and Git itself) have their - own workflow. See [Documentation/SubmittingPatches][] for - instructions on how to contribute patches to these subsystems. To contribute for a new l10n language, contributor should follow additional conventions: -1. Initialize proper filename of the "XX.po" file conforming to - iso-639 and iso-3166. -2. Must complete a minimal translation based on the "po-core/core.pot" - template. Using the following command to initialize the minimal - "po-core/XX.po" file: +- Initialize proper filename of the "XX.po" file conforming to + iso-639 and iso-3166. + +- Must complete a minimal translation based on the "po-core/core.pot" + template. Using the following command to initialize the minimal + "po-core/XX.po" file: - git-po-helper init --core <your-language> + ```shell + git-po-helper init --core <your-language> + ``` -3. Add a new entry in the "po/TEAMS" file with proper format, and check - the syntax of "po/TEAMS" by running the following command: +- Add a new entry in the "po/TEAMS" file with proper format, and check + the syntax of "po/TEAMS" by running the following command: - git-po-helper team --check + ```shell + git-po-helper team --check + ``` [git-po-helper/README]: https://github.com/git-l10n/git-po-helper#readme @@ -73,11 +73,11 @@ Leader: Trần Ngọc Quân <vnwildman AT gmail.com> Members: Nguyễn Thái Ngọc Duy <pclouds AT gmail.com> Language: zh_CN (Simplified Chinese) -Repository: https://github.com/jiangxin/git/ -Leader: Jiang Xin <worldhello.net AT gmail.com> +Repository: https://github.com/fangyi-zhou/git/ +Leader: Fangyi Zhou <me AT fangyi.io> Members: Ray Chen <oldsharp AT gmail.com> 依云 <lilydjwg AT gmail.com> - Fangyi Zhou <me AT fangyi.io> + Jiang Xin <worldhello.net AT gmail.com> Language: zh_TW (Traditional Chinese) Repository: https://github.com/l10n-tw/git-po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-08-03 17:06+0800\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" "PO-Revision-Date: 2021-05-23 18:32+0200\n" "Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n" "Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n" @@ -24,7 +24,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "Wie bitte (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" @@ -54,7 +54,7 @@ msgstr "Aktualisieren" msgid "could not stage '%s'" msgstr "Konnte '%s' nicht zum Commit vormerken." -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "konnte Index nicht schreiben" @@ -213,9 +213,10 @@ msgstr "aus Staging-Area entfernt" #: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 #: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "Pfad" @@ -819,7 +820,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Beende wegen unaufgelöstem Konflikt." -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." @@ -1612,7 +1613,7 @@ msgstr "Kann %s nicht lesen." #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 #: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 -#: builtin/merge.c:1143 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" @@ -1701,7 +1702,8 @@ msgid "list supported archive formats" msgstr "unterstützte Archivformate auflisten" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "Repository" @@ -1899,7 +1901,7 @@ msgstr "" "endgültigen\n" "Commits" -#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 #: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 #: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 #: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 @@ -3173,7 +3175,7 @@ msgstr "unerwartete Filterart" msgid "path name too long for external filter" msgstr "Pfadname zu lang für externen Filter" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3182,16 +3184,16 @@ msgstr "" "externer Filter '%s' nicht mehr verfügbar, obwohl nicht alle Pfade gefiltert " "wurden" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: clean-Filter '%s' fehlgeschlagen" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: smudge-Filter '%s' fehlgeschlagen" @@ -3429,10 +3431,10 @@ msgstr "" #: diff.c:4643 msgid "" -"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " "with -G and -S" msgstr "" -"---pickaxe-all und --find-object schließen sich gegenseitig aus. Benutzen\n" +"--pickaxe-all und --find-object schließen sich gegenseitig aus. Benutzen\n" "Sie --pickaxe-all mit -G und -S." #: diff.c:4722 @@ -4010,7 +4012,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'" -#: diffcore-rename.c:1510 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" @@ -4029,53 +4031,53 @@ msgstr "Pfadspezifikation '%s' stimmt mit keinen Git bekannten Dateien überein" msgid "unrecognized pattern: '%s'" msgstr "unbekanntes Muster: '%s'" -#: dir.c:792 dir.c:806 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "unbekanntes verneinendes Muster: '%s'" -#: dir.c:824 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" "Ihre Datei für den partiellen Checkout hat eventuell Probleme:\n" "Muster '%s' wiederholt sich." -#: dir.c:834 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "deaktiviere Cone-Muster-Übereinstimmung" -#: dir.c:1221 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "kann %s nicht als exclude-Filter benutzen" -#: dir.c:2358 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "konnte Verzeichnis '%s' nicht öffnen" -#: dir.c:2660 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:2784 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "" "Cache für unversionierte Dateien ist auf diesem System oder\n" "für dieses Verzeichnis deaktiviert" -#: dir.c:3617 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "Index-Datei in Repository %s beschädigt" -#: dir.c:3664 dir.c:3669 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "Konnte Verzeichnisse für '%s' nicht erstellen" -#: dir.c:3698 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren" @@ -4099,7 +4101,7 @@ msgstr "konnte Datei '%s' nicht lesen" msgid "bad git namespace path \"%s\"" msgstr "ungültiger Git-Namespace-Pfad \"%s\"" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "konnte GIT_DIR nicht zu '%s' setzen" @@ -4740,32 +4742,32 @@ msgstr "angeführtes CRLF entdeckt" msgid "bad action '%s' for '%s'" msgstr "ungültige Aktion '%s' für '%s'" -#: merge-ort.c:1228 merge-recursive.c:1206 +#: merge-ort.c:1569 merge-recursive.c:1201 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)." -#: merge-ort.c:1237 merge-recursive.c:1213 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." -#: merge-ort.c:1246 merge-recursive.c:1220 +#: merge-ort.c:1587 merge-recursive.c:1215 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)" -#: merge-ort.c:1256 merge-ort.c:1263 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Hinweis: Spule Submodul %s vor zu %s" -#: merge-ort.c:1284 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "Fehler beim Zusammenführen von Submodul %s" -#: merge-ort.c:1291 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4775,7 +4777,7 @@ msgstr "" "Auflösung des Merges vorhanden:\n" "%s\n" -#: merge-ort.c:1295 merge-recursive.c:1274 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4792,7 +4794,7 @@ msgstr "" "\n" "hinzu, um diesen Vorschlag zu akzeptieren.\n" -#: merge-ort.c:1308 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4802,21 +4804,21 @@ msgstr "" "sind vorhanden:\n" "%s" -#: merge-ort.c:1527 merge-recursive.c:1363 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung des internen Merges" -#: merge-ort.c:1532 merge-recursive.c:1368 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-ort.c:1539 merge-recursive.c:1401 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-ort.c:1678 merge-recursive.c:2123 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4827,7 +4829,7 @@ msgstr "" "Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n" "Pfade dahin zu setzen: %s." -#: merge-ort.c:1688 merge-recursive.c:2133 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4838,7 +4840,7 @@ msgstr "" "%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n" "zu setzen: %s" -#: merge-ort.c:1746 +#: merge-ort.c:2087 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4849,7 +4851,7 @@ msgstr "" "ist; es wurde zu mehreren anderen Verzeichnissen umbenannt, ohne dass ein " "Ziel die Mehrheit der Dateien erhält." -#: merge-ort.c:1900 merge-recursive.c:2469 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4858,7 +4860,7 @@ msgstr "" "WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt " "wurde." -#: merge-ort.c:2044 merge-recursive.c:3252 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4867,7 +4869,7 @@ msgstr "" "Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das " "umbenannt wurde in %s; Verschiebe es nach %s." -#: merge-ort.c:2051 merge-recursive.c:3259 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4876,7 +4878,7 @@ msgstr "" "Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines " "Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s." -#: merge-ort.c:2064 merge-recursive.c:3255 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4885,7 +4887,7 @@ msgstr "" "KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, " "das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden." -#: merge-ort.c:2072 merge-recursive.c:3262 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4895,13 +4897,13 @@ msgstr "" "Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s " "verschoben werden." -#: merge-ort.c:2228 +#: merge-ort.c:2569 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "KONFLIKT (umbenennen/umbenennen): %s zu %s in %s umbenannt und zu %s in %s." -#: merge-ort.c:2323 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4912,23 +4914,23 @@ msgstr "" "Inhaltskonflikte UND kollidiert mit einem anderen Pfad; dies kann zu " "verschachtelten Konfliktmarkierungen führen." -#: merge-ort.c:2342 merge-ort.c:2366 +#: merge-ort.c:2683 merge-ort.c:2707 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "KONFLIKT (umbenennen/löschen): %s zu %s in %s umbenannt, aber in %s gelöscht." -#: merge-ort.c:2819 merge-recursive.c:3013 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-ort.c:2822 merge-recursive.c:3016 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-ort.c:3250 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4937,7 +4939,7 @@ msgstr "" "KONFLIKT (Datei/Verzeichnis): Verzeichnis im Weg von %s aus %s; stattdessen " "nach %s verschieben." -#: merge-ort.c:3326 +#: merge-ort.c:3689 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -4947,7 +4949,7 @@ msgstr "" "Seite; beide wurden umbenannt, damit jeder irgendwo aufgezeichnet werden " "kann." -#: merge-ort.c:3333 +#: merge-ort.c:3696 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -4957,24 +4959,24 @@ msgstr "" "Seite; eines der beiden wurde umbenannt, damit jeder irgendwo aufgezeichnet " "werden kann." -#: merge-ort.c:3433 merge-recursive.c:3092 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "Inhalt" -#: merge-ort.c:3435 merge-recursive.c:3096 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-ort.c:3437 merge-recursive.c:3141 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "Submodul" -#: merge-ort.c:3439 merge-recursive.c:3142 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-ort.c:3470 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4983,7 +4985,7 @@ msgstr "" "KONFLIKT (ändern/löschen): %s gelöscht in %s und geändert in %s. Stand %s " "von %s wurde im Arbeitsbereich gelassen." -#: merge-ort.c:3757 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4995,13 +4997,13 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4116 +#: merge-ort.c:4487 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" "Sammeln von Merge-Informationen für die Referenzen %s, %s, %s fehlgeschlagen" -#: merge-ort-wrappers.c:13 merge-recursive.c:3707 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -5011,109 +5013,109 @@ msgstr "" "überschrieben werden:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "Bereits aktuell." -#: merge-recursive.c:357 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "(ungültiger Commit)\n" -#: merge-recursive.c:380 +#: merge-recursive.c:375 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen." -#: merge-recursive.c:389 +#: merge-recursive.c:384 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo zur Aktualisierung für Pfad '%s' fehlgeschlagen;\n" "Merge wird abgebrochen." -#: merge-recursive.c:877 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:888 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n" -#: merge-recursive.c:902 merge-recursive.c:921 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:911 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden" -#: merge-recursive.c:952 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:957 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:982 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "Fehler beim Öffnen von '%s': %s" -#: merge-recursive.c:993 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s" -#: merge-recursive.c:998 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" -#: merge-recursive.c:1228 merge-recursive.c:1240 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Spule Submodul %s zu dem folgenden Commit vor:" -#: merge-recursive.c:1231 merge-recursive.c:1243 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Spule Submodul %s vor" -#: merge-recursive.c:1266 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht " "gefunden)" -#: merge-recursive.c:1270 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)" -#: merge-recursive.c:1271 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n" -#: merge-recursive.c:1283 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)" -#: merge-recursive.c:1425 +#: merge-recursive.c:1420 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n" "schreibe stattdessen nach %s." -#: merge-recursive.c:1497 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5122,7 +5124,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich gelassen." -#: merge-recursive.c:1502 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5131,7 +5133,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich gelassen." -#: merge-recursive.c:1509 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5140,7 +5142,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1514 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5149,46 +5151,46 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1549 +#: merge-recursive.c:1544 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1549 +#: merge-recursive.c:1544 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Verweigere geänderte Datei bei %s zu verlieren." -#: merge-recursive.c:1610 +#: merge-recursive.c:1605 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg " "ist." -#: merge-recursive.c:1668 +#: merge-recursive.c:1663 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " "%s" -#: merge-recursive.c:1699 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" -#: merge-recursive.c:1704 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s " "hinzu" -#: merge-recursive.c:1731 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5197,18 +5199,18 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1736 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1823 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " "in %s" -#: merge-recursive.c:2091 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5221,7 +5223,7 @@ msgstr "" "wobei\n" "keines dieser Ziele die Mehrheit der Dateien erhielt." -#: merge-recursive.c:2225 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5230,80 +5232,80 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n" "Benenne Verzeichnis um %s->%s in %s" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modify" msgstr "ändern" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modified" msgstr "geändert" -#: merge-recursive.c:3119 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:3172 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:3376 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:3399 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:3404 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:3411 +#: merge-recursive.c:3406 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " "hinzu." -#: merge-recursive.c:3420 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:3429 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s" -#: merge-recursive.c:3482 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:3576 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:3589 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden" msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden" -#: merge-recursive.c:3639 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:3804 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." @@ -5313,7 +5315,7 @@ msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" #: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." @@ -5395,8 +5397,8 @@ msgstr "kann Reverse-Index-Datei nicht speichern" #: midx.c:920 msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "ignoriere existierenden multi-pack-index; Prüfsumme stimmt nicht " -"überein" +msgstr "" +"ignoriere existierenden multi-pack-index; Prüfsumme stimmt nicht überein" #: midx.c:943 msgid "Adding packfiles to multi-pack-index" @@ -6472,10 +6474,10 @@ msgstr "Ungeordnete Stage-Einträge für '%s'." #: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 #: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:331 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "Index-Datei beschädigt" @@ -6529,36 +6531,36 @@ msgstr "Konnte geteilten Index '%s' nicht aktualisieren." msgid "broken index, expect %s in %s, got %s" msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s." -#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schließen." -#: read-cache.c:3074 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "Konvertierung zu einem Sparse-Index fehlgeschlagen" -#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:3158 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "konnte Git-Verzeichnis nicht öffnen: %s" -#: read-cache.c:3170 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "Konnte '%s' nicht entfernen." -#: read-cache.c:3199 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." -#: read-cache.c:3348 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: Kann nicht auf Stufe #0 wechseln." @@ -6975,17 +6977,17 @@ msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s" msgid "ignoring broken ref %s" msgstr "Ignoriere fehlerhafte Referenz %s" -#: ref-filter.c:2498 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "Format: %%(end) Atom fehlt" -#: ref-filter.c:2592 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "missgebildeter Objektname %s" -#: ref-filter.c:2597 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "die Option `%s' muss auf einen Commit zeigen" @@ -7458,7 +7460,7 @@ msgid "Recorded preimage for '%s'" msgstr "Preimage für '%s' aufgezeichnet." #: rerere.c:865 submodule.c:2076 builtin/log.c:2002 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." @@ -7496,7 +7498,7 @@ msgstr "Konnte rr-cache Verzeichnis nicht öffnen." msgid "could not determine HEAD revision" msgstr "Konnte HEAD-Commit nicht bestimmen." -#: reset.c:70 reset.c:76 sequencer.c:3689 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." @@ -7708,7 +7710,7 @@ msgid "unable to dequote value of '%s'" msgstr "Konnte Anführungszeichen von '%s' nicht entfernen." #: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 -#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." @@ -7860,7 +7862,7 @@ msgstr "Konnte HEAD nicht parsen." msgid "HEAD %s is not a commit!" msgstr "HEAD %s ist kein Commit!" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." @@ -7868,7 +7870,7 @@ msgstr "Konnte Commit von HEAD nicht analysieren." msgid "unable to parse commit author" msgstr "Konnte Commit-Autor nicht parsen." -#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" @@ -7886,8 +7888,8 @@ msgstr "ungültige Autor-Identität '%s'" msgid "corrupt author: missing date information" msgstr "unbrauchbarer Autor: Datumsinformationen fehlen" -#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." @@ -8687,11 +8689,11 @@ msgstr "setsid fehlgeschlagen" msgid "attempting to use sparse-index without cone mode" msgstr "versuche partiellen Index ohne Cone-Modus zu benutzen" -#: sparse-index.c:174 +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" msgstr "konnte Cache-Verzeichnis nicht aktualisieren, bleibt voll" -#: sparse-index.c:261 +#: sparse-index.c:263 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "Index-Eintrag ist ein Verzeichnis, aber nicht partiell (%08x)" @@ -8848,7 +8850,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "Prozess für Submodul '%s' fehlgeschlagen" -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." @@ -9614,7 +9616,7 @@ msgstr "" msgid "Updating index flags" msgstr "Aktualisiere Index-Markierungen" -#: unpack-trees.c:2707 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" @@ -10445,7 +10447,7 @@ msgstr "Probelauf" msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" @@ -10585,12 +10587,12 @@ msgstr "" msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein" -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 #: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file ist inkompatibel mit Pfadspezifikation-Argumenten" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 #: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul benötigt --pathspec-from-file" @@ -11423,7 +11425,7 @@ msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)" msgid "show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 #: builtin/push.c:566 builtin/send-pack.c:198 @@ -12243,7 +12245,7 @@ msgstr "Dateinamen von der Standard-Eingabe lesen" msgid "terminate input and output records by a NUL character" msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 #: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -12302,9 +12304,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<Optionen>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1824 -#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 -#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 #: builtin/worktree.c:728 msgid "string" msgstr "Zeichenkette" @@ -12402,69 +12405,69 @@ msgstr "Pfad '%s': kann nicht zusammenführen" msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen." -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d Merge-Konflikt wieder erstellt" msgstr[1] "%d Merge-Konflikte wieder erstellt" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d Pfad von %s aktualisiert" msgstr[1] "%d Pfade von %s aktualisiert" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d Pfad vom Index aktualisiert" msgstr[1] "%d Pfade vom Index aktualisiert" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln" -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "Weder '%s' noch '%s' ist angegeben" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen." -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12473,50 +12476,50 @@ msgstr "" "Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12539,7 +12542,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12566,19 +12569,19 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch nicht geboren ist" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12588,7 +12591,7 @@ msgstr "" "Bitte benutzen Sie -- (und optional --no-guess), um diese\n" "eindeutig voneinander zu unterscheiden." -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12611,51 +12614,51 @@ msgstr "" "bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n" "checkout.defaultRemote=origin in Ihrer Konfiguration setzen." -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "nur eine Referenz erwartet" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "Ein Branch wird erwartet, Tag '%s' bekommen" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "Ein Branch wird erwartet, '%s' bekommen" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "Ein Branch wird erwartet, Commit '%s' bekommen" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12663,7 +12666,7 @@ msgstr "" "Der Branch kann nicht während eines Merges gewechselt werden.\n" "Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12672,7 +12675,7 @@ msgstr "" "werden.\n" "Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12681,7 +12684,7 @@ msgstr "" "werden.\n" "Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12690,7 +12693,7 @@ msgstr "" "gewechselt werden.\n" "Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12699,140 +12702,140 @@ msgstr "" "werden.\n" "Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "Sie wechseln den Branch während einer binären Suche" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' kann nicht <Startpunkt> bekommen" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "Branch- oder Commit-Argument fehlt" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslösen" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "" "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis " "ausgecheckt wurde, deaktivieren" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c und --orphan schließen sich gegenseitig aus" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p und --overlay schließen sich gegenseitig aus" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track benötigt ein Branchname" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "kein Branchname; versuchen Sie -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "konnte %s nicht auflösen" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden." -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file und --detach sind inkompatibel" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file und --patch sind inkompatibel" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12840,70 +12843,71 @@ msgstr "" "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" "Sie aus dem Index auschecken." -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben." -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "benutze Overlay-Modus (Standard)" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "einen neuen Branch erzeugen und dahin wechseln" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "einen Branch erstellen/umsetzen und dahin wechseln" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "lokale Änderungen verwerfen" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" msgstr "Von welcher Commit-Referenz ausgecheckt werden soll" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "Index wiederherstellen" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "ignoriere nicht zusammengeführte Einträge" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "benutze Overlay-Modus" @@ -13133,13 +13137,13 @@ msgstr "Vorlagenverzeichnis" msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:123 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "--reference nur während des Klonens benutzen" @@ -13194,8 +13198,8 @@ msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n" "Ausschluss eines Commits vertiefen" -#: builtin/clone.c:137 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" @@ -14275,36 +14279,36 @@ msgstr "Aufzeichnung einer leeren Änderung erlauben" msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1747 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1754 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1775 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1782 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1787 +#: builtin/commit.c:1790 #, 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:1798 +#: builtin/commit.c:1801 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "Commit aufgrund leerer Commit-Beschreibung abgebrochen.\n" -#: builtin/commit.c:1834 +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -15711,15 +15715,15 @@ msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten" msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<Konfiguration> <Befehlsargumente>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "Konfiguration" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "Konfigurationsschlüssel für eine Liste von Repository-Pfaden" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "Option --config=<Konfiguration> fehlt" @@ -18117,38 +18121,38 @@ msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge " "abzuschließen.\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 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" @@ -18159,11 +18163,11 @@ msgstr "" "Upstream-Branch mit einem Thema-Branch zusammenführt.\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -18172,75 +18176,75 @@ msgstr "" "Zeilen, die mit '%c' beginnen, werden ignoriert,\n" "und eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen " "Sie dann das Ergebnis.\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert." -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "nichts was wir in %s zusammenführen können: %s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "nichts was wir zusammenführen können" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit erwartet keine Argumente" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue erwartet keine Argumente" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)." -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18248,7 +18252,7 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18256,91 +18260,91 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "Sie können --squash nicht mit --commit kombinieren." -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "Squash-Merge auf einen leeren Branch wird noch nicht unterstützt" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet " "werden." -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "verweigere den Merge von nicht zusammenhängenden Historien" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "Benutze die Strategie %s, um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -20578,8 +20582,7 @@ msgstr "versuchen, Rebase mit Merges auszuführen, statt diese zu überspringen" #: builtin/rebase.c:1411 msgid "use 'merge-base --fork-point' to refine upstream" -msgstr "" -"'merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen" +msgstr "'merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen" #: builtin/rebase.c:1413 msgid "use the given merge strategy" @@ -20748,7 +20751,7 @@ msgid "fatal: no such branch/commit '%s'" msgstr "fatal: Branch/Commit '%s' nicht gefunden" #: builtin/rebase.c:1929 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2414 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" @@ -22645,37 +22648,37 @@ msgstr "Verändern der Konfiguration für Sparse-Index fehlgeschlagen" msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "konnte Pfad '%s' nicht normalisieren" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "konnte Anführungszeichen von C-Style Zeichenkette '%s' nicht entfernen" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "Muster von der Standard-Eingabe lesen" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses." @@ -22964,7 +22967,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Vollständiger Referenzname erwartet, %s erhalten" @@ -22978,26 +22981,27 @@ msgstr "'submodule--helper print-default-remote' erwartet keine Argumente." msgid "cannot strip one component off url '%s'" msgstr "Kann eine Komponente von URL '%s' nicht extrahieren" -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "Alternativer Anker für relative Pfade" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "Betrete '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -23006,7 +23010,7 @@ msgstr "" "run_command gab nicht-Null Status für '%s' zurück.\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -23018,20 +23022,20 @@ msgstr "" "nicht-Null Status zurück.\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "Ausgaben beim Betreten eines Submodul-Befehls unterdrücken" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchführen" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -23040,155 +23044,155 @@ msgstr "" "Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n" "Repository sein eigenes verbindliches Upstream-Repository ist." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration." -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n" "Konfiguration." -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<Optionen>] [<Pfad>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen." -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul '%s'." -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "Ausgabe des Submodul-Status unterdrücken" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" "den Commit benutzen, der im Index gespeichert ist, statt den im Submodul HEAD" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <Pfad>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "Hash eines Objektes von '%s' konnte nicht erzeugt werden" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "unerwarteter Modus %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "" "benutze den Commit, der im Index gespeichert ist, statt vom Submodul HEAD" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1304 msgid "compare the commit in the index with that in the submodule HEAD" msgstr "den Commit aus dem Index mit dem im Submodul HEAD vergleichen" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "" "überspringe Submodule, wo der 'ignore_config' Wert auf 'all' gesetzt ist" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "Größe der Zusammenfassung begrenzen" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "konnte keinen Commit für HEAD holen" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached und --files schließen sich gegenseitig aus" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisiere Submodul-URL für '%s'\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -23198,7 +23202,7 @@ msgstr "" "(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n" "löschen möchten)" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -23207,49 +23211,49 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n" "verwenden Sie '-f', um diese zu verwerfen." -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "Verzeichnis '%s' bereinigt.\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen." -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1597 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "" "Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen " "vorliegen" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "alle Submodule austragen" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n" "möchten." -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1690 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -23262,46 +23266,69 @@ msgstr "" "submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n" "'--reference-if-able' statt '--reference'." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt." -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1800 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" +"Erstellung/Benutzung von '%s' in einem anderen Submodul-Git-Verzeichnis\n" +"verweigert." + +#: builtin/submodule--helper.c:1841 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen." + +#: builtin/submodule--helper.c:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "Verzeichnis ist nicht leer: '%s'" + +#: builtin/submodule--helper.c:1858 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." + +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "Pfad für neues Submodul" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "Name des neuen Submoduls" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "URL von der das Submodul geklont wird" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "Fortschrittsanzeige beim Klonen erzwingen" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "Klonen in ein nicht leeres Verzeichnis verbieten" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -23311,110 +23338,88 @@ msgstr "" "<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url " "<URL> --path <Pfad>" -#: builtin/submodule--helper.c:1873 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" -"Erstellung/Benutzung von '%s' in einem anderen Submodul-Git-Verzeichnis\n" -"verweigert." - -#: builtin/submodule--helper.c:1884 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen." - -#: builtin/submodule--helper.c:1888 -#, c-format -msgid "directory not empty: '%s'" -msgstr "Verzeichnis ist nicht leer: '%s'" - -#: builtin/submodule--helper.c:1900 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." - -#: builtin/submodule--helper.c:1936 +#: builtin/submodule--helper.c:1953 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s'." -#: builtin/submodule--helper.c:1940 +#: builtin/submodule--helper.c:1957 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert." -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Submodul-Pfad '%s' nicht initialisiert" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "Meinten Sie vielleicht 'update --init'?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Überspringe nicht zusammengeführtes Submodul %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "Überspringe Submodul '%s'" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab." -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "Pfad zum Arbeitsverzeichnis" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout oder none" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "" "einen Klon mit unvollständiger Historie (shallow) erstellen, abgeschnitten " "bei der angegebenen Anzahl von Commits" -#: builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" msgstr "Parallele Ausführungen" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" "ob das initiale Klonen den Empfehlungen für eine unvollständige\n" "Historie (shallow) folgen soll" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "keine Fortschrittsanzeige beim Klonen" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "Fehlerhafter Wert für update Parameter" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -23423,86 +23428,147 @@ msgstr "" "Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n" "zu erben, aber das Hauptprojekt befindet sich auf keinem Branch." -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten." -#: builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "Rekursion in Submodule durchführen" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben" -#: builtin/submodule--helper.c:2639 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "Konfiguration in der .gitmodules-Datei entfernen" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <name> [<Wert>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <Name>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "Bitte stellen Sie sicher, dass sich die Datei .gitmodules im " "Arbeitsverzeichnis befindet." -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <Pfad> <neue URL>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "Standard-Tracking-Branch auf master setzen" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "Standard-Tracking-Branch setzen" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2741 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) [<Pfad>]" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <Branch> <Pfad>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "Option --branch oder --default erforderlich" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch und --default schließen sich gegenseitig aus" -#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "Füge existierendes Repository in '%s' dem Index hinzu\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "'%s' existiert bereits und ist kein gültiges Git-Repository" + +#: builtin/submodule--helper.c:2828 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "" +"Ein Git-Verzeichnis für '%s' wurde lokal gefunden mit den Remote-" +"Repositories:" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut " +"von\n" +" %s\n" +"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-" +"Verzeichnis\n" +"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n" +"wählen Sie einen anderen Namen mit der Option '--name'.\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '%s'\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "Kann Submodul '%s' nicht auschecken" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "Branch des Repositories zum Auschecken beim Klonen" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "das Hinzufügen eines andernfalls ignorierten Submodul-Pfads erlauben" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "" +"git submodule--helper add-clone [<Optionen>...] --url <URL> --path <Pfad> --" +"name <Name>" + +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstützt kein --super-prefix" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper" @@ -25787,72 +25853,27 @@ msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul" msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' hat keinen Commit ausgecheckt" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu." - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "" -"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-" -"Repositories:" - -#: git-submodule.sh:261 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut " -"von\n" -" $realrepo\n" -"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-" -"Verzeichnis\n" -"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n" -"wählen Sie einen anderen Namen mit der Option '--name'." - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'." - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "Kann Submodul '$sm_path' nicht auschecken" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden." -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -25861,7 +25882,7 @@ msgstr "" "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n" "'$sm_path' nicht finden." -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -25870,7 +25891,7 @@ msgstr "" "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche " "$sha1 direkt anzufordern:" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -25879,49 +25900,49 @@ msgstr "" "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n" "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen." -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' " "fehlgeschlagen" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" @@ -7,24 +7,24 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-06-05 19:31-0500\n" -"Last-Translator: christopher.diaz.riv@gmail.com\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" +"PO-Revision-Date: 2021-08-14 11:37-0500\n" +"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.3\n" +"X-Generator: Poedit 3.0\n" #: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "¿Ahh (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" msgstr "no se pudo leer índice" @@ -53,7 +53,7 @@ msgstr "Actualizar" msgid "could not stage '%s'" msgstr "no se pudo poner en stage '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "no se pudo escribir índice" @@ -111,12 +111,12 @@ msgstr[1] "agregadas %d rutas\n" msgid "ignoring unmerged: %s" msgstr "ignorando lo no fusionado: %s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Solo cambiaron archivos binarios.\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Sin cambios.\n" @@ -143,7 +143,7 @@ msgstr "revertir conjunto de cambios en stage a la versión de HEAD" #: add-interactive.c:1016 msgid "pick hunks and update selectively" -msgstr "elegir hunks y actualizar de forma selectiva" +msgstr "elegir fragmentos y actualizar de forma selectiva" #: add-interactive.c:1018 msgid "view diff between HEAD and index" @@ -168,7 +168,7 @@ msgstr "selecciona un rango de objetos" #: add-interactive.c:1034 msgid "select multiple ranges" -msgstr "selecciona multiples rangos" +msgstr "selecciona múltiples rangos" #: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" @@ -194,13 +194,13 @@ msgstr "selecciona un objeto numerado" msgid "(empty) select nothing" msgstr "(vacío) selecciona nada" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" -msgstr "Ahora que" +msgstr "Ahora qué" #: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" @@ -210,21 +210,22 @@ msgstr "rastreado" msgid "unstaged" msgstr "no rastreado" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "ruta" #: add-interactive.c:1151 msgid "could not refresh index" -msgstr "no se pudo refrescar el index" +msgstr "no se pudo refrescar el índice" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Adiós.\n" @@ -247,14 +248,14 @@ msgstr "¿Agregar al stage [y,n,q,a,d%s,?]? " #: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stage a este fragmento [y,n,q,a,d%s,?]? " #: add-patch.c:39 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "" -"Si el parche aplica limpiamente, el hunk editado será marcado inmediatamente " +"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente " "para el área de stage." #: add-patch.c:42 @@ -265,22 +266,22 @@ msgid "" "a - stage this hunk and all later hunks in the file\n" "d - do not stage this hunk or any of the later hunks in the file\n" msgstr "" -"y - aplicar stage a este hunk\n" -"n - no aplicar stage a este hunk\n" -"q - quit; no aplicar stage a este hunk ni ninguno de los restantes\n" -"a - aplicar stage a este hunk y a todos los posteriores en el archivo\n" -"d - no aplicar stage a este hunk o a ninguno de los posteriores en este " +"y - aplicar stage a este fragmento\n" +"n - no aplicar stage a este fragmento\n" +"q - quit; no aplicar stage a este fragmento ni ninguno de los restantes\n" +"a - aplicar stage a este fragmento y a todos los posteriores en el archivo\n" +"d - no aplicar stage a este fragmento o a ninguno de los posteriores en este " "archivo\n" #: add-patch.c:56 git-add--interactive.perl:1437 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " +msgstr "¿Hacer stash al cambio de modo [y,n,q,a,d%s,?]? " #: add-patch.c:57 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? " +msgstr "¿Hacer stash a la eliminación [y,n,q,a,d%s,?]? " #: add-patch.c:58 git-add--interactive.perl:1439 #, c-format, perl-format @@ -290,15 +291,15 @@ msgstr "¿Agregar al stash [y,n,q,a,d%s,?]? " #: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? " +msgstr "¿Hacer stash a este fragmento [y,n,q,a,d%s,?]? " #: add-patch.c:61 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "" -"Si el parche aplica limpiamente, el hunk editado será marcado inmediatamente " -"para aplicar stash." +"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente " +"para hacer stash." #: add-patch.c:64 msgid "" @@ -308,11 +309,11 @@ msgid "" "a - stash this hunk and all later hunks in the file\n" "d - do not stash this hunk or any of the later hunks in the file\n" msgstr "" -"y - aplicar stash a este hunk\n" -"n - no aplicar stash a este hunk\n" -"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n" -"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" -"d - no aplicar stash a este hunk ni ninguno de los posteriores en el archivo\n" +"y - hacer stash a este fragmento\n" +"n - no hacer stash a este fragmento\n" +"q - quit; no hacer stash a este fragmento o a ninguno de los restantes\n" +"a - hacer stash a este fragmento y a todos los posteriores en el archivo\n" +"d - no hacer stash a este fragmento ni ninguno de los posteriores en el archivo\n" #: add-patch.c:80 git-add--interactive.perl:1443 #, c-format, perl-format @@ -332,14 +333,14 @@ msgstr "¿Quitar adición al stage [y,n,q,a,d%s,?]? " #: add-patch.c:83 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? " +msgstr "¿Sacar este fragmento del stage [y,n,q,a,d%s,?]? " #: add-patch.c:85 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "" -"Si el parche aplica limpiamente, el hunk editado será marcado inmediatamente " +"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente " "para sacar del área de stage." #: add-patch.c:88 @@ -351,10 +352,10 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file\n" msgstr "" "y - sacar desde hunk del área de stage\n" -"n - no sacar este hunk del area de stage\n" -"q - quit; no sacar del area de stage este hunk ni ninguno de los restantes\n" -"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n" -"d - no sacar del area de stage este hunk ni ninguno de los posteriores en el " +"n - no sacar este fragmento del area de stage\n" +"q - quit; no sacar del area de stage este fragmento ni ninguno de los restantes\n" +"a - sacar del area de stage este fragmento y todos los posteriores en el archivo\n" +"d - no sacar del area de stage este fragmento ni ninguno de los posteriores en el " "archivo\n" #: add-patch.c:103 git-add--interactive.perl:1449 @@ -375,14 +376,14 @@ msgstr "¿Aplicar adición al índice [y,n,q,a,d%s,?]? " #: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar este fragmetno al índice [y,n,q,a,d%s,?]? " #: add-patch.c:108 add-patch.c:176 add-patch.c:221 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "" -"Si el parche aplica de forma limpia, el hunk editado será marcado " +"Si el parche aplica de forma limpia, el fragmento editado será marcado " "inmediatamente para aplicar." #: add-patch.c:111 @@ -393,11 +394,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -"y - aplicar este hunk al índice\n" -"n - no aplicar este hunk al índice\n" -"q - quit; no aplicar este hunk ni ninguno de los restantes\n" -"a - aplicar este hunk y todos los posteriores en el archivo\n" -"d - no aplicar este hunko ninguno de los posteriores en el archivo\n" +"y - aplicar este fragmento al índice\n" +"n - no aplicar este fragmento al índice\n" +"q - quit; no aplicar este fragmento ni ninguno de los restantes\n" +"a - aplicar este fragmento y todos los posteriores en el archivo\n" +"d - no aplicar este fragmento ni ninguno de los posteriores en el archivo\n" #: add-patch.c:126 git-add--interactive.perl:1455 #: git-add--interactive.perl:1473 @@ -421,14 +422,14 @@ msgstr "¿Descartar adición del árbol de trabajo [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " +msgstr "¿Descartar este fragmento del árbol de trabajo [y,n,q,a,d%s,?]? " #: add-patch.c:131 add-patch.c:154 add-patch.c:199 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "" -"Si el parche aplica de forma limpia, el hunk editado será marcado " +"Si el parche aplica de forma limpia, el fragmento editado será marcado " "inmediatamente para descarte." #: add-patch.c:134 add-patch.c:202 @@ -439,11 +440,11 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -"y - descartar este hunk del árbol de trabajo\n" -"n - no descartar este hunk del árbol de trabajo\n" -"q - quit; no descartar este hunk ni ninguno de los que restantes\n" -"a - descartar este hunk y todos los posteriores en este archivo\n" -"d - no descartar este hunk ni ninguno de los posteriores en el archivo\n" +"y - descartar este fragmento del árbol de trabajo\n" +"n - no descartar este fragmento del árbol de trabajo\n" +"q - quit; no descartar este fragmento ni ninguno de los restantes\n" +"a - descartar este fragmento y todos los posteriores en este archivo\n" +"d - no descartar este fragmento ni ninguno de los posteriores en el archivo\n" #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, c-format, perl-format @@ -465,7 +466,7 @@ msgstr "¿Descartar adición del índice y el árbol de trabajo [y,n,q,a,d%s,?]? #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"¿Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " +"¿Descartar este fragmento del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " #: add-patch.c:157 msgid "" @@ -475,11 +476,11 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -"y - descartar este hunk del índice y el árbol de trabajo\n" -"n - no descartar este hunk del índice ni el árbol de trabajo\n" -"q - quit; no descartar este hunk ni ninguno de los que queden\n" -"a - descartar este hunk y todos los posteriores en este archivo\n" -"d - no descartar este hunk ni ninguno posterior en el archivo\n" +"y - descartar este fragmento del índice y el árbol de trabajo\n" +"n - no descartar este fragmento del índice ni el árbol de trabajo\n" +"q - quit; no descartar este fragmento ni ninguno de los que queden\n" +"a - descartar este fragmento y todos los posteriores en este archivo\n" +"d - no descartar este fragmento ni ninguno posterior en el archivo\n" #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, c-format, perl-format @@ -501,7 +502,7 @@ msgstr "¿Aplicar adición al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "¿Aplicar este fragmento al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " #: add-patch.c:179 msgid "" @@ -511,11 +512,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -"y - aplicar este hunk al índice y al árbol de trabajo\n" -"n - no aplicar este hunk al índice y al árbol de trabajo\n" -"q - quit; no aplicar este hunk ni ninguno de los restantes\n" -"a - aplicar este hunk y todos los posteriores en el archivo\n" -"d - no aplicar este hunk ni ninguno de los siguientes en este archivo\n" +"y - aplicar este fragmento al índice y al árbol de trabajo\n" +"n - no aplicar este fragmento al índice y al árbol de trabajo\n" +"q - quit; no aplicar este fragmento ni ninguno de los restantes\n" +"a - aplicar este fragmento y todos los posteriores en el archivo\n" +"d - no aplicar este fragmento ni ninguno de los siguientes en este archivo\n" #: add-patch.c:224 msgid "" @@ -525,40 +526,40 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -"y - aplicar este hunk al índice y al árbol de trabajo\n" -"n - no aplicar este hunk al índice y al árbol de trabajo\n" -"q - quit; no aplicar este hunk ni ninguno de los restantes\n" -"a - aplicar este hunk y todos los posteriores en el archivo\n" -"d - no aplicar este hunk ni ninguno de los siguientes en este archivo\n" +"y - aplicar este fragmento al índice y al árbol de trabajo\n" +"n - no aplicar este fragmento al índice y al árbol de trabajo\n" +"q - quit; no aplicar este fragmento ni ninguno de los restantes\n" +"a - aplicar este fragmento y todos los posteriores en el archivo\n" +"d - no aplicar este fragmento ni ninguno de los siguientes en este archivo\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "no se puede analizar hunk header '%.*s'" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "no se puede analizar hunk header '%.*s'" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "no se puede analizar diff" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "no se pudo analizar diff a colores" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "falló al ejecutar '%s'" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" -msgstr "output de interactive.diffFilter no concuerda" +msgstr "salida de interactive.diffFilter no concuerda" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -566,7 +567,7 @@ msgstr "" "Tu filtro tiene que mantener correspondencia de uno a uno\n" "entre las líneas de entrada y salida." -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -575,7 +576,7 @@ msgstr "" "se esperaba línea de contexto #%d en\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -583,16 +584,16 @@ msgid "" "\tdoes not end with:\n" "%.*s" msgstr "" -"hunks no hacen overlap:\n" +"hunks no se superponen:\n" "%.*s\n" "\tno acaba con:\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -603,24 +604,24 @@ msgstr "" "---\n" "Para eliminar '%c' líneas, haga de ellas líneas ' ' (contexto).\n" "Para eliminar '%c' líneas, bórrelas.\n" -"Lineas comenzando con %c serán eliminadas.\n" +"Líneas comenzando con %c serán eliminadas.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" "Si esto no aplica de manera limpia, se te da la oportunidad de\n" -"editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces\n" -"la edición es abortada y el hunk queda sin cambios.\n" +"editar nuevamente. Si todas las líneas del fragmento son eliminadas, entonces\n" +"la edición es abortada y el fragmento queda sin cambios.\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "no se puede analizar hunk header" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "falló 'git apply --cached'" @@ -636,26 +637,26 @@ msgstr "falló 'git apply --cached'" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/" "n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "¡Los hunks seleccionados no aplican al índice!" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? " -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Nada fue aplicado.\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -667,79 +668,79 @@ msgid "" "e - manually edit the current hunk\n" "? - print help\n" msgstr "" -"j - deja este hunk sin decidir, ver el siguiente hunk sin decisión\n" -"J - deja este hunk sin decidir, ver siguiente hunk\n" -"k - deja este hunk sin decidir, ver hunk previo sin decidir\n" -"K - deja este hunk sin decidir, ver hunk anterior\n" -"g - selecciona un hunk a dónde ir\n" -"/ - buscar un hunk que cumpla con el regex dado\n" -"s - separar el hunk actual en más pequeños\n" -"e - editar manualmente el hunk actual\n" +"j - deja este fragmento sin decidir, ver el siguiente fragmento sin decisión\n" +"J - deja este fragmento sin decidir, ver siguiente fragmento \n" +"k - deja este fragmento sin decidir, ver fragmento previo sin decidir\n" +"K - deja este fragmento sin decidir, ver fragmento anterior\n" +"g - selecciona un fragmento a dónde ir\n" +"/ - buscar un fragmento que cumpla con el regex dado\n" +"s - separar el fragmento actual en más pequeños\n" +"e - editar manualmente el fragmento actual\n" "? - imprimir ayuda\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" -msgstr "No hay hunk anterior" +msgstr "No hay fragmento anterior" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" -msgstr "No hay hunk siguiente" +msgstr "No hay fragmento siguiente" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" -msgstr "No hay más pedazos a que ir" +msgstr "No hay más fragmentos a que ir" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " -msgstr "¿a que hunk ir (<enter> para ver más)? " +msgstr "¿a qué fragmento ir (<enter> para ver más)? " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " -msgstr "¿a que hunk ir? " +msgstr "¿a qué fragmento ir? " -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" -msgstr "Numero inválido: '%s'" +msgstr "Número inválido: '%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Lo siento, solo %d hunk disponible." -msgstr[1] "Lo siento, solo %d hunks disponibles." +msgstr[0] "Lo siento, solo %d fragmento disponible." +msgstr[1] "Lo siento, solo %d fragmentos disponibles." -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" -msgstr "No hay más pedazos para buscar" +msgstr "No hay más fragmentos para buscar" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "¿buscar para regexp? " -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Regexp para la búsqueda mal formado %s: %s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" -msgstr "No hay hunks que concuerden con el patrón entregado" +msgstr "No hay fragmentos que concuerden con el patrón entregado" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "Perdón, no se puede dividir este pedazo" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." -msgstr "Cortar en %d hunk." +msgstr "Cortar en %d fragmentos." -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "Perdón, no se puede editar este pedazo" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "falló 'git apply'" @@ -795,7 +796,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." @@ -922,21 +923,21 @@ msgstr "" #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -"git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en la" +"git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en la " "línea %d" #: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -"git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en la" +"git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en la " "línea %d" #: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -"git apply: git-diff erróneo - viejo nombre de archivo inconsistente en la" +"git apply: git-diff erróneo - viejo nombre de archivo inconsistente en la " "línea %d" #: apply.c:933 @@ -963,11 +964,11 @@ msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "" -"el header de git diff carece de información del nombre del archivo cuando" -"se elimina %d componente principal de la ruta (línea %d)" +"el header de git diff carece de información del nombre del archivo cuando se " +"elimina %d componente principal de la ruta (línea %d)" msgstr[1] "" -"los headers de git diff carecen de información del nombre del archivo cuando" -"se eliminan %d componentes principales (línea %d)" +"los headers de git diff carecen de información del nombre del archivo cuando " +"se eliminan %d componentes principales de la ruta (línea %d)" #: apply.c:1384 #, c-format @@ -1074,7 +1075,7 @@ msgstr "data perdida en parche binario para '%s'" #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -"no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'" +"no se puede revertir-aplicar un parche binario sin el fragmento revertido a '%s'" #: apply.c:3151 #, c-format @@ -1196,8 +1197,8 @@ msgstr "%s: tipo incorrecto" msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "ruta inválida '%s'" @@ -1288,7 +1289,7 @@ msgstr "" msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "falló escribir a '%s'" @@ -1380,7 +1381,7 @@ msgstr[0] "" msgstr[1] "" "%d líneas aplicadas después de arreglar los errores de espacios en blanco." -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo índice" @@ -1392,7 +1393,7 @@ msgstr "no aplicar cambios que concuerden con la ruta suministrada" msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "num" @@ -1410,7 +1411,7 @@ msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada" #: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" -msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal" +msgstr "mostrar el número de líneas agregadas y eliminadas en notación decimal" #: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" @@ -1422,7 +1423,7 @@ msgstr "en lugar de aplicar el parche, ver si el parche es aplicable" #: apply.c:5016 msgid "make sure the patch is applicable to the current index" -msgstr "asegurar que el parche es aplicable al índice actual" +msgstr "asegurar que el parche sea aplicable al índice actual" #: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" @@ -1438,7 +1439,7 @@ msgstr "aceptar un parche que toque fuera del área de trabajo" #: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "también aplicar el parche (usar con --stat/--summary/--check" +msgstr "también aplicar el parche (usar con --stat/--summary/--check)" #: apply.c:5027 msgid "attempt three-way merge, fall back on normal patch if that fails" @@ -1456,11 +1457,11 @@ msgstr "rutas están separadas con un carácter NULL" #: apply.c:5034 msgid "ensure at least <n> lines of context match" -msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden" +msgstr "asegurar que al menos <n> líneas del contexto concuerden" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 #: builtin/rebase.c:1347 msgid "action" msgstr "acción" @@ -1493,8 +1494,8 @@ msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" @@ -1506,9 +1507,9 @@ msgstr "" #: apply.c:5057 msgid "do not trust the line counts in the hunk headers" -msgstr "no confiar en el conteo de líneas en los headers del hunk" +msgstr "no confiar en el conteo de líneas en los headers del fragmento" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "raíz" @@ -1548,9 +1549,9 @@ msgstr "ruta no válida UTF-8: %s" #: archive-zip.c:322 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "ruta demasiado larga (%d chars, SHA1: %s): %s" +msgstr "ruta demasiada larga (%d chars, SHA1: %s): %s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" @@ -1558,7 +1559,7 @@ msgstr "error al desinflar (%d)" #: archive-zip.c:603 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "timestamp demasiado largo para este sistema: %<PRIuMAX>" +msgstr "timestamp demasiado grande para este sistema: %<PRIuMAX>" #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" @@ -1585,16 +1586,16 @@ msgid "cannot read %s" msgstr "no se puede leer %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 -#: builtin/merge.c:1143 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "no se pudo leer '%s'" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" -msgstr "ruta especificada '%s' no concordó con ningun archivo" +msgstr "ruta especificada '%s' no concordó con ningún archivo" #: archive.c:451 #, c-format @@ -1633,18 +1634,18 @@ msgstr "fmt" msgid "archive format" msgstr "formato de crónica" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "prefijo" #: archive.c:554 msgid "prepend prefix to each pathname in the archive" -msgstr "anteponer prefijo a cada ruta en el crónica" +msgstr "anteponer prefijo a cada ruta en la crónica" #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" @@ -1675,7 +1676,8 @@ msgid "list supported archive formats" msgstr "listar los formatos de crónica soportados" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "repo" @@ -1683,7 +1685,7 @@ msgstr "repo" msgid "retrieve the archive from remote repository <repo>" msgstr "obtener la crónica del repositorio remoto <repo>" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "comando" @@ -1758,7 +1760,7 @@ msgid "" "This means the bug has been fixed between %s and [%s].\n" msgstr "" "La base de fusión %s está mal.\n" -"Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n" +"Esto quiere decir que el bug ha sido corregido entre %s y [%s].\n" #: bisect.c:796 #, c-format @@ -1775,7 +1777,7 @@ msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"La base de fisión %s es %s.\n" +"La base de fusión %s es %s.\n" "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n" #: bisect.c:809 @@ -1797,18 +1799,19 @@ msgid "" "We continue anyway." msgstr "" "la base de fusión entre %s y [%s] tiene que ser saltada.\n" -"Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n" +"Así que no podemos estar seguros que el primer %s commit esté entre %s y " +"%s.\n" "Vamos a continuar de todas maneras." #: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" -msgstr "Biseccionando: una base de fisión debe ser probada\n" +msgstr "Biseccionando: una base de fusión debe ser probada\n" #: bisect.c:911 #, c-format msgid "a %s revision is needed" -msgstr "una %s revisión es necesaria" +msgstr "una revisión %s es necesaria" #: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format @@ -1852,8 +1855,8 @@ msgstr[1] "(aproximadamente %d pasos)" #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" -msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n" -msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n" +msgstr[0] "Biseccionando: falta %d revisión por probar después de esta %s\n" +msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esta %s\n" #: blame.c:2776 msgid "--contents and --reverse do not blend well." @@ -1868,13 +1871,13 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el último commit" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" -msgstr "falló la configuración del camino de revisión" +msgstr "falló la configuración del recorrido de revisiones" #: blame.c:2838 msgid "" @@ -1903,7 +1906,7 @@ msgid "" msgstr "" "\n" "Tras arreglar la causa del error puedes intentar arreglar\n" -"la infamación del rastreo remoto invocando\n" +"la información del rastreo remoto invocando\n" "\"git branch --set-upstream-to=%s%s%s\"." #: branch.c:67 @@ -2014,7 +2017,7 @@ msgstr "" "\n" "Si estás planeando hacer push a una nueva rama local que\n" "va a rastrear a su contraparte remota, tal vez quieras usar\n" -"\"git push -u\" para configurar tu upstream predeterminado cuando realizas " +"\"git push -u\" para configurar tu upstream predeterminado cuando realices " "el push." #: branch.c:281 @@ -2042,118 +2045,118 @@ msgstr "'%s' ya ha sido marcado en '%s'" msgid "HEAD of working tree %s is not updated" msgstr "HEAD del árbol de trabajo %s no está actualizada" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "algoritmo bundle hash desconocido %s" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "capacidad desconocida '%s'" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' no se ve como un archivo bundle v2 o v3" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 #: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" -msgstr "Al repositorio le falta estos commits prerrequisito:" +msgstr "Al repositorio le faltan estos commits prerrequisitos:" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "se necesita un repositorio para verificar un bundle" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "El bundle contiene esta referencia:" msgstr[1] "El bundle contiene estas %d referencias:" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "El bundle registra una historia completa." -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "El bundle requiere esta referencia:" msgstr[1] "El bundle requiere estas %d referencias:" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "incapaz de duplicar bundle descriptor" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" -msgstr "No se pudo crear los pack-objetcts" +msgstr "No se pudo ejecutar pack-objects" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects murió" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referencia '%s' es excluida por las opciones de rev-list" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "versión de bundle no soportada %d" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "Rechazando crear un bundle vacío." -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "no se puede crear '%s'" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack murió" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "terminando porque el id del chunk aparece antes de lo esperado" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "offset para chunk incorrecto %<PRIx64> y %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "se encontró ID de chuck %<PRIx32> duplicado" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "chunk final tiene un id distinto de cero %<PRIx32>" @@ -2169,7 +2172,7 @@ msgstr "versión de hash inválida" #: commit-graph.c:262 msgid "commit-graph file is too small" -msgstr "archivo commit-graph es muy pequeño" +msgstr "archivo commit-graph es demasiado pequeño" #: commit-graph.c:355 #, c-format @@ -2193,7 +2196,7 @@ msgstr "commit-graph file es demasiado pequeño para almacenar %u chunks" #: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" -msgstr "commit-graph no tiene una chunk base de graphs" +msgstr "commit-graph no tiene un fragmento base de graphs" #: commit-graph.c:492 msgid "commit-graph chain does not match" @@ -2223,12 +2226,12 @@ msgstr "" "commit-graph requiere datos de generación de desbordamiento pero no tiene " "ninguno" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "incapaz de obtener el tipo de objeto: %s" @@ -2271,12 +2274,12 @@ msgstr[1] "Encontrando commits para commit graph en %d packs" #: commit-graph.c:1673 #, c-format msgid "error adding pack %s" -msgstr "error agregando pack %s" +msgstr "error al agregar pack %s" #: commit-graph.c:1677 #, c-format msgid "error opening index for %s" -msgstr "error abriendo index para %s" +msgstr "error al abrir index para %s" #: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" @@ -2290,19 +2293,19 @@ msgstr "Encontrando esquinas extra en commit graph" msgid "failed to write correct number of base graph ids" msgstr "falló al escribir el número correcto de ids de base graph" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "no se pudo crear directorios principales para %s" #: commit-graph.c:1825 msgid "unable to create temporary graph layer" -msgstr "no es posible crear un una capa de gráfico temporal" +msgstr "no es posible crear una capa de gráfico temporal" #: commit-graph.c:1830 #, c-format msgid "unable to adjust shared permissions for '%s'" -msgstr "no se pudo poner permisos a '%s'" +msgstr "no se pudo poner permisos compartidos a '%s'" #: commit-graph.c:1887 #, c-format @@ -2341,85 +2344,87 @@ msgstr "" msgid "too many commits to write graph" msgstr "demasiados commits para escribir el gráfico" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el archivo de commit-graph tiene checksums incorrectos y probablemente está " "corrupto" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u" -#: commit-graph.c:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "falló al analizar commit %s para commit-graph" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "Verificando commits en commit graph" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "falló al analizar el commit %s de la base de datos de objetos para commit-" "graph" -#: commit-graph.c:2517 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s" +msgstr "OID del árbol raíz para commit %s en commit-graph es %s != %s" -#: commit-graph.c:2527 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" -msgstr "lista padre de commit-graph para commit %s es muy larga" +msgstr "lista padre de commit-graph para commit %s es demasiada larga" -#: commit-graph.c:2536 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "padre de commit-graph para %s es %s != %s" -#: commit-graph.c:2550 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" -msgstr "lista padre de commit-graph para commit %s termina antes" +msgstr "lista de padres de commit-graph para commit %s termina prematuramente" -#: commit-graph.c:2555 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -"commit-graph ha generado número cero para %s, pero no-cero para los demás" +"commit-graph tiene número de generación cero para %s, pero no cero en otro " +"lugar" -#: commit-graph.c:2559 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -"commit-graph tiene generación no-cero para %s, pero cero para los demás" +"commit-graph tiene número de generación no cero para %s, pero cero en otro " +"lugar" -#: commit-graph.c:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2582 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" @@ -2467,7 +2472,7 @@ msgstr "Commit %s no tiene una firma GPG." #: commit.c:1247 #, c-format msgid "Commit %s has a good GPG signature by %s\n" -msgstr "El Commit %s tiene una buena firma GPG por %s\n" +msgstr "El commit %s tiene una buena firma GPG por %s\n" #: commit.c:1501 msgid "" @@ -2477,7 +2482,7 @@ msgid "" msgstr "" "Peligro: el mensaje del commit no se ajusta a UTF-8.\n" "Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n" -"variable de configuración i18n.commitencoding para la codificación que usa " +"variable de configuración i18n.commitencoding para la codificación que use " "tu proyecto.\n" #: compat/obstack.c:406 compat/obstack.c:408 @@ -2526,7 +2531,7 @@ msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'" #: config.c:405 #, c-format msgid "missing environment variable '%s' for configuration '%.*s'" -msgstr "Falta la variable de entorno '%s' para la configuración '%.*s'" +msgstr "falta la variable de entorno '%s' para la configuración '%.*s'" #: config.c:442 #, c-format @@ -2623,44 +2628,44 @@ msgstr "unidad inválida" #: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" -msgstr "mal valor de config numérica '%s' para '%s': %s" +msgstr "mal valor de config numérico '%s' para '%s': %s" #: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s" +msgstr "mal valor de config numérico '%s' para '%s' en el blob %s: %s" #: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s" +msgstr "mal valor de config numérico '%s' para '%s' en el archivo %s: %s" #: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s" +msgstr "mal valor de config numérico '%s' para '%s' en la entrada standard: %s" #: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -"mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s" +"mal valor de config numérico '%s' para '%s' en el submódulo-blob %s: %s" #: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -"mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s" +"mal valor de config numérico '%s' para '%s' en la línea de comando %s: %s" #: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "mal valor de config numérica '%s' para '%s' en %s: %s" +msgstr "mal valor de config numérico '%s' para '%s' en %s: %s" #: config.c:1257 #, c-format msgid "bad boolean config value '%s' for '%s'" -msgstr "mal valor de config booleana '%s' para '%s'" +msgstr "mal valor de config booleano '%s' para '%s'" #: config.c:1275 #, c-format @@ -2705,7 +2710,7 @@ msgstr "valor malformado para %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "debe ser uno de nothing, matching, simple, upstream o current" -#: config.c:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresión de pack erróneo %d" @@ -2723,113 +2728,113 @@ msgstr "referencia '%s' no apunta a un blob" #: config.c:1829 #, c-format msgid "unable to resolve config blob '%s'" -msgstr "no se posible resolver configuración de blob '%s'" +msgstr "no es posible resolver configuración de blob '%s'" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" -msgstr "Inválido %s: '%s'" +msgstr "%s inválido: '%s'" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no es posible analizar '%s' de la configuración de la línea de comando" -#: config.c:2560 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d" -#: config.c:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "nombre de sección inválido '%s'" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "falló al escribir nuevo archivo de configuración %s" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuración %s" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "patrón inválido: %s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "archivo de configuración inválido: %s" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s falló" -#: config.c:3054 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "no es posible hacer mmap '%s'" +msgid "unable to mmap '%s'%s" +msgstr "no es posible hacer mmap '%s'%s" -#: config.c:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s falló" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuración %s" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" -msgstr "sección de nombre inválida: %s" +msgstr "nombre de sección inválido: %s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -2847,8 +2852,8 @@ msgid "" msgstr "" "No se pudo leer del repositorio remoto.\n" "\n" -"Por favor asegúrate que tienes los permisos de acceso correctos\n" -"y que el repositorio existe." +"Por favor asegúrate de que tengas los permisos de acceso correctos\n" +"y que el repositorio exista." #: connect.c:81 #, c-format @@ -2880,7 +2885,7 @@ msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'" #: connect.c:308 msgid "repository on the other end cannot be shallow" -msgstr "el repositorio en el otro final no puede ser superficial" +msgstr "el repositorio en el otro lado no puede ser superficial" #: connect.c:347 msgid "invalid packet" @@ -2899,7 +2904,7 @@ msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor" #: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" -msgstr "respuesta de referencias ls-refs inválida: %s" +msgstr "respuesta de ls-refs inválida: %s" #: connect.c:530 msgid "expected flush after ref listing" @@ -2980,7 +2985,7 @@ msgstr "no se puede comenzar proxy %s" #: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -"no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas" +"no hay ruta especificada; vea 'git help pull' para sintaxis válida de url" #: connect.c:1190 msgid "newline is forbidden in git:// hosts and repo paths" @@ -3007,13 +3012,13 @@ msgstr "ruta extraña '%s' bloqueada" msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Verificando conectividad" #: connected.c:120 msgid "Could not run 'git rev-list'" -msgstr "No se pudo correr 'git rev-list'" +msgstr "No se pudo ejecutar 'git rev-list'" #: connected.c:144 msgid "failed write to rev-list" @@ -3067,8 +3072,8 @@ msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "" -"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%.*s " -"como working-tree-encoding." +"El archivo '%s' contiene una marca de orden de bytes (BOM). Por favor usa " +"UTF-%.*s como working-tree-encoding." #: convert.c:293 #, c-format @@ -3081,8 +3086,9 @@ msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -"Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o " -"UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding." +"Al archivo '%s' le falta una marca de orden de bytes (BOM). Por favor usa " +"UTF-%sBE o UTF-%sLE (dependiendo del orden de bytes) como working-tree-" +"encoding." #: convert.c:408 convert.c:479 #, c-format @@ -3125,9 +3131,9 @@ msgstr "tipo de filtro inesperado" #: convert.c:837 msgid "path name too long for external filter" -msgstr "nombre de ruta muy largo para filtro externo" +msgstr "nombre de ruta demasiado largo para filtro externo" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3136,16 +3142,16 @@ msgstr "" "filtro externo '%s' ya no está disponible aunque no todas las rutas han sido " "filtradas" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false no son working-tree-encodings válidos" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: falló al limpiar filtro '%s'" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: filtro smudge %s falló" @@ -3153,20 +3159,20 @@ msgstr "%s: filtro smudge %s falló" #: credential.c:96 #, c-format msgid "skipping credential lookup for key: credential.%s" -msgstr "saltando revisión de credenciales para llave: credencial. %s" +msgstr "saltando revisión de credenciales para llave: credential.%s" #: credential.c:112 msgid "refusing to work with credential missing host field" -msgstr "rehusando trabajar con credenciales faltantes en el campo host" +msgstr "rehusando trabajar con campo host faltante en la credencial" #: credential.c:114 msgid "refusing to work with credential missing protocol field" -msgstr "rehusando trabajar con credenciales faltantes en el campo protocolo" +msgstr "rehusando trabajar con campo protocolo faltante en la credencial" #: credential.c:394 #, c-format msgid "url contains a newline in its %s component: %s" -msgstr "url contiene un espace de línea en su componente %s: %s" +msgstr "url contiene una nueva línea en su componente %s: %s" #: credential.c:438 #, c-format @@ -3176,7 +3182,7 @@ msgstr "url no tiene scheme: %s" #: credential.c:511 #, c-format msgid "credential url cannot be parsed: %s" -msgstr "url credencial no puede ser analizada: %s" +msgstr "url de credencial no puede ser analizada: %s" #: date.c:138 msgid "in the future" @@ -3258,48 +3264,48 @@ msgstr "mal objeto árbol %s" #: delta-islands.c:334 #, c-format msgid "failed to load island regex for '%s': %s" -msgstr "falló al cargar isla de regex para '%s': %s" +msgstr "falló al cargar regex isla para '%s': %s" #: delta-islands.c:390 #, c-format msgid "island regex from config has too many capture groups (max=%d)" -msgstr "regex isla de config tiene muchos grupos de captura (max=%d)" +msgstr "regex isla de config tiene demasiados grupos de captura (max=%d)" #: delta-islands.c:467 #, c-format msgid "Marked %d islands, done.\n" msgstr "%d islas marcadas, listo.\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "valor desconocido para --diff-merges: %s" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "--merge-base no funciona con rangos" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base solo funciona con confirmaciones" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "no es posible obtener HEAD" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "no se encontró base de fusión" -#: diff-lib.c:566 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "múltiples bases de fusión encontradas" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<opciones>] <path> <path>" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3310,12 +3316,12 @@ msgstr "" #: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " Falló al analizar dirstat porcentaje de corte '%s'\n" +msgstr " Falló al analizar porcentaje de corte de dirstat '%s'\n" #: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" -msgstr " parámetro '%s' de dirstat desconocido\n" +msgstr " Parámetro '%s' de dirstat desconocido\n" #: diff.c:297 msgid "" @@ -3323,7 +3329,7 @@ msgid "" "'dimmed-zebra', 'plain'" msgstr "" "opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', " -"'dimmed_zebra', 'plain'" +"'dimmed-zebra', 'plain'" #: diff.c:325 #, c-format @@ -3358,35 +3364,49 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo murió, deteniendo en %s" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S y --find-object son mutuamente exclusivas" -#: diff.c:4712 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "" +"-G y --pickaxe-regex son mutuamente exclusivos, use --pickaxe-regex con -S" + +#: diff.c:4643 +msgid "" +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "" +"--pickaxe-all y --find-object son mutuamente exclusivas, use --pickaxe-all " +"con -G y -S" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat inválido: %s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numérico" -#: diff.c:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3395,42 +3415,42 @@ msgstr "" "Falló al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "cambio de clase desconocido '%c' en --diff-filter=%s" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconocido luego de ws-error-highlight=%.*s" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "no se puede resolver '%s'" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s espera forma <n>/<m>" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperaba un char, se obtuvo '%s'" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "mal argumento --color-moved: %s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo inválido '%s' en --color-moved-ws" -#: diff.c:5068 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3438,159 +3458,159 @@ msgstr "" "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e " "\"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "argumento inválido para %s" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "regex inválido para -I: '%s'" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "falló al analizar parámetro de opción --submodule: '%s'" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "mal argumento --word-diff: %s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "Opciones de formato de salida para diff" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "generar parche" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "genera diffs con <n> líneas de contexto" -#: diff.c:5385 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "genera el diff en formato raw" -#: diff.c:5388 +#: diff.c:5398 msgid "synonym for '-p --raw'" -msgstr "sinónimo para '-p --stat'" +msgstr "sinónimo para '-p --raw'" -#: diff.c:5392 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5396 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "--stat amigable para máquina" -#: diff.c:5399 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "mostrar solo la última línea para --stat" -#: diff.c:5401 diff.c:5409 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5402 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -"muestra la distribución de cantidades de cambios relativa para cada " +"muestra la distribución de cantidades de cambios relativas para cada " "subdirectorio" -#: diff.c:5406 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "sinónimo para --dirstat=cumulative" -#: diff.c:5410 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo para --dirstat=archivos,param1,param2..." -#: diff.c:5414 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "advierte si cambios introducen conflictos de markers o errores de espacios " "en blanco" -#: diff.c:5417 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "resumen condensado de creaciones, cambios de nombres y cambios de modos" -#: diff.c:5420 +#: diff.c:5430 msgid "show only names of changed files" msgstr "mostrar solo nombres de archivos cambiados" -#: diff.c:5423 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "mostrar solo nombres y estados de archivos cambiados" -#: diff.c:5425 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" -msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]" +msgstr "<ancho>[,<ancho-de-nombre>[,<cantidad>]]" -#: diff.c:5426 +#: diff.c:5436 msgid "generate diffstat" msgstr "generar diffstat" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<ancho>" -#: diff.c:5429 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "genera diffstat con un ancho dado" -#: diff.c:5432 +#: diff.c:5442 msgid "generate diffstat with a given name width" -msgstr "genera diffstat con un nombre de ancho dado" +msgstr "genera diffstat con un ancho de nombre dado" -#: diff.c:5435 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "genera diffstat con un ancho de graph dado" -#: diff.c:5437 +#: diff.c:5447 msgid "<count>" msgstr "<cantidad>" -#: diff.c:5438 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "genera diffstat con líneas limitadas" -#: diff.c:5441 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "genera un resumen compacto de diffstat" -#: diff.c:5444 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "muestra un diff binario que puede ser aplicado" -#: diff.c:5447 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index" "\"" -#: diff.c:5449 +#: diff.c:5459 msgid "show colored diff" msgstr "mostrar diff colorido" -#: diff.c:5450 +#: diff.c:5460 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5451 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3598,7 +3618,7 @@ msgstr "" "resaltar errores de espacios en blanco en las líneas 'context', 'old' o " "'new' del diff" -#: diff.c:5454 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3606,327 +3626,330 @@ msgstr "" "no consolidar los pathnames y usar NULs como terminadores de campos en --raw " "o --numstat" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<prefijo>" -#: diff.c:5458 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" -#: diff.c:5461 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" -msgstr "mostrar el prefijo de destino en lugar de \"b/\"" +msgstr "mostrar el prefijo de destino dado en lugar de \"b/\"" -#: diff.c:5464 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "anteponer un prefijo adicional a cada línea mostrada" -#: diff.c:5467 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "no mostrar ningún prefijo de fuente o destino" -#: diff.c:5470 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "muestra el contexto entre hunks de diff hasta el número especificado de " "líneas" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<char>" -#: diff.c:5475 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "especifica el char para indicar una nueva línea en lugar de '+'" -#: diff.c:5480 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "especifica el char para indicar una línea vieja en lugar de '-'" -#: diff.c:5485 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "especifica el char para indicar un contexto en lugar de ' '" -#: diff.c:5488 +#: diff.c:5498 msgid "Diff rename options" msgstr "Opciones de diff rename" -#: diff.c:5489 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "descomponer los cambios de reescritura en pares de borrar y crear" -#: diff.c:5494 +#: diff.c:5504 msgid "detect renames" msgstr "detectar renombrados" -#: diff.c:5498 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "omite la preimage para borrados" -#: diff.c:5501 +#: diff.c:5511 msgid "detect copies" msgstr "detectar copias" -#: diff.c:5505 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "usa archivos no modificados como fuente para encontrar copias" -#: diff.c:5507 +#: diff.c:5517 msgid "disable rename detection" -msgstr "deshabilita detección de renombres" +msgstr "deshabilita detección de renombrados" -#: diff.c:5510 +#: diff.c:5520 msgid "use empty blobs as rename source" -msgstr "usa blobs vacíos como fuente de renombre" +msgstr "usa blobs vacíos como fuente de renombramiento" -#: diff.c:5512 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" -msgstr "continua listando el historial de un archivo más allá de renombres" +msgstr "" +"continua listando el historial de un archivo más allá de renombramientos" -#: diff.c:5515 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -"previene detección de renombre/copias si el número de objetivos para " -"renombres/copias excede el límite dado" +"previene detección de renombramientos/copias si el número de destinos para " +"renombramientos/copias excede el límite dado" -#: diff.c:5517 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "Opciones de algoritmos de diff" -#: diff.c:5519 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "produce el diff más pequeño posible" -#: diff.c:5522 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "ignorar espacios en blanco cuando comparando líneas" -#: diff.c:5525 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "ignorar cambios en la cantidad de líneas en blanco" -#: diff.c:5528 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "ignorar cambios en espacios en blanco en EOL" -#: diff.c:5531 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "ignora carrier-return al final de la línea" -#: diff.c:5534 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "ignora cambios cuyas líneas son todas en blanco" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<regex>" -#: diff.c:5537 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "ignora cambios cuyas líneas concuerdan con <regex>" -#: diff.c:5540 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heurística para cambiar los límites de hunk para una fácil lectura" -#: diff.c:5543 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera un diff usando algoritmo \"patience diff\"" -#: diff.c:5547 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera un diff usando algoritmo \"histogram diff\"" -#: diff.c:5549 +#: diff.c:5559 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5550 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "escoge un algoritmo para diff" -#: diff.c:5552 +#: diff.c:5562 msgid "<text>" msgstr "<texto>" -#: diff.c:5553 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera un diff usando algoritmo \"anchored diff\"" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<modo>" -#: diff.c:5556 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas" -#: diff.c:5559 +#: diff.c:5569 msgid "use <regex> to decide what a word is" -msgstr "usa <regex> para decidir que palabra es" +msgstr "usa <regex> para decidir qué es una palabra" -#: diff.c:5562 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5565 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "líneas movidas de código están coloreadas diferente" -#: diff.c:5568 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "como espacios en blanco son ignorados en --color-moved" -#: diff.c:5571 +#: diff.c:5581 msgid "Other diff options" msgstr "Otras opciones de diff" -#: diff.c:5573 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra " "paths relativos" -#: diff.c:5577 +#: diff.c:5587 msgid "treat all files as text" msgstr "tratar todos los archivos como texto" -#: diff.c:5579 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "cambia dos inputs, invierte el diff" -#: diff.c:5581 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0" -#: diff.c:5583 +#: diff.c:5593 msgid "disable all output of the program" -msgstr "deshabilita todo el output del programa" +msgstr "deshabilita todo el salida del programa" -#: diff.c:5585 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "permite la ejecución de un diff helper externo" -#: diff.c:5587 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "" "ejecuta filtros de conversión de texto externos cuando comparando binarios" -#: diff.c:5589 +#: diff.c:5599 msgid "<when>" msgstr "<cuando>" -#: diff.c:5590 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" msgstr "ignorar cambios a submódulos en la generación de diff" -#: diff.c:5593 +#: diff.c:5603 msgid "<format>" msgstr "<formato>" -#: diff.c:5594 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "especifica como son mostradas las diferencias en submódulos" -#: diff.c:5598 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" -msgstr "ocultar entradas 'git add -N' del index" +msgstr "ocultar entradas 'git add -N' del índice" -#: diff.c:5601 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" -msgstr "trata entradas 'git add -N' como reales en el index" +msgstr "trata entradas 'git add -N' como reales en el índice" -#: diff.c:5603 +#: diff.c:5613 msgid "<string>" msgstr "<string>" -#: diff.c:5604 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -"busca por diferencias que cambien el número de ocurrencias para el string " +"busca diferencias que cambien el número de ocurrencias del string " "especificado" -#: diff.c:5607 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -"busca por diferencias que cambien el número de ocurrencias para el regex " +"busca por diferencias que cambien el número de ocurrencias del regex " "especificado" -#: diff.c:5610 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" msgstr "mostrar todos los cambios en el changeset con -S o -G" -#: diff.c:5613 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tratar <string> en -S como una expresión regular extendida de POSIX" -#: diff.c:5616 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "controlar el orden en el que los archivos aparecen en la salida" -#: diff.c:5617 diff.c:5620 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<ruta>" -#: diff.c:5618 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "mostrar el cambio en la ruta especificada primero" -#: diff.c:5621 +#: diff.c:5631 msgid "skip the output to the specified path" -msgstr "saltar el output de la ruta especificada" +msgstr "saltar el salida de la ruta especificada" -#: diff.c:5623 +#: diff.c:5633 msgid "<object-id>" -msgstr "<id-objeto>" +msgstr "<id-de-objeto>" -#: diff.c:5624 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -"busca por diferencias que cambien el número de ocurrencias para el objeto " +"busca diferencias que cambien el número de ocurrencias para el objeto " "especificado" -#: diff.c:5626 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5627 +#: diff.c:5637 msgid "select files by diff type" msgstr "selecciona archivos por tipo de diff" -#: diff.c:5629 +#: diff.c:5639 msgid "<file>" msgstr "<archivo>" -#: diff.c:5630 +#: diff.c:5640 msgid "Output to a specific file" msgstr "Output a un archivo específico" -#: diff.c:6287 -msgid "inexact rename detection was skipped due to too many files." +#: diff.c:6298 +msgid "exhaustive rename detection was skipped due to too many files." msgstr "" -"detección de cambio de nombre inexacta fue saltada por haber muchos archivos." +"detección exhaustiva de cambio de nombre fue saltada por haber demasiados " +"archivos." -#: diff.c:6290 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." msgstr "" -"solo se encontraron copias de rutas modificadas por haber muchos archivos." +"solo se encontraron copias de rutas modificadas por haber demasiados " +"archivos." -#: diff.c:6293 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3937,9 +3960,9 @@ msgstr "" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" -msgstr "falló al leer orden de archivos '%s'" +msgstr "falló al leer archivo de orden '%s'" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "Realizando una detección de cambios de nombre inexacta" @@ -3948,61 +3971,60 @@ msgstr "Realizando una detección de cambios de nombre inexacta" msgid "No such path '%s' in the diff" msgstr "No hay ruta '%s' en el diff" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "" -"ruta especificada '%s' no concordó con ningún archivo(s) conocido por git" +msgstr "ruta especificada '%s' no concordó con ningún archivo conocido por git" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "patrón desconocido: '%s'" -#: dir.c:777 dir.c:791 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "patrón negativo no reconocido: '%s'" -#: dir.c:809 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" "tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido" -#: dir.c:819 +#: dir.c:830 msgid "disabling cone pattern matching" -msgstr "deshabilitar coincidencia de patrónes cono" +msgstr "deshabilitar coincidencia de patrónes cónica" -#: dir.c:1206 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "no se puede usar %s como archivo de exclusión" -#: dir.c:2314 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "no se pudo abrir el directorio '%s'" -#: dir.c:2614 +#: dir.c:2653 msgid "failed to get kernel name and information" -msgstr "falló al conseguir la información y nombre del kernel" +msgstr "falló al conseguir el nombre y la información del kernel" -#: dir.c:2738 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "untracked cache está desactivado en este sistema o ubicación" -#: dir.c:3543 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "archivo índice corrompido en repositorio %s" -#: dir.c:3590 dir.c:3595 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3624 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" @@ -4012,21 +4034,21 @@ msgstr "no se pudo migrar el directorio git de '%s' a '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c" -#: entry.c:179 +#: entry.c:176 msgid "Filtering content" msgstr "Filtrando contenido" -#: entry.c:500 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" -msgstr "no se pudo establecer el archivo '%s'" +msgstr "no se pudo hacer stat en el archivo '%s'" #: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "ruta de namespace de git mala \"%s\"" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no se pudo configurar GIT_DIR a '%s'" @@ -4034,16 +4056,17 @@ msgstr "no se pudo configurar GIT_DIR a '%s'" #: exec-cmd.c:363 #, c-format msgid "too many args to run %s" -msgstr "demasiados argumentos para correr %s" +msgstr "demasiados argumentos para ejecutar %s" #: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack: lista poco profunda esperada" +msgstr "git fetch-pack: lista de superficiales esperada" #: fetch-pack.c:185 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -"git fetch-pack: se esperaba un flush packet luego de la lista superficial" +"git fetch-pack: se esperaba un flush packet luego de la lista de " +"superficiales" #: fetch-pack.c:196 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" @@ -4065,12 +4088,12 @@ msgstr "--stateless-rpc requiere multi_ack_detailed" #: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" -msgstr "línea poco profunda inválida: %s" +msgstr "línea shallow inválida: %s" #: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" -msgstr "línea superficial inválida: %s" +msgstr "línea unshallow inválida: %s" #: fetch-pack.c:391 fetch-pack.c:1431 #, c-format @@ -4085,7 +4108,7 @@ msgstr "error en objeto: %s" #: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" -msgstr "superficie no encontrada: %s" +msgstr "shallow no encontrado: %s" #: fetch-pack.c:399 fetch-pack.c:1440 #, c-format @@ -4127,20 +4150,20 @@ msgstr "ya se tiene %s (%s)" #: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" +msgstr "fetch-pack: no se puede ejecutar un demultiplexor de banda lateral" #: fetch-pack.c:857 msgid "protocol error: bad pack header" -msgstr "error de protocolo: paquete de header erróneo" +msgstr "error de protocolo: header de paquete erróneo" #: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" -msgstr "fetch-pack: no se puede quitar %s" +msgstr "fetch-pack: no se puede ejecutar %s" #: fetch-pack.c:957 msgid "fetch-pack: invalid index-pack output" -msgstr "fetch-pack: salida de paquete de índice no válida" +msgstr "fetch-pack: salida de index-pack no válida" #: fetch-pack.c:974 #, c-format @@ -4170,11 +4193,11 @@ msgstr "El servidor no soporta clientes superficiales" #: fetch-pack.c:1089 msgid "Server does not support --shallow-since" -msgstr "El servidor no soporta --shalow-since" +msgstr "El servidor no soporta --shallow-since" #: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" -msgstr "El servidor no soporta --shalow-exclude" +msgstr "El servidor no soporta --shallow-exclude" #: fetch-pack.c:1098 msgid "Server does not support --deepen" @@ -4192,7 +4215,7 @@ msgstr "no hay commits comunes" msgid "source repository is shallow, reject to clone." msgstr "el repositorio fuente es superficial, rechazando clonado." -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch falló." @@ -4204,7 +4227,7 @@ msgstr "algoritmos no compatibles: cliente %s; servidor %s" #: fetch-pack.c:1246 #, c-format msgid "the server does not support algorithm '%s'" -msgstr "servidor no soporta el algoritmo '%s'" +msgstr "el servidor no soporta el algoritmo '%s'" #: fetch-pack.c:1279 msgid "Server does not support shallow requests" @@ -4212,16 +4235,16 @@ msgstr "El servidor no soporta peticiones superficiales" #: fetch-pack.c:1286 msgid "Server supports filter" -msgstr "El servidor soporta filtro" +msgstr "El servidor soporta filtración" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "no se puede escribir request al remoto" #: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" -msgstr "error leyendo sección header '%s'" +msgstr "error al leer header de sección '%s'" #: fetch-pack.c:1353 #, c-format @@ -4236,20 +4259,20 @@ msgstr "línea de confirmación inesperada: '%s'" #: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" -msgstr "error procesando acks: %d" +msgstr "error al procesar acks: %d" #: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" -msgstr "espere que el packfile sea mandado luego del 'listo'" +msgstr "se esperaba que el packfile fuera enviado luego del 'listo'" #: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" -msgstr "espere que ninguna otra sección sea enviada luego del 'listo'" +msgstr "se esperaba que ninguna otra sección fuera enviada luego del 'listo'" #: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" -msgstr "error procesando información superficial: %d" +msgstr "error al procesar información de superficiales: %d" #: fetch-pack.c:1494 #, c-format @@ -4264,30 +4287,30 @@ msgstr "wanted-ref inesperado: '%s'" #: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" -msgstr "error procesando refs deseadas: %d" +msgstr "error al procesar refs deseadas: %d" #: fetch-pack.c:1534 msgid "git fetch-pack: expected response end packet" -msgstr "git fetch-pack: se espera un paquete final de respuesta" +msgstr "git fetch-pack: se esperaba un paquete final de respuesta" -#: fetch-pack.c:1930 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" -msgstr "remoto no mando todos los objetos necesarios" +msgstr "remoto no mandó todos los objetos necesarios" -#: fetch-pack.c:2056 +#: fetch-pack.c:2065 msgid "unexpected 'ready' from remote" msgstr "'listo' inesperado del remoto" -#: fetch-pack.c:2079 +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:2082 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permite solicitudes de objetos inadvertidos %s" @@ -4303,33 +4326,33 @@ msgstr "falló al escribir la firma separada para '%s'" #: gpg-interface.c:470 msgid "gpg failed to sign the data" -msgstr "gpg falló al firmar la data" +msgstr "gpg falló al firmar los datos" #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" -msgstr "ignora color inválido '%.*s' en log.graphColors" +msgid "ignored invalid color '%.*s' in log.graphColors" +msgstr "ignorado color inválido '%.*s' en log.graphColors" #: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" -"el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es " +"el patrón provisto contiene bytes NULL (vía -f <archivo>). Esto solo es " "soportado con -P bajo PCRE v2" -#: grep.c:1893 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" -msgstr "falló al marcar '%s'" +msgstr "falló al hacer stat en '%s'" -#: grep.c:1921 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -4402,7 +4425,7 @@ msgstr "Estos son comandos comunes de Git usados en varias situaciones:" #: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" -msgstr "comando de listado de tipos no soportado '%s'" +msgstr "tipo de listado de comandos no soportado '%s'" #: help.c:405 msgid "The Git concept guides are:" @@ -4432,7 +4455,7 @@ msgstr "" #: help.c:543 help.c:631 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: '%s'no es un comando de git. Mira 'git --help'." +msgstr "git: '%s' no es un comando de git. Mira 'git --help'." #: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." @@ -4451,7 +4474,7 @@ msgstr "Continuando asumiendo que quisiste decir '%s'." #: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'." +msgstr "Continuando en %0.1f segundos, asumiendo que quisiste decir '%s'." #: help.c:635 msgid "" @@ -4469,7 +4492,7 @@ msgstr[1] "" #: help.c:675 msgid "git version [<options>]" -msgstr "git versión [<opciones>]" +msgstr "git version [<opciones>]" #: help.c:730 #, c-format @@ -4515,7 +4538,7 @@ msgstr "" "\n" "*** Por favor cuéntame quién eres.\n" "\n" -"Corre\n" +"Ejecuta\n" "\n" " git config --global user.email \"you@example.com\"\n" " git config --global user.name \"Tu Nombre\"\n" @@ -4526,7 +4549,7 @@ msgstr "" #: ident.c:397 msgid "no email was given and auto-detection is disabled" -msgstr "no se entrego ningún email y la detección automática está desactivada" +msgstr "no se entregó ningún email y la detección automática está desactivada" #: ident.c:402 #, c-format @@ -4535,7 +4558,7 @@ msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')" #: ident.c:419 msgid "no name was given and auto-detection is disabled" -msgstr "no se entrego ningún nombre y la detección automática está desactivada" +msgstr "no se entregó ningún nombre y la detección automática está desactivada" #: ident.c:425 #, c-format @@ -4545,7 +4568,7 @@ msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')" #: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" -msgstr "no se puede tener un nombre vacío (para <%s>)" +msgstr "no se puede tener un nombre de identidad vacío (para <%s>)" #: ident.c:439 #, c-format @@ -4567,13 +4590,13 @@ msgstr "soporte para filtros sparse:path ha sido discontinuado" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "'%s' para 'object:type=<type>' no es un objeto válido" #: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" -msgstr "filtro -spec inválido '%s'" +msgstr "especificación de filtro inválida '%s'" #: list-objects-filter-options.c:140 #, c-format @@ -4591,7 +4614,7 @@ msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro" #: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "" -"no es posible actualizar el formato del repositorio para soportar clonado " +"no es posible actualizar el formato del repositorio para soportar clonación " "parcial" #: list-objects-filter.c:532 @@ -4607,14 +4630,14 @@ msgstr "incapaz de analizar filtro de data en %s" #: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno" +msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no lo es" #: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno" +msgstr "entrada '%s' en árbol %s tiene modo blob, pero no lo es" -#: list-objects.c:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "no se puede cargar árbol raíz para commit %s" @@ -4632,10 +4655,10 @@ msgid "" msgstr "" "No se puede crear '%s.lock': %s.\n" "\n" -"Otro proceso git parece estar corriendo en el repositorio, es decir\n" +"Otro proceso git parece estar ejecutando en el repositorio, es decir\n" "un editor abierto con 'git commit'. Por favor asegúrese de que todos los " "procesos\n" -"están terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n" +"estén terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n" "puede haber roto el repositorio antes:\n" "borra el archivo manualmente para continuar." @@ -4662,32 +4685,32 @@ msgstr "CRLF con comillas detectado" msgid "bad action '%s' for '%s'" msgstr "mala acción '%s' para '%s'" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: merge-ort.c:1569 merge-recursive.c:1201 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Falló al fusionar el submódulo %s (no revisado)" -#: merge-ort.c:1125 merge-recursive.c:1212 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Falló al fusionar el submódulo %s (commits no presentes)" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: merge-ort.c:1587 merge-recursive.c:1215 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)" +msgstr "Falló el fusionar submódulo %s (commits no siguen la base de fusión)" -#: merge-ort.c:1144 merge-ort.c:1151 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Nota: Fast-forward de submódulo %s a %s" -#: merge-ort.c:1172 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" -msgstr "falló al fusionar el submódulo %s" +msgstr "Falló al fusionar el submódulo %s" -#: merge-ort.c:1179 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4697,7 +4720,7 @@ msgstr "" "fusión:\n" "%s\n" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4714,7 +4737,7 @@ msgstr "" "\n" "el cual aceptará esta sugerencia.\n" -#: merge-ort.c:1196 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4723,21 +4746,21 @@ msgstr "" "Falló al fusionar el submódulo %s, pero existen múltipes fusiones posibles:\n" "%s" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "Falló al ejecutar la fusión interna" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "No es posible agregar %s a la base de datos" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4747,27 +4770,27 @@ msgstr "" "existente en %s se interpone con el cambio de nombres implícito, poniendo " "la(s) siguiente(s) ruta(s) aquí: %s." -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta " -"para %s; cambio de nombre implícito intentó poner estas rutas: %s" +"CONFLICTO (cambio de nombre de directorio implícito): No se puede mapear más " +"de una ruta para %s; cambio de nombre implícito intentó poner estas rutas: %s" -#: merge-ort.c:1634 +#: merge-ort.c:2087 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " "renamed to multiple other directories, with no destination getting a " "majority of the files." msgstr "" -"CONFLICTO (división de cambio de nombre de directorio): No está claro dónde " +"CONFLICTO (división de cambio de nombre de directorio): No está claro a qué " "cambiar el nombre de %s; se le cambió el nombre a varios otros directorios, " -"sin que ningún destino obtenga la mayoría de los archivos." +"sin que ningún destino obtuviera la mayoría de los archivos." -#: merge-ort.c:1788 merge-recursive.c:2468 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4776,7 +4799,7 @@ msgstr "" "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " "renombrado." -#: merge-ort.c:1932 merge-recursive.c:3244 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4785,7 +4808,7 @@ msgstr "" "Path actualizado: %s agregado en %s dentro de un directorio que fue " "renombrado en %s; moviéndolo a %s." -#: merge-ort.c:1939 merge-recursive.c:3251 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4794,7 +4817,7 @@ msgstr "" "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue " "renombrado en %s; moviéndolo a %s." -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4803,7 +4826,7 @@ msgstr "" "CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio " "que fue renombrado en %s, sugerimos que debería ser movido a %s." -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4813,87 +4836,87 @@ msgstr "" "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser " "movido a %s." -#: merge-ort.c:2103 +#: merge-ort.c:2569 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "CONFLICTO (renombrar / renombrar): %s renombrado a %s en %s y %s en %s." -#: merge-ort.c:2198 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " "conflicts AND collides with another path; this may result in nested conflict " "markers." msgstr "" -"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de%s -" -">%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede " +"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de %s " +"->%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede " "resultar en marcadores de conflicto anidados." -#: merge-ort.c:2217 merge-ort.c:2241 +#: merge-ort.c:2683 merge-ort.c:2707 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "CONFLICTO (renombrar / eliminar): %s renombrado a %s en %s, pero eliminado " "en %s." -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "no se pudo leer el objeto %s" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "objeto %s no es un blob" -#: merge-ort.c:2981 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "" -"CONFLICTO (archivo / directorio): directorio en el camino de%s de%s; " -"moviéndolo a%s en su lugar." +"CONFLICTO (archivo / directorio): directorio en el camino de %s de %s; " +"moviéndolo a %s en su lugar." -#: merge-ort.c:3055 +#: merge-ort.c:3689 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" -"CONFLICTO (tipos distintos):%s tenía tipos diferentes en cada lado; " -"renombrado ambos para que cada uno pueda ser grabado en algún lugar " +"CONFLICTO (tipos distintos): %s tenía tipos diferentes en cada lado; ambos " +"fueron renombrados para que cada uno pueda ser grabado en algún lugar " "diferente." -#: merge-ort.c:3062 +#: merge-ort.c:3696 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " "of them so each can be recorded somewhere." msgstr "" -"CONFLICTO (tipos distintos):%s tenía tipos diferentes en cada lado; " -"renombrado uno de ellos para que cada uno pueda ser grabado en algún lugar " +"CONFLICTO (tipos distintos): %s tenía tipos diferentes en cada lado; uno de " +"ellos fue renombrado para que cada uno pueda ser grabado en algún lugar " "diferente." -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "contenido" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "agregar/agregar" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "submódulo" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTO (%s): Conflicto de fusión en %s" -#: merge-ort.c:3198 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4902,7 +4925,7 @@ msgstr "" "CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. " "Versión %s de %s restante en el árbol." -#: merge-ort.c:3433 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4914,13 +4937,13 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3730 +#: merge-ort.c:4487 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" -"La recopilación de información de fusión falló para los árboles %s, %s, %s" +"la recopilación de información de fusión falló para los árboles %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3699 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4930,115 +4953,115 @@ msgstr "" "merge:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "Ya está actualizado." -#: merge-recursive.c:356 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "(commit erróneo)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:375 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión." -#: merge-recursive.c:388 +#: merge-recursive.c:384 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión." +msgstr "add_cacheinfo falló al refrescar la ruta '%s'; abortando fusión." -#: merge-recursive.c:876 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "falló al crear la ruta '%s'%s" -#: merge-recursive.c:887 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" -msgstr "Removiendo %s para hacer espacio para un subdirectorio\n" +msgstr "Quitando %s para hacer espacio para un subdirectorio\n" -#: merge-recursive.c:901 merge-recursive.c:920 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr ": ¿tal vez un conflicto D/F?" -#: merge-recursive.c:910 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" -msgstr "rehusando perder el archivo rastreado en '%s'" +msgstr "rehusando perder el archivo no rastreado en '%s'" -#: merge-recursive.c:951 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "no se puede leer el objeto %s '%s'" -#: merge-recursive.c:956 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "se esperaba blob para %s '%s'" -#: merge-recursive.c:981 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "falló al abrir '%s': %s" -#: merge-recursive.c:992 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "falló al crear el enlace simbólico '%s': %s" -#: merge-recursive.c:997 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" -msgstr "no se que hacer con %06o %s '%s'" +msgstr "no sé qué hacer con %06o %s '%s'" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" -msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:" +msgstr "Haciendo fast-forward a submódulo %s hasta el siguiente commit:" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rápido en submódulo %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)" -#: merge-recursive.c:1269 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" -msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)" +msgstr "Falló al fusionar el submódulo %s (avance rápido no es posible)" -#: merge-recursive.c:1270 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Se encontró una posible solución de fusión para el submódulo:\n" -#: merge-recursive.c:1282 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" -msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)" +msgstr "Falló al fusionar el submódulo %s (múltiples fusiones encontradas)" -#: merge-recursive.c:1424 +#: merge-recursive.c:1420 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en " "cambio." -#: merge-recursive.c:1496 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s " -"en el árbol." +"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Se dejó la versión %s de " +"%s en el árbol." -#: merge-recursive.c:1501 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5047,7 +5070,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol." -#: merge-recursive.c:1508 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5056,7 +5079,7 @@ msgstr "" "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s " "dejada en el árbol, en %s." -#: merge-recursive.c:1513 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5065,44 +5088,44 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol en %s." -#: merge-recursive.c:1548 +#: merge-recursive.c:1544 msgid "rename" msgstr "renombrar" -#: merge-recursive.c:1548 +#: merge-recursive.c:1544 msgid "renamed" msgstr "renombrado" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Rehusando perder el archivo sucio en %s" -#: merge-recursive.c:1609 +#: merge-recursive.c:1605 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Rehusando perder el archivo no rastreado en %s, incluso aunque se está " "interponiendo." -#: merge-recursive.c:1667 +#: merge-recursive.c:1663 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s" -#: merge-recursive.c:1698 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s es un directorio en %s agregando como %s más bien" -#: merge-recursive.c:1703 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio" -#: merge-recursive.c:1730 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5111,18 +5134,18 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " "renombrar \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1735 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " (dejado sin resolver)" -#: merge-recursive.c:1827 +#: merge-recursive.c:1823 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en " "%s" -#: merge-recursive.c:2090 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5130,10 +5153,10 @@ msgid "" "getting a majority of the files." msgstr "" "CONFLICTO (división de cambio de nombre de directorio): No es claro dónde " -"colocar %s porque el directorio %s fue renombrado a otros múltiples " +"colocar %s porque el directorio %s fue renombrado a múltiples otros " "directorios, sin ningún que contenga la mayoría de archivos." -#: merge-recursive.c:2224 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5142,80 +5165,80 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modify" msgstr "modificar" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3108 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3161 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "Agregando más bien como %s" -#: merge-recursive.c:3368 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: merge-recursive.c:3391 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "archivo/directorio" -#: merge-recursive.c:3396 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:3403 +#: merge-recursive.c:3406 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como " "%s" -#: merge-recursive.c:3412 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:3421 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTO (add/add): Conflicto de merge en %s" -#: merge-recursive.c:3474 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:3568 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3581 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "se encontró %u ancestro común:" msgstr[1] "se encontraron %u ancestros comunes:" -#: merge-recursive.c:3631 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "la fusión no devolvió ningún commit" -#: merge-recursive.c:3796 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." @@ -5224,8 +5247,8 @@ msgstr "Incapaz de escribir el índice." msgid "failed to read the cache" msgstr "falló al leer la cache" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "no es posible escribir el archivo índice" @@ -5233,12 +5256,12 @@ msgstr "no es posible escribir el archivo índice" #: midx.c:74 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "" -"El abanico de OID de índice de paquetes múltiples es del tamaño incorrecto" +"el abanico de OID de índice de paquetes múltiples es del tamaño incorrecto" #: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" -msgstr "archivo multi-pack-index %s es muy pequeño" +msgstr "el archivo multi-pack-index %s es demasiado pequeño" #: midx.c:121 #, c-format @@ -5254,29 +5277,30 @@ msgstr "versión %d de multi-pack-index no reconocida" #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -"La versión de hash de índice de paquetes múltiples %u no coincide con la " +"la versión de hash de índice de paquetes múltiples %u no coincide con la " "versión %u" #: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" -msgstr "multi-pack-index le falta el conjunto pack-name requerido" +msgstr "a multi-pack-index le falta el conjunto pack-name requerido" #: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" -msgstr "multi-pack-index le falta el conjunto OID fanout requerido" +msgstr "a multi-pack-index le falta el conjunto OID fanout requerido" #: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" -msgstr "multi-pack-index le falta el conjunto OID fanout requerido" +msgstr "a multi-pack-index le falta el conjunto OID fanout requerido" #: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" -msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido" +msgstr "a multi-pack-index le falta el conjunto de offset del objeto requerido" #: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" -msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'" +msgstr "" +"nombres de paquete de multi-pack-index fuera de orden: '%s' antes de '%s'" #: midx.c:214 #, c-format @@ -5285,7 +5309,8 @@ msgstr "mal pack-int-id: %u (%u paquetes totales)" #: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño" +msgstr "" +"multi-pack-index guarda un offset de 64-bit, pero off_t es demasiado pequeño" #: midx.c:490 #, c-format @@ -5302,110 +5327,118 @@ msgstr "falló al abrir pack-index '%s'" msgid "failed to locate object %d in packfile" msgstr "falló al ubicar objeto %d en packfile" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:880 builtin/index-pack.c:1533 msgid "cannot store reverse index file" msgstr "no se puede almacenar el archivo de índice inverso" -#: midx.c:933 +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "ignorando el actual multi-pack-index; checksum no concuerda" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "Agregando packfiles a multi-pack-index" -#: midx.c:979 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" -msgstr "no se vió pack-file %s caer" +msgstr "no se vió el pack-file que abandonar %s" -#: midx.c:1024 +#: midx.c:1034 #, c-format msgid "unknown preferred pack: '%s'" msgstr "pack preferido desconocido: '%s'" -#: midx.c:1029 +#: midx.c:1039 #, c-format msgid "preferred pack '%s' is expired" msgstr "pack de referencia '% s' ha expirado" -#: midx.c:1045 +#: midx.c:1055 msgid "no pack files to index." msgstr "no hay archivos pack para indexar." -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1135 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "falló al borrar %s" -#: midx.c:1156 +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "falló al limpiar multi-pack-index en %s" -#: midx.c:1214 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "" -"El archivo de índice de paquetes múltiples existe, pero no se pudo analizar" +"el archivo de índice de paquetes múltiples existe, pero no se pudo analizar" + +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "checksum incorrecto" -#: midx.c:1222 +#: midx.c:1236 msgid "Looking for referenced packfiles" -msgstr "Buscando por packfiles referidos" +msgstr "Buscando packfiles referidos" -#: midx.c:1237 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1242 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "el midx no contiene oid" -#: midx.c:1251 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "Verificando orden de OID en multi-pack-index" -#: midx.c:1260 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1280 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "Ordenando objetos por packfile" -#: midx.c:1287 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "Verificando offsets de objetos" -#: midx.c:1303 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "fallo al cargar entrada pack para oid[%d] = %s" -#: midx.c:1309 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "falló al cargar el pack-index para packfile %s" -#: midx.c:1318 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1343 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "Contando objetos no referenciados" -#: midx.c:1353 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "Encontrando y borrando packfiles sin referencias" -#: midx.c:1544 +#: midx.c:1558 msgid "could not start pack-objects" -msgstr "no se pudo empezar los pack-objetcts" +msgstr "no se pudo iniciar pack-objects" -#: midx.c:1564 +#: midx.c:1578 msgid "could not finish pack-objects" -msgstr "no se pudo finalizar pack-objetcts" +msgstr "no se pudo finalizar pack-objects" #: name-hash.c:542 #, c-format @@ -5429,21 +5462,20 @@ msgid "" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " "commit/abort the previous merge before you start a new notes merge." msgstr "" -"No has concluido tus notas previas de fusión (%s existe).\n" +"No has concluido tu fusión preia de notas (%s existe).\n" "Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para " -"confirmar/abortar la fusión previa antes de que puedas comenzar una nueva " -"nota de fusión." +"confirmar/abortar la fusión previa antes de comenzar una nueva fusión de " +"notas." #: notes-merge.c:284 #, c-format msgid "You have not concluded your notes merge (%s exists)." -msgstr "No has terminado tus notas de fusión (%s existe)." +msgstr "No has terminado tu fusión de notas (%s existe)." #: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -"No se puede realizar commit, notas del árbol no inicializadas o no " -"referenciadas" +"No se puede realizar commit, árbol de notas no inicializado o no referenciado" #: notes-utils.c:105 #, c-format @@ -5467,271 +5499,273 @@ msgstr "Valor erróneo para %s: '%s'" #: object-file.c:526 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates" +msgstr "" +"directorio de objetos %s no existe; revisa .git/objects/info/alternates" -#: object-file.c:577 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "incapaz de normalizar la ruta de objeto alterno: %s" -#: object-file.c:649 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo" +msgstr "%s: ignorando espacios de objetos alternos, anidado demasiado profundo" -#: object-file.c:656 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" -msgstr "incapaz de normalizar directorio de objeto: %s" +msgstr "incapaz de normalizar directorio de objetos: %s" -#: object-file.c:699 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "no es posible hacer fdopen en lockfile alternos" -#: object-file.c:717 +#: object-file.c:726 msgid "unable to read alternates file" -msgstr "no es posible leer archivos alternos" +msgstr "no es posible leer el archivo de alternativos" -#: object-file.c:724 +#: object-file.c:733 msgid "unable to move new alternates file into place" -msgstr "no es posible mover archivos alternos en el lugar" +msgstr "no es posible mover el nuevo archivo de alternativos al lugar" -#: object-file.c:759 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "ruta '%s' no existe" -#: object-file.c:780 +#: object-file.c:789 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "repositorio de referencia '%s' como un checkout vinculado no es soportado " "todavía." -#: object-file.c:786 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "repositorio de referencia '%s' no es un repositorio local." -#: object-file.c:792 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "repositorio de referencia '%s' es superficial (shallow)" -#: object-file.c:800 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "repositorio de referencia '% s' está injertado" -#: object-file.c:860 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "línea inválida mientras se analizaban refs alternas: %s" -#: object-file.c:1010 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>" -#: object-file.c:1031 -msgid "mmap failed" -msgstr "mmap falló" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" +msgstr "mmap falló %s" -#: object-file.c:1195 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "archivo de objeto %s está vacío" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" -msgstr "objeto perdido corrupto '%s'" +msgstr "objeto suelto corrupto '%s'" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" -msgstr "basura al final del objeto perdido '%s'" +msgstr "basura al final del objeto suelto '%s'" -#: object-file.c:1374 +#: object-file.c:1397 msgid "invalid object type" msgstr "tipo de objeto inválido" -#: object-file.c:1458 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "no es posible desempacar header %s con --allow-unknown-type" -#: object-file.c:1461 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "incapaz de desempaquetar header %s" -#: object-file.c:1467 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "no es posible analizar header %s con --allow-unknown-type" -#: object-file.c:1470 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "incapaz de analizar header %s" -#: object-file.c:1697 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "falló al leer objeto %s" -#: object-file.c:1701 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "reemplazo %s no encontrado para %s" -#: object-file.c:1705 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" -msgstr "objeto perdido %s (guardado en %s) está corrompido" +msgstr "objeto suelto %s (guardado en %s) está corrompido" -#: object-file.c:1709 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" -msgstr "paquete de objeto %s (guardado en %s) está corrompido" +msgstr "objeto empaquetado %s (guardado en %s) está corrompido" -#: object-file.c:1814 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "no es posible escribir archivo %s" -#: object-file.c:1821 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "no se pudo poner permisos a '%s'" -#: object-file.c:1828 +#: object-file.c:1848 msgid "file write error" msgstr "falló de escritura" -#: object-file.c:1848 +#: object-file.c:1868 msgid "error when closing loose object file" -msgstr "error cerrando el archivo de objeto suelto" +msgstr "error al cerrar el archivo de objeto suelto" -#: object-file.c:1913 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permisos insuficientes para agregar un objeto a la base de datos del " "repositorio %s" -#: object-file.c:1915 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "no es posible crear un archivo temporal" -#: object-file.c:1939 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "no es posible escribir el archivo de objeto suelto" -#: object-file.c:1945 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "no es posible desinflar el objeto nuevo %s (%d)" -#: object-file.c:1949 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd en objeto %s falló (%d)" -#: object-file.c:1953 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "confundido por fuente de data de objetos inestable para %s" -#: object-file.c:1963 builtin/pack-objects.c:1097 +#: object-file.c:1983 builtin/pack-objects.c:1237 #, c-format msgid "failed utime() on %s" msgstr "falló utime() en %s" -#: object-file.c:2040 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "no se pudo leer el objeto para %s" -#: object-file.c:2091 +#: object-file.c:2111 msgid "corrupt commit" msgstr "commit corrupto" -#: object-file.c:2099 +#: object-file.c:2119 msgid "corrupt tag" msgstr "tag corrupto" -#: object-file.c:2199 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" -msgstr "error leyendo al indexar %s" +msgstr "error de lectura al indexar %s" -#: object-file.c:2202 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "lectura corta al indexar %s" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "%s: falló al insertar en la base de datos" -#: object-file.c:2291 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo de archivo no soportado" -#: object-file.c:2315 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "%s no es objeto válido" -#: object-file.c:2317 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no es un objeto '%s' válido" -#: object-file.c:2344 builtin/index-pack.c:192 +#: object-file.c:2364 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "no es posible abrir %s" -#: object-file.c:2535 object-file.c:2588 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash no concuerda para %s (se esperaba %s)" -#: object-file.c:2559 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "no es posible hacer mmap a %s" -#: object-file.c:2564 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "incapaz de desempaquetar header de %s" -#: object-file.c:2570 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "incapaz de analizar header de %s" -#: object-file.c:2581 +#: object-file.c:2605 #, c-format msgid "unable to unpack contents of %s" msgstr "no es posible desempaquetar contenidos de %s" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" -msgstr "El ID de objeto corto %s es ambiguo" +msgstr "el ID de objeto corto %s es ambiguo" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "Los candidatos son:" -#: object-name.c:796 +#: object-name.c:790 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" @@ -5754,22 +5788,22 @@ msgstr "" "examina estas refs y tal vez bórralas. Silencia este mensaje\n" "ejecutando \"git config advice.objectNameWarning false\"" -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "log para '%.*s' solo va hasta %s" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "log para '%.*s' solo tiene %d entradas" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "la ruta '%s' existe en disco, pero no en '%.*s'" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5778,45 +5812,45 @@ msgstr "" "ruta '%s' existe, pero no '%s'\n" "ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "ruta '%s' no existe en '%.*s'" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" "hint: Did you mean ':%d:%s'?" msgstr "" -"ruta '%s' está en el index, pero no en stage %d\n" -"ayuda:¿Quisiste decir: '%d:%s'?" +"ruta '%s' está en el índice, pero no en stage %d\n" +"ayuda: ¿Quisiste decir: '%d:%s'?" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" "hint: Did you mean ':%d:%s' aka ':%d:./%s'?" msgstr "" -"ruta '%s' está en el index, pero no '%s'\n" -"ayuda:¿Quisiste decir ':%d:%s' o ':%d:./%s'?" +"ruta '%s' está en el índice, pero no '%s'\n" +"ayuda: ¿Quisiste decir ':%d:%s' o ':%d:./%s'?" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" -msgstr "ruta '%s' existe en el disco, pero no en el index" +msgstr "ruta '%s' existe en el disco, pero no en el índice" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "ruta '%s' no existe (ni en disco ni en el index)" +msgstr "ruta '%s' no existe (ni en disco ni en el índice)" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "" "la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "nombre de objeto no válido: '%.*s'." @@ -5831,27 +5865,27 @@ msgstr "tipo de objeto \"%s\" inválido" msgid "object %s is a %s, not a %s" msgstr "objeto %s es un %s, no un %s" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "el objeto %s tiene un id de tipo desconocido %d" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "incapaz de analizar objeto: %s" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "hash no concuerda %s" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, c-format msgid "unable to get size of %s" msgstr "no se pudo obtener el tamaño de %s" -#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "no se puede obtener el uso de disco de %s" @@ -5859,17 +5893,17 @@ msgstr "no se puede obtener el uso de disco de %s" #: pack-revindex.c:221 #, c-format msgid "reverse-index file %s is too small" -msgstr "El archivo de índice inverso %s es demasiado pequeño" +msgstr "el archivo de índice inverso %s es demasiado pequeño" #: pack-revindex.c:226 #, c-format msgid "reverse-index file %s is corrupt" -msgstr "El archivo de índice inverso %s está dañado" +msgstr "el archivo de índice inverso %s está dañado" #: pack-revindex.c:234 #, c-format msgid "reverse-index file %s has unknown signature" -msgstr "El archivo de índice inverso %s tiene una firma desconocida" +msgstr "el archivo de índice inverso %s tiene una firma desconocida" #: pack-revindex.c:238 #, c-format @@ -5888,7 +5922,7 @@ msgstr "no puede escribir y verificar el índice inverso" #: pack-write.c:271 #, c-format msgid "could not stat: %s" -msgstr "no se pudo estad: %s" +msgstr "no se pudo hacer stat: %s" #: pack-write.c:283 #, c-format @@ -5902,15 +5936,20 @@ msgstr "no se pudo escribir el archivo promisor '%s'" #: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" -msgstr "offset antes del final del paquete (broken .idx?)" +msgstr "offset antes del final del paquete (¿.idx roto?)" + +#: packfile.c:655 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "objeto %s no puede ser mapeado %s" -#: packfile.c:1937 +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)" -#: packfile.c:1941 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5924,7 +5963,7 @@ msgstr "opción `%s' espera un valor numérico" #: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" -msgstr "fecha de expiración mal formada: '%s'" +msgstr "fecha de caducidad mal formada: '%s'" #: parse-options-cb.c:54 #, c-format @@ -6034,11 +6073,11 @@ msgstr "" #: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." -msgstr "Solo una especificación 'attr' es permitida." +msgstr "Solo se permite una única especificación 'attr'." #: pathspec.c:172 msgid "attr spec must not be empty" -msgstr "especificación attr no puede estar vacía" +msgstr "la especificación attr no puede estar vacía" #: pathspec.c:215 #, c-format @@ -6060,22 +6099,22 @@ msgstr "" #: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "parámetro no válido para el prefijo 'magic pathspec'" +msgstr "parámetro no válido para la magia de pathspec 'prefix'" #: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "Magic pathspec inválido '%.*s' en '%s'" +msgstr "Magia de pathspec inválida '%.*s' en '%s'" #: pathspec.c:353 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "Falta ')' al final del magic pathspec en '%s'" +msgstr "Falta ')' al final de la magia de pathspec en '%s'" #: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "Magic pathspec '%c' no implementado en '%s'" +msgstr "Magia de pathspec '%c' no implementada en '%s'" #: pathspec.c:450 #, c-format @@ -6095,7 +6134,7 @@ msgstr "'%s' (nemotécnico: '%c')" #: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s: magic pathspec no soportado por este comando: %s" +msgstr "%s: magia de pathspec no soportada por este comando: %s" #: pathspec.c:619 #, c-format @@ -6105,7 +6144,7 @@ msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico" #: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" -msgstr "la línea está mál citada: %s" +msgstr "la línea está mál entrecomillada: %s" #: pkt-line.c:92 msgid "unable to write flush packet" @@ -6116,8 +6155,8 @@ msgid "unable to write delim packet" msgstr "no es posible escribir delim packet" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "no es posible escribir un paquete separador sin estado (stateless)" +msgid "unable to write response end packet" +msgstr "no es posible escribir paquete de respuesta final" #: pkt-line.c:113 msgid "flush packet write failed" @@ -6174,21 +6213,21 @@ msgstr "no es posible crear lstat hilado: %s" #: pretty.c:988 msgid "unable to parse --pretty format" -msgstr "incapaz de analizar el formato --pretty" +msgstr "incapaz de analizar el formato de --pretty" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: no se puede bifurcar el subproceso de recuperación" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "proiso-remote: no se pudo escribir para recuperar el subproceso" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "promisor-remote: no se pudo cerrar stdin para recuperar el subproceso" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "nombre remoto promisor no puede comenzar con '/': %s" @@ -6199,7 +6238,7 @@ msgstr "info de objeto: se espera flush tras argumentos" #: prune-packed.c:35 msgid "Removing duplicate objects" -msgstr "Removiendo objetos duplicados" +msgstr "Quitando objetos duplicados" #: range-diff.c:78 msgid "could not start `log`" @@ -6207,9 +6246,9 @@ msgstr "no se pudo comenzar `log`" #: range-diff.c:80 msgid "could not read `log` output" -msgstr "no se pudo leer output de `log`" +msgstr "no se pudo leer salida de `log`" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" @@ -6220,72 +6259,73 @@ msgid "" "could not parse first line of `log` output: did not start with 'commit ': " "'%s'" msgstr "" -"no se pudo leer la primera línea de salida `log`: no comienza con 'commit ': " -"'%s'" +"no se pudo leer la primera línea de salida de `log`: no comienza con 'commit " +"': '%s'" #: range-diff.c:140 #, c-format msgid "could not parse git header '%.*s'" msgstr "no se puede analizar git header '%.*s'" -#: range-diff.c:306 +#: range-diff.c:307 msgid "failed to generate diff" msgstr "falló al generar diff" -#: range-diff.c:558 +#: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "--left-only y --right-only son mutuamente exclusivas" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "no se pudo leer el log para '%s'" -#: read-cache.c:708 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el index)" +msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el índice)" -#: read-cache.c:724 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "no se puede crear un blob vacío en la base de datos de objetos" -#: read-cache.c:746 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -"%s: solo puede agregar archivos regulares, symbolic links o git-directories" +"%s: solo se pueden agregar archivos regulares, symbolic links o git-" +"directories" -#: read-cache.c:751 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' no tiene un commit checked out" -#: read-cache.c:803 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "no es posible indexar archivo '%s'" -#: read-cache.c:822 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "no es posible agregar '%s' al index" -#: read-cache.c:833 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" -msgstr "incapaz de correr stat en '%s'" +msgstr "incapaz de hacer stat en '%s'" -#: read-cache.c:1356 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' parece ser un directorio y un archivo a la vez" -#: read-cache.c:1571 +#: read-cache.c:1573 msgid "Refresh index" msgstr "Refrescar index" -#: read-cache.c:1700 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6294,7 +6334,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1710 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6303,146 +6343,146 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1766 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "mala firma 0x%08x" -#: read-cache.c:1769 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" -msgstr "mala versión del índice %d" +msgstr "mala versión de índice %d" -#: read-cache.c:1778 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "mala firma sha1 del archivo index" -#: read-cache.c:1812 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" -msgstr "index usa %.4s extensiones, cosa que no entendemos" +msgstr "index usa la extensión %.4s, cosa que no entendemos" -#: read-cache.c:1814 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "ignorando extensión %.4s" -#: read-cache.c:1851 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" -msgstr "formato de index desconocido 0x%08x" +msgstr "formato de índice desconocido 0x%08x" -#: read-cache.c:1867 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" -msgstr "campo nombre malformado en el index, cerca a ruta '%s'" +msgstr "campo nombre malformado en el índice, cerca de ruta '%s'" -#: read-cache.c:1924 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "entradas en stage desordenadas en index" -#: read-cache.c:1927 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" -msgstr "múltiples entradas extrañas para archivo fusionado '%s'" +msgstr "múltiples entradas de stage para archivo fusionado '%s'" -#: read-cache.c:1930 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "entradas de stage desordenadas para '%s'" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:332 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "archivo índice corrompido" -#: read-cache.c:2180 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no es posible crear hilo load_cache_entries: %s" -#: read-cache.c:2193 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no es posible unir hilo load_cache_entries: %s" -#: read-cache.c:2226 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "%s: falló al abrir el archivo index" -#: read-cache.c:2230 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" -msgstr "%s: no se puede hacer stat del index abierto" +msgstr "%s: no se puede hacer stat en el índice abierto" -#: read-cache.c:2234 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: archivo index más pequeño de lo esperado" -#: read-cache.c:2238 +#: read-cache.c:2243 #, c-format -msgid "%s: unable to map index file" -msgstr "%s: no se pudo mapear el archivo index" +msgid "%s: unable to map index file%s" +msgstr "%s: no se pudo mapear el archivo index %s" -#: read-cache.c:2280 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no es posible crear hilo load_index_extensions: %s" -#: read-cache.c:2307 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no es posible unir hilo load_index_extensions: %s" -#: read-cache.c:2345 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" -msgstr "no se pudo refrescar el index compartido '%s'" +msgstr "no se pudo refrescar el índice compartido '%s'" -#: read-cache.c:2392 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index roto, se esperaba %s en %s, se obtuvo %s" -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3138 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "falló al convertir a un índice sparse" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" -msgstr "no se pudo definir '%s'" +msgstr "no se pudo hacer stat en '%s'" -#: read-cache.c:3222 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:3234 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "no es posible eliminar el vinculo: %s" -#: read-cache.c:3263 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "no se pudo arreglar bits de permisos en '%s'" -#: read-cache.c:3412 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" -msgstr "%s: no se puede eliminar a stage #0" +msgstr "%s: no se puede eliminar hasta stage #0" #: rebase-interactive.c:11 msgid "" @@ -6496,7 +6536,7 @@ msgstr "" "\t, a menos que se use -C, en cuyo caso\n" "\tmantiene solo el mensaje del commit; -c es lo mismo que -C\n" "\tpero abre el editor\n" -"x, exec <commit> = ejecuta comando ( el resto de la línea) usando un shell\n" +"x, exec <commit> = ejecuta comando (el resto de la línea) usando un shell\n" "b, break = parar aquí (continuar rebase luego con 'git rebase --continue')\n" "d, drop <commit> = eliminar commit\n" "l, label <label> = poner label al HEAD actual con un nombre\n" @@ -6522,7 +6562,7 @@ msgid "" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" -"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit\n" +"No elimines ninguna línea. Usa 'drop' explícitamente para borrar un commit.\n" #: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 msgid "" @@ -6556,8 +6596,8 @@ msgstr "" "Como sea, si quieres borrar todo, el rebase será abortado.\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "no se pudo escribir '%s'" @@ -6574,8 +6614,8 @@ msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -"Peligro: algunos commits pueden haber sido botados de forma accidental.\n" -"Commits botados (empezando con el más nuevo):\n" +"Peligro: algunos commits pueden haber sido descartados de forma accidental.\n" +"Commits descartados (empezando con el más nuevo):\n" #: rebase-interactive.c:203 #, c-format @@ -6592,7 +6632,7 @@ msgstr "" "\n" "Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de " "advertencias.\n" -"Los posibles comportamientos son: ignore,warn,error.\n" +"Los posibles comportamientos son: ignore, warn, error.\n" "\n" #: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 @@ -6602,7 +6642,7 @@ msgstr "" msgid "could not read '%s'." msgstr "no se puede leer '%s'." -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "desaparecido" @@ -6621,248 +6661,249 @@ msgstr "detrás %d" msgid "ahead %d, behind %d" msgstr "delante %d, detrás %d" -#: ref-filter.c:175 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:177 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:199 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valor entero esperado refname:lstrip=%s" -#: ref-filter.c:203 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor entero esperado refname:rstrip=%s" -#: ref-filter.c:205 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" -msgstr "argumento: %s no reconocido %%(%s)" +msgstr "argumento %%(%s) no reconocido: %s" -#: ref-filter.c:260 +#: ref-filter.c:315 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) no toma ningún argumento" -#: ref-filter.c:282 +#: ref-filter.c:339 #, c-format msgid "unrecognized %%(objectsize) argument: %s" -msgstr "%%(objectsize) no reconocido argumento: %s" +msgstr "argumento %%(objectsize) no reconocido: %s" -#: ref-filter.c:290 +#: ref-filter.c:347 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) no toma argumentos" -#: ref-filter.c:302 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningún argumento" -#: ref-filter.c:315 +#: ref-filter.c:372 #, c-format msgid "unrecognized %%(subject) argument: %s" -msgstr "argumento %%(sujeto) no reconocido: %s" +msgstr "argumento %%(subject) no reconocido: %s" -#: ref-filter.c:334 +#: ref-filter.c:391 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "se esperaba %%(trailers:key=<value>)" -#: ref-filter.c:336 +#: ref-filter.c:393 #, c-format msgid "unknown %%(trailers) argument: %s" -msgstr "%%(trailers) desconocidos, argumento: %s" +msgstr "argumento %%(trailers) desconocido: %s" -#: ref-filter.c:367 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:369 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" -msgstr "argumento %s no reconocido %%(contents)" +msgstr "argumento %%(contents) no reconocido: %s" -#: ref-filter.c:384 +#: ref-filter.c:441 #, c-format msgid "positive value expected '%s' in %%(%s)" -msgstr "valor positivo esperado '%s' en %% (%s)" +msgstr "valor positivo esperado '%s' en %%(%s)" -#: ref-filter.c:388 +#: ref-filter.c:445 #, c-format msgid "unrecognized argument '%s' in %%(%s)" -msgstr "argumento no reconocido:'%s' en %%(%s)" +msgstr "argumento '%s' no reconocido en %%(%s)" -#: ref-filter.c:402 +#: ref-filter.c:459 #, c-format msgid "unrecognized email option: %s" msgstr "opción de email desconocida: %s" -#: ref-filter.c:432 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posición>)" -#: ref-filter.c:444 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "posición desconocida: %s" -#: ref-filter.c:451 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:460 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:468 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el átomo %%(align)" -#: ref-filter.c:486 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" -msgstr "argumento: %s no reconocido %%(if)" +msgstr "argumento %%(if) no reconocido: %s" -#: ref-filter.c:588 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "nombre mal formado de campo: %.*s" -#: ref-filter.c:615 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:619 +#: ref-filter.c:676 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -"no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data" +"no es un repositorio git, pero el campo '%.*s' requiere acceso a los datos " +"de objeto" -#: ref-filter.c:743 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" -#: ref-filter.c:807 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: átomo %%(then) usado sin átomo %%(if)" -#: ref-filter.c:809 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: átomo %%(then) usado más de una vez" -#: ref-filter.c:811 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: átomo %%(then) usado después de %%(else)" -#: ref-filter.c:839 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" -#: ref-filter.c:841 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(then)" -#: ref-filter.c:843 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: átomo %%(else) usado más de una vez" -#: ref-filter.c:858 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: átomo %%(end) usado sin átomo correspondiente" -#: ref-filter.c:915 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "formato de cadena mal formado %s" -#: ref-filter.c:1556 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "(no hay rama, rebasando %s)" -#: ref-filter.c:1559 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" -msgstr "(no una rama, rebasando con HEAD desacoplado %s)" +msgstr "(no hay rama, rebasando con HEAD desacoplado %s)" -#: ref-filter.c:1562 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(no hay rama, comenzando biseccón en %s)" -#: ref-filter.c:1566 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD desacoplado en %s)" -#: ref-filter.c:1569 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD desacoplado de %s)" -#: ref-filter.c:1572 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "(sin rama)" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "falta objeto %s para %s" -#: ref-filter.c:1614 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:1997 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "objeto mal formado en '%s'" -#: ref-filter.c:2086 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" -#: ref-filter.c:2431 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2525 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto mal formado %s" -#: ref-filter.c:2530 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "opción '%s' debe apuntar a un commit" @@ -6890,13 +6931,12 @@ msgstr "" "predeterminado\n" "está sujeto a cambios. Para configurar el nombre de la rama inicial para " "usar en todos\n" -"de sus nuevos repositorios, que suprimirán esta advertencia, llame a:\n" +"de sus nuevos repositorios, reprimiendo esta advertencia, llame a:\n" "\n" "\tgit config --global init.defaultBranch <nombre>\n" "\n" -"Los nombres comúnmente elegidos en lugar de 'maestro' son 'principal', " -"'troncal' y\n" -"'desarrollo'. Se puede cambiar el nombre de la rama recién creada mediante " +"Los nombres comúnmente elegidos en lugar de 'master' son 'main', 'trunk' y\n" +"'development'. Se puede cambiar el nombre de la rama recién creada mediante " "este comando:\n" "\n" "\tgit branch -m <nombre>\n" @@ -6914,7 +6954,7 @@ msgstr "nombre de rama inválido: %s = %s" #: refs.c:674 #, c-format msgid "ignoring dangling symref %s" -msgstr "ignorando referencia rota %s" +msgstr "ignorando referencia symbólica rota %s" #: refs.c:922 #, c-format @@ -6944,7 +6984,7 @@ msgstr "update_ref falló para ref '%s': %s" #: refs.c:2051 #, c-format msgid "multiple updates for ref '%s' not allowed" -msgstr "múltiples actualizaciones para ref '%s' no permitidas" +msgstr "no se permiten múltiples actualizaciones para ref '%s'" #: refs.c:2131 msgid "ref updates forbidden inside quarantine environment" @@ -6952,7 +6992,7 @@ msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" #: refs.c:2142 msgid "ref updates aborted by hook" -msgstr "ref update abortado por el hook" +msgstr "ref updates abortados por el hook" #: refs.c:2242 refs.c:2272 #, c-format @@ -6978,7 +7018,7 @@ msgstr "no se pudo eliminar la referencia %s: %s" #: refs/files-backend.c:1245 refs/packed-backend.c:1555 #, c-format msgid "could not delete references: %s" -msgstr "no se pudo eliminar la referencia: %s" +msgstr "no se pudo eliminar las referencias: %s" #: refspec.c:170 #, c-format @@ -7026,7 +7066,7 @@ msgstr "valor '%s' del patrón no tiene '*'" #: remote.c:1083 #, c-format msgid "src refspec %s does not match any" -msgstr "src refsoec %s: no concuerda con ninguno" +msgstr "src refspec %s no concuerda con ninguno" #: remote.c:1088 #, c-format @@ -7050,8 +7090,8 @@ msgid "" "\n" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -"El destino que provees no es un full refname (i.e.,\n" -"comienza con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n" +"El destino que has provisto no es un full refname (i.e.,\n" +"uno que comience con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n" "\n" "- Buscando un ref que concuerde con '%s' en el lado remoto.\n" "- Revisando si el <src> es usado en el push('%s')\n" @@ -7079,8 +7119,8 @@ msgid "" "Did you mean to create a new tag by pushing to\n" "'%s:refs/tags/%s'?" msgstr "" -"The <src> part of the refspec is a tag object.\n" -"Did you mean to create a new tag by pushing to\n" +"La parte <src> del refspec es un objeto etiqueta.\n" +"¿Quisiste crear una etiqueta nueva mediante un push a\n" "'%s:refs/tags/%s'?" #: remote.c:1133 @@ -7092,7 +7132,7 @@ msgid "" msgstr "" "La parte <src> del refspec es un objeto tree.\n" "¿Quisiste crear un tag nuevo mediante un push a\n" -"'%s:refs/heads/%s'?" +"'%s:refs/tags/%s'?" #: remote.c:1138 #, c-format @@ -7103,12 +7143,12 @@ msgid "" msgstr "" "La parte <src> del refspec es un objeto blob.\n" "¿Quisiste crear un tag nuevo mediante un push a\n" -"'%s:refs/heads/%s'?" +"'%s:refs/tags/%s'?" #: remote.c:1174 #, c-format msgid "%s cannot be resolved to branch" -msgstr "%s no puede ser resolver a un branch" +msgstr "%s no puede ser resuelto a un branch" #: remote.c:1185 #, c-format @@ -7142,7 +7182,7 @@ msgstr "no se ha configurado upstream para la rama '%s'" #: remote.c:1742 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" -msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto" +msgstr "la rama '%s' de upstream no es guardada como rama de rastreo remoto" #: remote.c:1757 #, c-format @@ -7162,7 +7202,7 @@ msgstr "refspecs del push para '%s' no incluyen '%s'" #: remote.c:1792 msgid "push has no destination (push.default is 'nothing')" -msgstr "push no tiene destino (push.default es 'nada')" +msgstr "push no tiene destino (push.default es 'nothing')" #: remote.c:1814 msgid "cannot resolve 'simple' push to a single destination" @@ -7171,12 +7211,12 @@ msgstr "no se puede resolver push 'simple' para un destino único" #: remote.c:1943 #, c-format msgid "couldn't find remote ref %s" -msgstr "no se puedo encontrar ref remota %s" +msgstr "no se pudo encontrar ref remota %s" #: remote.c:1956 #, c-format msgid "* Ignoring funny ref '%s' locally" -msgstr "* Ignorando ref graciosa '%s' localmente" +msgstr "* Ignorando ref extraña '%s' localmente" #: remote.c:2119 #, c-format @@ -7237,7 +7277,7 @@ msgid_plural "" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" "Tu rama y '%s' han divergido,\n" -"y se tiene %d y %d commit diferentes en cada una respectivamente.\n" +"y tienen %d y %d commits diferentes cada una respectivamente.\n" msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" @@ -7264,7 +7304,7 @@ msgstr "duplicar ref de reemplazo: %s" #: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" -msgstr "remplazar profundiad muy elevada para objeto %s" +msgstr "profundiad de reemplazo demasiada para objeto %s" #: rerere.c:201 rerere.c:210 rerere.c:213 msgid "corrupt MERGE_RR" @@ -7322,10 +7362,10 @@ msgstr "no se puede desvincular stray '%s'" #: rerere.c:791 #, c-format msgid "Recorded preimage for '%s'" -msgstr "Resolución precargada para '%s'" +msgstr "Preimagen grabada para '%s'" -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" @@ -7348,7 +7388,7 @@ msgstr "no se puede desvincular '%s'" #: rerere.c:1071 #, c-format msgid "Updated preimage for '%s'" -msgstr "Actualizada preimagen para '%s'" +msgstr "Preimagen actualizada para '%s'" #: rerere.c:1080 #, c-format @@ -7363,46 +7403,45 @@ msgstr "no es posible abrir directorio rr-cache" msgid "could not determine HEAD revision" msgstr "no se pudo determinar revisión HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "falló al encontrar árbol de %s" -#: revision.c:2343 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" -msgstr "--unpacked=<packfile> ya no es soportado" +msgstr "--unpacked=<packfile> ya no es soportado" -#: revision.c:2683 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2686 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "tu rama actual '%s' no tiene ningún commit todavía" -#: revision.c:2892 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L no soporta todavía formatos de diff fuera de -p y -s" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "falló al abrir /dev/null" -#: run-command.c:1275 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "no es posible crear hilo async: %s" -#: run-command.c:1345 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" "El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n" -"Puedes desactivar esta advertencias con `git config advice.ignoredHook " -"false`." +"Puedes desactivar esta advertencia con `git config advice.ignoredHook false`." #: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" @@ -7432,27 +7471,27 @@ msgstr "" msgid "push negotiation failed; proceeding anyway with push" msgstr "negociación push falló; procediendo con el push de todas formas" -#: send-pack.c:520 +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "el destino no soporta el algoritmo de hash de este repositorio" -#: send-pack.c:529 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" -msgstr "el final receptor no soporta --signed push" +msgstr "el final receptor no soporta push --signed" -#: send-pack.c:531 +#: send-pack.c:537 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" "no se manda un certificado de push ya que el destino no soporta push firmado " -"(--signed )" +"(--signed)" -#: send-pack.c:543 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" -msgstr "el destino no soporta push atómicos (--atomic)" +msgstr "el destino no soporta push atómico (--atomic)" -#: send-pack.c:548 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" @@ -7469,7 +7508,7 @@ msgstr "no se pudo borrar '%s'" #: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 #, c-format msgid "could not remove '%s'" -msgstr "no se pudo eliminar'%s'" +msgstr "no se pudo eliminar '%s'" #: sequencer.c:354 msgid "revert" @@ -7512,7 +7551,7 @@ msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "no se pudo escribir en '%s'" @@ -7523,7 +7562,7 @@ msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3554 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "falló al finalizar '%s'" @@ -7535,7 +7574,7 @@ msgstr "tus cambios locales serán sobreescritos por %s." #: sequencer.c:490 msgid "commit your changes or stash them to proceed." -msgstr "realiza un commit con tus cambios o aplica un stash para proceder." +msgstr "realiza un commit con tus cambios o haz un stash para proceder." #: sequencer.c:522 #, c-format @@ -7557,7 +7596,7 @@ msgstr "%s: Incapaz de escribir el nuevo archivo índice" #: sequencer.c:685 msgid "unable to update cache tree" -msgstr "no es posible actualizar el árbol de la caché" +msgstr "no es posible actualizar el árbol de caché" #: sequencer.c:699 msgid "could not resolve HEAD commit" @@ -7571,10 +7610,10 @@ msgstr "no hay llave presente en '%.*s'" #: sequencer.c:790 #, c-format msgid "unable to dequote value of '%s'" -msgstr "no es posible dequote para '%s'" +msgstr "no es posible dequote valor de '%s'" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" @@ -7657,8 +7696,8 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "Tu nombre y correo fueron configurados automáticamente basados\n" -"en tu usuario y nombre de host. Por favor verifica que son correctos.\n" -"Tu puedes suprimir este mensaje configurándolos de forma explicita. Ejecuta " +"en tu usuario y nombre de host. Por favor verifica que sean correctos.\n" +"Tú puedes suprimir este mensaje configurándolos de forma explícita. Ejecuta " "el\n" "siguiente comando y sigue las instrucciones de tu editor\n" " para modificar tu archivo de configuración:\n" @@ -7683,8 +7722,8 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "Tu nombre y correo fueron configurados automáticamente basados\n" -"en tu usuario y nombre de host. Por favor verifica que son correctos.\n" -"Tu puedes suprimir este mensaje configurándolos de forma explicita:\n" +"en tu usuario y nombre de host. Por favor verifica que sean correctos.\n" +"Tú puedes suprimir este mensaje configurándolos de forma explícita:\n" "\n" " git config --global user.name \"Tu nombre\"\n" " git config --global user.email you@example.com\n" @@ -7722,7 +7761,7 @@ msgstr "no se pudo analizar HEAD" msgid "HEAD %s is not a commit!" msgstr "¡HEAD %s no es un commit!" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" @@ -7730,7 +7769,7 @@ msgstr "no se pudo analizar el commit de HEAD" msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" @@ -7746,14 +7785,15 @@ msgstr "identidad de autor inválida '%s'" #: sequencer.c:1491 msgid "corrupt author: missing date information" -msgstr "autor corrupto: falta información" +msgstr "autor corrupto: falta información de fecha" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "falló al escribir el objeto commit" -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" @@ -7805,7 +7845,7 @@ msgstr "no se puede escribir '%s'" msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" @@ -7866,7 +7906,7 @@ msgstr "no se pudo aplicar %s... %s" #: sequencer.c:2287 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n" +msgstr "descartando $%s %s -- contenidos del parche ya están en upstream\n" #: sequencer.c:2345 #, c-format @@ -7881,12 +7921,12 @@ msgstr "git %s: falló al refrescar el índice" #: sequencer.c:2425 #, c-format msgid "%s does not accept arguments: '%s'" -msgstr "%s no acepta los argumentos: '%s'" +msgstr "%s no acepta argumentos: '%s'" #: sequencer.c:2434 #, c-format msgid "missing arguments for %s" -msgstr "faltan argumentos para para %s" +msgstr "faltan argumentos para %s" #: sequencer.c:2477 #, c-format @@ -7901,7 +7941,7 @@ msgstr "línea inválida %d: %.*s" #: sequencer.c:2549 #, c-format msgid "cannot '%s' without a previous commit" -msgstr "no se puede '%s' sin un commit previo" +msgstr "no se puede '%s' sin un commit previo" #: sequencer.c:2635 msgid "cancelling a cherry picking in progress" @@ -7946,7 +7986,7 @@ msgstr "squash-onto inservible" msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" @@ -7977,7 +8017,7 @@ msgstr "no se pudo crear un directorio secuenciador '%s'" msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" @@ -7989,7 +8029,7 @@ msgstr "no se puede resolver HEAD" msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:3159 builtin/grep.c:759 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" @@ -8006,7 +8046,7 @@ msgstr "final de archivo inesperado" #: sequencer.c:3168 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto" +msgstr "archivo HEAD '%s' guardado antes de cherry-pick está corrupto" #: sequencer.c:3179 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" @@ -8037,7 +8077,7 @@ msgstr "" "¿ya has hecho el commit?\n" "intenta \"git %s --continue\"" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" @@ -8059,11 +8099,11 @@ msgid "" msgstr "" "Puedes enmendar el commit ahora, con\n" "\n" -"\tgit commit --amend %s\n" +" git commit --amend %s\n" "\n" "Una vez que estés satisfecho con los cambios, ejecuta\n" "\n" -"\tgit rebase --continue\n" +" git rebase --continue\n" #: sequencer.c:3446 #, c-format @@ -8121,90 +8161,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3571 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:3625 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "escribiendo commit raíz falso" -#: sequencer.c:3630 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: sequencer.c:3714 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3747 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versión actual" -#: sequencer.c:3769 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3778 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3790 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]" -#: sequencer.c:3806 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:3989 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" -msgstr "no se pudo intentar fusionar '%.*s'" +msgstr "ni se pudo intentar fusionar '%.*s'" -#: sequencer.c:4005 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "fusión: No se puede escribir el nuevo archivo índice" -#: sequencer.c:4079 +#: sequencer.c:4099 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: sequencer.c:4082 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Respuesta de stash inesperada: '%s'" -#: sequencer.c:4088 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "No se pudo crear el directorio para '%s'" -#: sequencer.c:4091 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" msgstr "Autostash creado: %s\n" -#: sequencer.c:4095 +#: sequencer.c:4115 msgid "could not reset --hard" msgstr "no se pudo reset --hard" -#: sequencer.c:4120 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:4132 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:4135 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -8216,29 +8256,29 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:4140 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." -msgstr "Apicar autostash resultó en conflictos." +msgstr "Aplicar autostash resultó en conflictos." -#: sequencer.c:4141 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash existe; creando una nueva entrada stash." -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" -msgstr "no se puede desacoplar HEAD" +msgstr "no se pudo desacoplar HEAD" -#: sequencer.c:4249 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:4251 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:4259 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -8259,58 +8299,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4305 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Aplicando rebase (%d/%d)%s" -#: sequencer.c:4351 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:4422 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:4481 +#: sequencer.c:4480 msgid "could not read orig-head" -msgstr "no se puede leer orig-head" +msgstr "no se pudo leer orig-head" -#: sequencer.c:4486 +#: sequencer.c:4485 msgid "could not read 'onto'" -msgstr "no se puede leer 'onto'" +msgstr "no se pudo leer 'onto'" -#: sequencer.c:4500 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" -msgstr "no se puede actualizar HEAD a %s" +msgstr "no se pudo actualizar HEAD a %s" -#: sequencer.c:4560 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n" -#: sequencer.c:4612 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:4621 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:4623 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "archivo inválido: '%s'" -#: sequencer.c:4625 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:4628 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8321,50 +8361,50 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:4719 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" -msgstr "no se puede eliminar CHERRY_PICK_HEAD" +msgstr "no se pudo eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4726 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:4846 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:4850 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s: revisión errónea" -#: sequencer.c:4885 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:5362 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:5365 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" -msgstr "make_script: error preparando revisiones" +msgstr "make_script: error al preparar revisiones" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:5651 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:5751 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." @@ -8417,103 +8457,107 @@ msgstr "" "no es posible configurar el directorio de trabajo usando una configuración " "inválida" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "esta operación debe ser realizada en un árbol de trabajo" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" -msgstr "Se esperaba versión de git repo <= %d, encontrada %d" +msgstr "Se esperaba versión de git repo <= %d, se encontró %d" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "se encontró extensión de repositorio desconocida:" +#: setup.c:666 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "se encontró extensión de repositorio desconocida:" +msgstr[1] "se encontraron extensiones de repositorio desconocidas:" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "versión de repo es 0, pero extensión v1-only encontrada:" +#: setup.c:680 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "versión de repo es 0, pero se encontró extensión v1-only:" +msgstr[1] "versión de repo es 0, pero se encontraron extensiones v1-only:" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" -msgstr "error abriendo '%s'" +msgstr "error al abrir '%s'" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" -msgstr "muy grande para ser un archivo .git: '%s'" +msgstr "demasiado grande para ser un archivo .git: '%s'" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" -msgstr "error leyendo %s" +msgstr "error al leer %s" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "formato gitfile inválido: %s" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "no hay ruta en gitfile: %s" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "no es un repositorio git: %s" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" -msgstr "'$%s' muy grande" +msgstr "'$%s' demasiado grande" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "no es un repositorio git: '%s'" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "no se puede aplicar chdir a '%s'" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "no se puede volver a cwd" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "falló al determinar '%*s%s%s'" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "no se puede cambiar a '%s'" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" "no es un repositorio git (ni ninguno de los directorios superiores): %s" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"no es un repositorio git ( o ningún padre en el punto de montado %s)\n" -"Parando en el límite del sistema de archivos " +"no es un repositorio git (ni ningún padre en el punto de montaje %s)\n" +"Parando a la frontera del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1370 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8522,27 +8566,27 @@ msgstr "" "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n" "El dueño de los archivos tiene que tener permisos de lectura y escritura." -#: setup.c:1417 +#: setup.c:1430 msgid "open /dev/null or dup failed" -msgstr "falló al abrir /dev/null o dup" +msgstr "falló al abrir /dev/null o hacer dup" -#: setup.c:1432 +#: setup.c:1445 msgid "fork failed" msgstr "falló fork" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "falló setsid" -#: sparse-index.c:151 +#: sparse-index.c:162 msgid "attempting to use sparse-index without cone mode" msgstr "intentando usar sparse-index sin modo cono" -#: sparse-index.c:156 +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" msgstr "no es posible actualizar el cache del árbol, manteniendo full" -#: sparse-index.c:239 +#: sparse-index.c:263 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "la entrada de índice es un directorio, pero no escazo (%08x)" @@ -8599,7 +8643,7 @@ msgid_plural "%u bytes/s" msgstr[0] "%u bytes/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" @@ -8613,7 +8657,7 @@ msgstr "no se pudo editar '%s'" #: submodule-config.c:237 #, c-format msgid "ignoring suspicious submodule name: %s" -msgstr "ignorando submódulo sospechoso: %s" +msgstr "ignorando nombre de submódulo sospechoso: %s" #: submodule-config.c:304 msgid "negative values not allowed for submodule.fetchjobs" @@ -8639,7 +8683,8 @@ msgstr "No se pudo actualizar la entrada %s de .gitmodules" #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -"No se puede cambiar .gitmodules no fusionados, resuelva este problema primero" +"No se puede cambiar .gitmodules no fusionados, primero resuelva los " +"conflictos de fusión" #: submodule.c:118 submodule.c:147 #, c-format @@ -8670,21 +8715,21 @@ msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" msgid "bad --ignore-submodules argument: %s" msgstr "mal argumento --ignore-submodules: %s" -#: submodule.c:818 +#: submodule.c:805 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "" -"Submódulo en el commit %s en ruta: '%s' colisiona con un submódulo llamado " -"igual. Saltandolo." +"Submódulo en el commit %s en la ruta: '%s' colisiona con un submódulo " +"llamado igual. Saltándolo." -#: submodule.c:921 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" -#: submodule.c:1006 +#: submodule.c:993 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8693,36 +8738,36 @@ msgstr "" "No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en " "el submódulo %s" -#: submodule.c:1129 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "proceso para submódulo '%s' falló" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "Falló al resolver HEAD como un ref válido." -#: submodule.c:1169 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Empujando submódulo '%s'\n" -#: submodule.c:1172 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "No es posible hacer push al submódulo '%s'\n" -#: submodule.c:1464 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Haciendo fetch al submódulo %s%s\n" -#: submodule.c:1498 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" -msgstr "No pudo acceder al submódulo '%s'\n" +msgstr "No se pudo acceder al submódulo '%s'\n" -#: submodule.c:1653 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8731,61 +8776,62 @@ msgstr "" "Errores durante el fetch del submódulo:\n" "%s" -#: submodule.c:1678 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1695 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "No se pudo ejecutar 'git status --procelain=2' en el submódulo %s" +msgstr "No se pudo ejecutar 'git status --porcelain=2' en el submódulo %s" -#: submodule.c:1736 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "'git status --procelain=2' falló en el submódulo %s" +msgstr "'git status --porcelain=2' falló en el submódulo %s" -#: submodule.c:1811 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no se pudo comenzar 'git status' en el submódulo '%s'" -#: submodule.c:1824 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" -#: submodule.c:1839 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'" -#: submodule.c:1866 submodule.c:2176 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" -msgstr "no pudo recursar en el submódulo '%s'" +msgstr "no se pudo recursar en el submódulo '%s'" -#: submodule.c:1887 +#: submodule.c:1874 msgid "could not reset submodule index" -msgstr "no se pudo reiniciar el index del submódulo" +msgstr "no se pudo reiniciar el índice del submódulo" -#: submodule.c:1929 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1981 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submódulo '%s' no pudo ser actualizado." -#: submodule.c:2049 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "submódulo git dir '%s' esta dentro de git dir '%.*s'" +msgstr "" +"directorio de git del submódulo '%s' está dentro del directorio de git '%.*s'" -#: submodule.c:2070 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8793,17 +8839,17 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:2086 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "rechazando mover '%s' dentro de un directorio git existente" -#: submodule.c:2093 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8814,11 +8860,11 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:2221 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2261 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolvió un código %d inesperado" @@ -8855,14 +8901,14 @@ msgstr "token de remolque vacío en el trailer '%.*s'" msgid "could not read input file '%s'" msgstr "no se pudo leer el archivo de entrada '%s'" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "no se pudo leer desde stdin" #: trailer.c:1024 wrapper.c:676 #, c-format msgid "could not stat %s" -msgstr "no se pudo definir %s" +msgstr "no se pudo hacer stat en %s" #: trailer.c:1026 #, c-format @@ -8894,7 +8940,7 @@ msgstr "no es posible encontrar helper remoto para '%s'" #: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" -msgstr "no se puede duplicar output de fd del helper" +msgstr "no se puede duplicar fd de salida del helper" #: transport-helper.c:214 #, c-format @@ -8935,17 +8981,17 @@ msgstr "no se pudo leer la referencia %s" #: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" -msgstr "respuesta para conectar desconocida: %s" +msgstr "respuesta al conectar desconocida: %s" #: transport-helper.c:616 msgid "setting remote service path not supported by protocol" -msgstr "configurando servicio de ruta remota no soportado por el protocolo" +msgstr "configurar servicio de ruta remota no soportado por el protocolo" #: transport-helper.c:618 msgid "invalid remote service path" msgstr "ruta de servicio remoto inválida" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "operación no soportada por protocolo" @@ -8954,7 +9000,7 @@ msgstr "operación no soportada por protocolo" msgid "can't connect to subservice %s" msgstr "no se puede conectar al subservicio %s" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:400 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only requiere protocolo v2" @@ -9031,7 +9077,7 @@ msgstr "" #: transport-helper.c:1224 #, c-format msgid "unsupported object format '%s'" -msgstr "formado de objeto no soportado '%s'" +msgstr "formato de objeto no soportado '%s'" #: transport-helper.c:1233 #, c-format @@ -9041,12 +9087,12 @@ msgstr "respuesta malformada en lista de refs: %s" #: transport-helper.c:1385 #, c-format msgid "read(%s) failed" -msgstr "leer(%s) falló" +msgstr "read(%s) falló" #: transport-helper.c:1412 #, c-format msgid "write(%s) failed" -msgstr "escribir(%s) falló" +msgstr "write(%s) falló" #: transport-helper.c:1461 #, c-format @@ -9087,46 +9133,46 @@ msgstr "Configurará upstream de '%s' a '%s' de '%s'\n" msgid "could not read bundle '%s'" msgstr "no se pudo leer el conjunto '%s'" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" -msgstr "transport: opción inválida '%s'" +msgstr "transport: opción de profundidad inválida '%s'" -#: transport.c:272 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "ver protocol.version en 'git help config' para más información" -#: transport.c:273 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "opciones del servidor requieren protocolo versión 2 o posterior" -#: transport.c:400 +#: transport.c:403 msgid "server does not support wait-for-done" msgstr "el servidor no soporta wait-for-done" -#: transport.c:751 +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "no se pudo analizar valor de configuración transport.color.*" -#: transport.c:826 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "soporte para protocolo v2 no implementado todavía" -#: transport.c:960 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconocido para configuración '%s': %s" -#: transport.c:1026 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "transporte '%s' no permitido" -#: transport.c:1079 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync ya no es soportado" -#: transport.c:1181 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -9135,7 +9181,7 @@ msgstr "" "La siguiente ruta de submódulo contiene cambios que no\n" "pueden ser encontrados en ningún remoto:\n" -#: transport.c:1185 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -9162,17 +9208,17 @@ msgstr "" "para hacer un push al remoto.\n" "\n" -#: transport.c:1193 +#: transport.c:1199 msgid "Aborting." msgstr "Abortando." -#: transport.c:1340 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "falló al hacer push a todos los submódulos necesarios" #: tree-walk.c:33 msgid "too-short tree object" -msgstr "objeto de árbol muy corto" +msgstr "objeto de árbol demasiado corto" #: tree-walk.c:39 msgid "malformed mode in tree entry" @@ -9184,7 +9230,7 @@ msgstr "nombre de archivo vacío en la entrada de árbol" #: tree-walk.c:118 msgid "too-short tree file" -msgstr "archivo de árbol muy corto" +msgstr "archivo de árbol demasiado corto" #: unpack-trees.c:115 #, c-format @@ -9195,7 +9241,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobrescritos por " "checkout:\n" "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar " -"ramas." +"de rama." #: unpack-trees.c:117 #, c-format @@ -9263,7 +9309,7 @@ msgid "" msgstr "" "Los siguientes archivos sin seguimiento en el árbol de trabajo serán " "eliminados al actualizar el árbol de trabajo:\n" -"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." +"%%sPor favor, muévelos o elimínalos antes de cambiar de rama." #: unpack-trees.c:138 #, c-format @@ -9272,7 +9318,7 @@ msgid "" "%%s" msgstr "" "Los siguientes archivos sin seguimiento del árbol de trabajo serán " -"eliminadosal actualizar el árbol de trabajo:\n" +"eliminados al actualizar el árbol de trabajo:\n" "%%s" #: unpack-trees.c:141 @@ -9291,8 +9337,8 @@ msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -"Los siguientes archivos sin seguimiento de árbol de trabajo serán " -"eliminadosal fusionar:\n" +"Los siguientes archivos sin seguimiento de árbol de trabajo serán eliminados " +"al fusionar:\n" "%%s" #: unpack-trees.c:146 @@ -9324,7 +9370,7 @@ msgid "" msgstr "" "Los siguientes archivos sin seguimiento en el árbol de trabajo serán " "sobrescritos al actualizar el árbol de trabajo:\n" -"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." +"%%sPor favor, muévelos o elimínalos antes de cambiar de rama." #: unpack-trees.c:156 #, c-format @@ -9374,13 +9420,13 @@ msgid "" "%%s" msgstr "" "Los siguientes archivos no rastreados en el árbol de trabajo serán " -"eliminadospor %s:\n" +"eliminados por %s:\n" "%%s" #: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." -msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir." +msgstr "Entrada '%s' se solapa con '%s'. No se pueden unir." #: unpack-trees.c:177 #, c-format @@ -9388,7 +9434,7 @@ msgid "" "Cannot update submodule:\n" "%s" msgstr "" -"No se puede actualizar le submódulo:\n" +"No se puede actualizar el submódulo:\n" "%s" #: unpack-trees.c:180 @@ -9398,8 +9444,8 @@ msgid "" "patterns:\n" "%s" msgstr "" -"La siguientes rutas no están actualizadas y fueron dejadas a pesar del " -"patrón especificado:\n" +"Las siguientes rutas no están actualizadas y fueron dejadas a pesar de los " +"patrones sparse:\n" "%s" #: unpack-trees.c:182 @@ -9420,7 +9466,7 @@ msgid "" "%s" msgstr "" "Las siguientes rutas ya estaban presentes y por eso no fueron actualizadas a " -"pesar del patrón especificado:\n" +"pesar de los patrones sparse:\n" "%s" #: unpack-trees.c:264 @@ -9447,15 +9493,15 @@ msgid "" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" -"las siguientes rutas han colisionado (p.e. rutas con case-sensitive\n" +"las siguientes rutas han colisionado (p.e. rutas case-sensitive\n" "en un filesystem case-insensitive) y solo una del grupo\n" "colisionando está en el árbol de trabajo:\n" -#: unpack-trees.c:1519 +#: unpack-trees.c:1618 msgid "Updating index flags" -msgstr "Actualizando flags del index" +msgstr "Actualizando flags del índice" -#: unpack-trees.c:2608 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" @@ -9480,7 +9526,7 @@ msgstr "falta host y el esquema no es 'file:'" #: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" -msgstr "un 'archivo:' URL puede no tener un número de puerto" +msgstr "un URL de 'file:' no puede tener número de puerto" #: urlmatch.c:247 msgid "invalid characters in host name" @@ -9488,7 +9534,7 @@ msgstr "carácter inválido en el nombre del host" #: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" -msgstr "numero de puerto inválido" +msgstr "número de puerto inválido" #: urlmatch.c:371 msgid "invalid '..' path segment" @@ -9498,104 +9544,104 @@ msgstr "segmento de ruta '..' inválido" msgid "Fetching objects" msgstr "Haciendo fetch a objetos" -#: worktree.c:238 builtin/am.c:2151 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "falló al leer '%s'" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' en el árbol de trabajo principal no es el directorio del repositorio" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de " "trabajo" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "'%s' no existe" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' no es un archivo .git, código de error %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' no apunta de vuelta a '%s'" -#: worktree.c:608 +#: worktree.c:603 msgid "not a directory" msgstr "no es un directorio" -#: worktree.c:617 +#: worktree.c:612 msgid ".git is not a file" msgstr ".git no es un archivo" -#: worktree.c:619 +#: worktree.c:614 msgid ".git file broken" msgstr "archivo .git roto" -#: worktree.c:621 +#: worktree.c:616 msgid ".git file incorrect" msgstr "archivo .git incorrecto" -#: worktree.c:727 +#: worktree.c:722 msgid "not a valid path" msgstr "no es una ruta válida" -#: worktree.c:733 +#: worktree.c:728 msgid "unable to locate repository; .git is not a file" msgstr "no es posible ubicar el repositorio; .git no es un archivo" -#: worktree.c:737 +#: worktree.c:732 msgid "unable to locate repository; .git file does not reference a repository" msgstr "" -"incapaz de localizar el repositorio; El archivo .git no hace referencia a un " +"incapaz de localizar el repositorio; el archivo .git no hace referencia a un " "repositorio" -#: worktree.c:741 +#: worktree.c:736 msgid "unable to locate repository; .git file broken" msgstr "no es posible ubicar el repositorio; archivo .git roto" -#: worktree.c:747 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "gitdir ilegible" -#: worktree.c:751 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "gitdir incorrecto" -#: worktree.c:776 +#: worktree.c:771 msgid "not a valid directory" msgstr "no en un directorio válido" -#: worktree.c:782 +#: worktree.c:777 msgid "gitdir file does not exist" msgstr "archivo gitdir no existe" -#: worktree.c:787 worktree.c:796 +#: worktree.c:782 worktree.c:791 #, c-format msgid "unable to read gitdir file (%s)" msgstr "no es posible leer archivo gitdir (%s)" -#: worktree.c:806 +#: worktree.c:801 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)" -#: worktree.c:814 +#: worktree.c:809 msgid "invalid gitdir file" msgstr "archivo gitdir inválido" -#: worktree.c:822 +#: worktree.c:817 msgid "gitdir file points to non-existent location" msgstr "archivo gitdir apunta a una ubicación inexistente" @@ -9640,18 +9686,18 @@ msgstr " (usa \"git add <archivo>...\" para marcar una resolución)" #: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -" (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la " +" (usa \"git add/rm <archivo>...\" como sea apropiado para marcar la " "resolución)" #: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (usa \"git rm <file>...\" para marcar la resolución)" -#: wt-status.c:211 wt-status.c:1075 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "Cambios a ser confirmados:" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "Cambios no rastreados para el commit:" @@ -9687,11 +9733,11 @@ msgstr "" #: wt-status.c:266 msgid "both deleted:" -msgstr "ambos borrados:" +msgstr "borrados por ambos:" #: wt-status.c:268 msgid "added by us:" -msgstr "agregado por nosotros:" +msgstr "agregados por nosotros:" #: wt-status.c:270 msgid "deleted by them:" @@ -9699,43 +9745,43 @@ msgstr "borrados por ellos:" #: wt-status.c:272 msgid "added by them:" -msgstr "agregado por ellos:" +msgstr "agregados por ellos:" #: wt-status.c:274 msgid "deleted by us:" -msgstr "borrado por nosotros:" +msgstr "borrados por nosotros:" #: wt-status.c:276 msgid "both added:" -msgstr "ambos agregados:" +msgstr "agregados por ambos:" #: wt-status.c:278 msgid "both modified:" -msgstr "ambos modificados:" +msgstr "modificados por ambos:" #: wt-status.c:288 msgid "new file:" -msgstr "nuevo archivo:" +msgstr "nuevos archivos:" #: wt-status.c:290 msgid "copied:" -msgstr "copiado:" +msgstr "copiados:" #: wt-status.c:292 msgid "deleted:" -msgstr "borrado:" +msgstr "borrados:" #: wt-status.c:294 msgid "modified:" -msgstr "modificado:" +msgstr "modificados:" #: wt-status.c:296 msgid "renamed:" -msgstr "renombrado:" +msgstr "renombrados:" #: wt-status.c:298 msgid "typechange:" -msgstr "cambio de tipo:" +msgstr "cambios de tipo:" #: wt-status.c:300 msgid "unknown:" @@ -9743,7 +9789,7 @@ msgstr "desconocido:" #: wt-status.c:302 msgid "unmerged:" -msgstr "des-fusionado:" +msgstr "sin fusión:" #: wt-status.c:382 msgid "new commits, " @@ -9757,30 +9803,30 @@ msgstr "contenido modificado, " msgid "untracked content, " msgstr "contenido no rastreado, " -#: wt-status.c:908 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Tu stash actualmente tiene %d entrada" msgstr[1] "Tu stash actualmente tiene %d entradas" -#: wt-status.c:939 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "Submódulos cambiados pero no actualizados:" -#: wt-status.c:941 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "Submódulos cambiados listos para realizar commit:" -#: wt-status.c:1023 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -"No modifique o borre la línea de encima.\n" -"Todo lo que este por abajo será eliminado." +"No modifique ni borre la línea de encima.\n" +"Todo lo que esté por abajo será ignorado." -#: wt-status.c:1115 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9791,107 +9837,107 @@ msgstr "" "Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n" "Puedes usar '--no-ahead-behind' para evitar esto.\n" -#: wt-status.c:1145 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "Tienes rutas no fusionadas." -#: wt-status.c:1148 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" -msgstr " (arregla los conflictos y corre \"git commit\"" +msgstr " (arregla los conflictos y ejecuta \"git commit\"" -#: wt-status.c:1150 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (usa \"git merge --abort\" para abortar la fusion)" -#: wt-status.c:1154 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "Todos los conflictos resueltos pero sigues fusionando." -#: wt-status.c:1157 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " (usa \"git commit\" para concluir la fusión)" -#: wt-status.c:1166 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "Estás en medio de una sesión am." -#: wt-status.c:1169 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "El parche actual está vacío." -#: wt-status.c:1173 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" -msgstr " (arregla los conflictos y luego corre \"git am --continue\"" +msgstr " (arregla los conflictos y luego ejecuta \"git am --continue\"" -#: wt-status.c:1175 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" para saltar este parche)" -#: wt-status.c:1177 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" para restaurar la rama original)" -#: wt-status.c:1310 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo no está presente." -#: wt-status.c:1312 +#: wt-status.c:1362 msgid "No commands done." msgstr "No se realizaron los comandos." -#: wt-status.c:1315 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "El último comando realizado (%d comando realizado):" msgstr[1] "Los últimos comandos realizados (%d comandos realizados):" -#: wt-status.c:1326 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " (ver más en el archivo %s)" -#: wt-status.c:1331 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "No quedan más comandos." -#: wt-status.c:1334 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Siguiente comando a realizar (%d comando restante):" -msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):" +msgstr[1] "Siguientes comandos a realizar (%d comandos faltantes):" -#: wt-status.c:1342 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" -#: wt-status.c:1354 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "Estás aplicando un rebase de la rama '%s' en '%s." +msgstr "Estás aplicando un rebase de la rama '%s' sobre '%s." -#: wt-status.c:1359 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "Estás aplicando un rebase." -#: wt-status.c:1372 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")" -#: wt-status.c:1374 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (usa \"git rebase --skip\" para omitir este parche)" -#: wt-status.c:1376 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (usa \"git rebase --abort\" para volver a tu rama original)" -#: wt-status.c:1383 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")" -#: wt-status.c:1387 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9899,157 +9945,161 @@ msgstr "" "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1392 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "Estás dividiendo un commit durante un rebase." -#: wt-status.c:1395 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --" "continue\")" -#: wt-status.c:1399 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -"Estás editando un commit mientras se aplica un rebase de la rama '%s' en " +"Estás editando un commit mientras se aplica un rebase de la rama '%s' sobre " "'%s'." -#: wt-status.c:1404 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "Estás editando un commit durante un rebase." -#: wt-status.c:1407 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (usa \"git commit --amend\" para enmendar el commit actual)" -#: wt-status.c:1409 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (usa \"git rebase --continue\" una vez que estés satisfecho con tus " "cambios)" -#: wt-status.c:1420 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick en progreso actualmente." -#: wt-status.c:1423 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Estás realizando un cherry-picking en el commit %s." -#: wt-status.c:1430 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1433 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)" -#: wt-status.c:1436 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1438 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (usa \"git cherry-pick --skip\" para saltar este parche)" -#: wt-status.c:1440 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" -#: wt-status.c:1450 +#: wt-status.c:1500 msgid "Revert currently in progress." -msgstr "Revierte el estado en progreso actual." +msgstr "Reversión en progreso actualmente." -#: wt-status.c:1453 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "Estás revirtiendo el commit %s." -#: wt-status.c:1459 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")" -#: wt-status.c:1462 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " (ejecuta \"git revert --continue\" para continuar)" -#: wt-status.c:1465 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" -#: wt-status.c:1467 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (usa \"git revert --skip\" para omitir este parche)" -#: wt-status.c:1469 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)" -#: wt-status.c:1479 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Estás aplicando un bisect, comenzando en la rama '%s'." -#: wt-status.c:1483 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "Estás aplicando un bisect." -#: wt-status.c:1486 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" para volver a la rama original)" -#: wt-status.c:1497 +#: wt-status.c:1547 +msgid "You are in a sparse checkout." +msgstr "Estás en un sparse checkout." + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Estas en un checkout de sparse con %d%% archivos rastreados presentes." -#: wt-status.c:1736 +#: wt-status.c:1794 msgid "On branch " msgstr "En la rama " -#: wt-status.c:1743 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " -msgstr "rebase interactivo en progreso; en " +msgstr "rebase interactivo en progreso; sobre " -#: wt-status.c:1745 +#: wt-status.c:1803 msgid "rebase in progress; onto " -msgstr "rebase en progreso; en " +msgstr "rebase en progreso; sobre " -#: wt-status.c:1750 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "HEAD desacoplada en " -#: wt-status.c:1752 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "HEAD desacoplada de " -#: wt-status.c:1755 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "Actualmente no estás en ninguna rama." -#: wt-status.c:1772 +#: wt-status.c:1830 msgid "Initial commit" msgstr "Confirmación inicial" -#: wt-status.c:1773 +#: wt-status.c:1831 msgid "No commits yet" msgstr "No hay commits todavía" -#: wt-status.c:1787 +#: wt-status.c:1845 msgid "Untracked files" msgstr "Archivos sin seguimiento" -#: wt-status.c:1789 +#: wt-status.c:1847 msgid "Ignored files" msgstr "Archivos ignorados" -#: wt-status.c:1793 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -10060,31 +10110,31 @@ msgstr "" "puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n" "nuevos archivos tú mismo (vea 'git help status')." -#: wt-status.c:1799 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" -msgstr "Archivos no rastreados no son mostrados %s" +msgstr "Archivos no rastreados no son mostrados%s" -#: wt-status.c:1801 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" -#: wt-status.c:1807 +#: wt-status.c:1865 msgid "No changes" msgstr "Sin cambios" -#: wt-status.c:1812 +#: wt-status.c:1870 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n" -#: wt-status.c:1816 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1820 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -10093,85 +10143,85 @@ msgstr "" "no hay nada agregado al commit pero hay archivos sin seguimiento presentes " "(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1824 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "no hay nada agregado para confirmar, pero hay archivos sin seguimiento " "presentes\n" -#: wt-status.c:1828 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para " "hacerles seguimiento)\n" -#: wt-status.c:1832 wt-status.c:1838 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1835 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n" -#: wt-status.c:1840 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nada para hacer commit, el árbol de trabajo está limpio\n" -#: wt-status.c:1945 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "No hay commits todavía en " -#: wt-status.c:1949 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1980 +#: wt-status.c:2038 msgid "different" msgstr "diferente" -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "detrás " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "adelante " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2517 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." -#: wt-status.c:2519 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit." -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:182 msgid "could not send IPC command" msgstr "no se pudo enviar el comando IPC" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:189 msgid "could not read IPC response" msgstr "no se pudo leer la respuesta IPC" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: compat/simple-ipc/ipc-unix-socket.c:866 #, c-format msgid "could not start accept_thread '%s'" msgstr "no se pudo iniciar el accept_thread '%s'" -#: compat/simple-ipc/ipc-unix-socket.c:874 +#: compat/simple-ipc/ipc-unix-socket.c:878 #, c-format msgid "could not start worker[0] for '%s'" msgstr "no se pudo iniciar el worker[0] para '%s'" @@ -10183,7 +10233,7 @@ msgstr "falló al desvincular '%s'" #: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." -msgstr "git add [<opción>] [--] <especificación-de-ruta>..." +msgstr "git add [<opciones>] [--] <especificación-de-ruta>..." #: builtin/add.c:61 #, c-format @@ -10197,7 +10247,7 @@ msgstr "diff status inesperado %c" #: builtin/add.c:104 builtin/commit.c:297 msgid "updating files failed" -msgstr "falló la actualización de carpetas" +msgstr "falló la actualización de archivos" #: builtin/add.c:114 #, c-format @@ -10208,7 +10258,7 @@ msgstr "eliminar '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del área de stage tras refrescar el índice:" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "No se pudo leer el índice" @@ -10228,7 +10278,7 @@ msgstr "falló la edición del parche" #: builtin/add.c:328 #, c-format msgid "Could not stat '%s'" -msgstr "No se pudo definir '%s'" +msgstr "No se pudo hacer stat en '%s'" #: builtin/add.c:330 msgid "Empty patch. Aborted." @@ -10244,19 +10294,19 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n" -#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 #: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" -msgstr "dry run ( ejecución en seco)" +msgstr "dry run (ejecución en seco)" #: builtin/add.c:366 msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" -msgstr "elegir hunks de forma interactiva" +msgstr "elegir fragmentos de forma interactiva" #: builtin/add.c:368 msgid "edit current diff and apply" @@ -10264,11 +10314,11 @@ msgstr "editar diff actual y aplicar" #: builtin/add.c:369 msgid "allow adding otherwise ignored files" -msgstr "permitir agregar caso contrario ignorar archivos" +msgstr "permitir agregar archivos que de otro modo se ignoren" #: builtin/add.c:370 msgid "update tracked files" -msgstr "actualizado las carpetas rastreadas" +msgstr "actualizar los archivos rastreados" #: builtin/add.c:371 msgid "renormalize EOL of tracked files (implies -u)" @@ -10276,11 +10326,11 @@ msgstr "renormalizar EOL de los archivos rastreados (implica -u)" #: builtin/add.c:372 msgid "record only the fact that the path will be added later" -msgstr "grabar solo el hecho de que la ruta será agregada después" +msgstr "grabar solo el hecho de que la ruta será agregada luego" #: builtin/add.c:373 msgid "add changes from all tracked and untracked files" -msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" +msgstr "agregar los cambios de todos los archivos con y sin seguimiento" #: builtin/add.c:376 msgid "ignore paths removed in the working tree (same as --no-all)" @@ -10293,11 +10343,12 @@ msgstr "no agregar, solo actualizar el índice" #: builtin/add.c:379 msgid "just skip files which cannot be added because of errors" -msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores" +msgstr "saltar los archivos que no pueden ser agregados a causa de errores" #: builtin/add.c:380 msgid "check if - even missing - files are ignored in dry run" -msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run" +msgstr "" +"comprobar si los archivos - incluso los que faltan - se ignoran en dry run" #: builtin/add.c:382 builtin/update-index.c:1006 msgid "override the executable bit of the listed files" @@ -10330,12 +10381,12 @@ msgid "" msgstr "" "Se ha agregado otro repositorio de git dentro del repositorio actual.\n" "Clones del repositorio exterior no tendrán el contenido del\n" -"repositorio embebido y no sabrán como obtenerla.\n" +"repositorio embebido y no sabrán como obtenerlo.\n" "Si querías agregar un submódulo, usa:\n" "\n" "\tgit submodule add <url> %s\n" "\n" -"Si se agrego esta ruta por error, puedes eliminar desde el índice\n" +"Si se agregó esta ruta por error, puedes eliminarla del índice\n" "usando:\n" "\n" "\tgit rm --cached %s\n" @@ -10345,7 +10396,7 @@ msgstr "" #: builtin/add.c:432 #, c-format msgid "adding embedded git repository: %s" -msgstr "agregando repositorio embebido: %s" +msgstr "agregando repositorio de git embebido: %s" #: builtin/add.c:451 msgid "" @@ -10384,15 +10435,15 @@ msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run" #: builtin/add.c:526 #, c-format msgid "--chmod param '%s' must be either -x or +x" -msgstr "El parámetro '%s' para --chmod debe ser -x ó +x" +msgstr "El parámetro '%s' para --chmod debe ser -x o +x" -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file es incompatible con argumentos de pathspec" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul requiere --pathspec-from-file" @@ -10407,140 +10458,140 @@ msgid "" "Turn this message off by running\n" "\"git config advice.addEmptyPathspec false\"" msgstr "" -"¿Tal vez quisiste decir 'git add.'?\n" +"¿Tal vez quisiste decir 'git add .'?\n" "Desactiva este mensage ejecutando\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:364 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "no se pudo analizar el script del autor" -#: builtin/am.c:454 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' fue borrado por el hook de applypatch-msg" -#: builtin/am.c:496 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." -msgstr "Línea mal formada: '%s'." +msgstr "Línea de entrada mal formada: '%s'." -#: builtin/am.c:534 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Falló al copiar notas de '%s' a '%s'" -#: builtin/am.c:560 +#: builtin/am.c:561 msgid "fseek failed" -msgstr "fall de fseek" +msgstr "fallo de fseek" -#: builtin/am.c:748 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "no se pudo analizar el parche '%s'" -#: builtin/am.c:813 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" -msgstr "Solo un parche StGIT puede ser aplicado de una vez" +msgstr "Solo un parche StGIT puede ser aplicado a la vez" -#: builtin/am.c:861 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "timestamp inválido" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "línea Date inválida" -#: builtin/am.c:873 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "offset de zona horaria inválido" -#: builtin/am.c:966 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "falló al crear el directorio '%s'" -#: builtin/am.c:976 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "Falló al dividir parches." -#: builtin/am.c:1125 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"." -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"." -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -"Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort" +"Para restaurar la rama original y detener el parcheo, ejecutar \"%s --abort" "\"." -#: builtin/am.c:1222 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -"Parche mandado con formato=flowed; espacios al final de las líneas tal vez " +"Parche enviado con format=flowed; espacios al final de las líneas tal vez " "desaparezcan." -#: builtin/am.c:1250 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "El parche está vacío." -#: builtin/am.c:1315 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" -msgstr "falta línea autor en commit %s" +msgstr "falta línea de autor en commit %s" -#: builtin/am.c:1318 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" -msgstr "sangría no válida: %.*s" +msgstr "línea de identificación no válida: %.*s" -#: builtin/am.c:1537 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Repositorio carece de los blobs necesarios para retroceder en una fusión de " -"3-vías." +"3 vías." -#: builtin/am.c:1539 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la información del índice para reconstruir un árbol base..." -#: builtin/am.c:1558 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" "¿Editaste el parche a mano?\n" -"No aplica a blobs guardados en su índice." +"No aplica a los blobs registrados en su índice." -#: builtin/am.c:1564 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." -msgstr "Retrocediendo para parchar base y fusión de 3-vías..." +msgstr "Retrocediendo para parchar base y fusionar de 3 vías..." -#: builtin/am.c:1590 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." -msgstr "Falló al fusionar en los cambios." +msgstr "Falló al fusionar los cambios." -#: builtin/am.c:1622 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "aplicando a un historial vacío" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1696 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -10548,49 +10599,49 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "¿Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1752 builtin/commit.c:408 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" -msgstr "no es posible escribir en el archivo índice" +msgstr "no es posible escribir el archivo índice" -#: builtin/am.c:1756 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1813 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." -msgstr "Sin cambios -- parche ya aplicado." +msgstr "Sin cambios -- Parche ya aplicado." -#: builtin/am.c:1819 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche falló en %s %.*s" -#: builtin/am.c:1823 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido" -#: builtin/am.c:1867 +#: builtin/am.c:1868 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 "" "Sin cambios - ¿olvidaste usar 'git add'?\n" -"Si no hay nada en el área de stage, las posibilidad es que algo mas\n" -"ya haya introducido el mismo cambio; tal vez quieras omitir este parche." +"Si no hay nada en el área de stage, lo más probable es que algo más\n" +"ya ha introducido el mismo cambio; tal vez quieras omitir este parche." -#: builtin/am.c:1874 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10598,22 +10649,22 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "Todavía tienes rutas sin fusionar en tu índice.\n" -"Debes realizar 'git add' cada archivo con conflictos resueltos y marcarlos " -"como tal.\n" +"Debes realizar 'git add' en cada archivo con conflictos resueltos para " +"marcarlos como tal.\n" "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" " "en él." -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:2033 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "falló al limpiar el índice" -#: builtin/am.c:2077 +#: builtin/am.c:2078 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10621,91 +10672,91 @@ msgstr "" "Parece haber movido HEAD desde el último falló 'am'.\n" "No rebobinando a ORIG_HEAD" -#: builtin/am.c:2184 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido para --patch-format: %s" -#: builtin/am.c:2226 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valor inválido para --show-current-patch: %s" -#: builtin/am.c:2230 +#: builtin/am.c:2231 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s" -#: builtin/am.c:2261 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2262 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2268 +#: builtin/am.c:2269 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2270 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2272 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" -msgstr "permitir retroceso en fusión de 3-vías si es necesario" +msgstr "permitir retroceso en fusión de 3 vías si es necesario" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:948 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" -msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" +msgstr "agregar una línea \"Signed-off-by\" al mensaje del commit" -#: builtin/am.c:2278 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2282 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2284 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" -#: builtin/am.c:2289 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2294 +#: builtin/am.c:2295 msgid "pass it through git-mailinfo" msgstr "pasarlo a través de git-mailinfo" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 -#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 #: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 #: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 @@ -10714,67 +10765,67 @@ msgstr "pasarlo a través de git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 #: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2321 +#: builtin/am.c:2322 msgid "format the patch(es) are in" -msgstr "formatear el parche(s)" +msgstr "formato de los parches" -#: builtin/am.c:2327 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" -msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" +msgstr "sobrescribir mensaje de error cuando fallos de parcheo ocurran" -#: builtin/am.c:2329 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2332 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2335 +#: builtin/am.c:2336 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2338 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "restaurar la rama original y abortar la operación de parcheo" -#: builtin/am.c:2341 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" msgstr "abortar la operación de parcheo pero mantener HEAD donde está" -#: builtin/am.c:2345 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "muestra el parche siendo aplicado" -#: builtin/am.c:2350 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2352 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 #: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 #: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" -msgstr "Commits con firma GPG" +msgstr "firmar los commits con GPG" -#: builtin/am.c:2358 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2376 +#: builtin/am.c:2377 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." @@ -10782,16 +10833,16 @@ msgstr "" "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" "será eliminada. Por favor no la use más." -#: builtin/am.c:2383 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "falló al leer el índice" -#: builtin/am.c:2398 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." -msgstr "directorio de rebase previo %s todavía existe en el mbox dado." +msgstr "directorio de rebase previo %s todavía existe pero un mbox fue dado." -#: builtin/am.c:2422 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10800,11 +10851,11 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2428 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." -#: builtin/am.c:2438 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "modo interactivo requiere parches en la línea de comando" @@ -10815,11 +10866,11 @@ msgstr "git apply [<opciones>] [<parche>...]" #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" -msgstr "no se pudo crear el archivo comprimido '%s'" +msgstr "no se pudo crear el archivo de crónica '%s'" #: builtin/archive.c:20 msgid "could not redirect output" -msgstr "no se pudo direccionar la salida" +msgstr "no se pudo redirigir la salida" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" @@ -10882,7 +10933,7 @@ msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]" #: builtin/bisect--helper.c:31 msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <archivio>" +msgstr "git bisect--helper --bisect-replay <archivo>" #: builtin/bisect--helper.c:32 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" @@ -10898,36 +10949,36 @@ msgstr "no se puede abrir archivo '%s' en modo '%s'" msgid "could not write to file '%s'" msgstr "no se pudo escribir al archivo '%s'" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:155 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' no es un término válido" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:159 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "no se puede usar el comando nativo '%s' como un término" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:169 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "no se puede cambiar el significado del término '%s'" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" msgstr "por favor use dos términos diferentes" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:195 #, c-format msgid "We are not bisecting.\n" msgstr "No estamos bisecando.\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:203 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' no es un commit válido" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:212 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10935,36 +10986,36 @@ msgstr "" "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:256 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mal argumento bisect_write: %s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:261 #, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "no se puede obtener el oid de la rev '%s'" +msgstr "no se pudo obtener el oid de la rev '%s'" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't open the file '%s'" msgstr "no se pudo abrir el archivo '%s'" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:299 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:326 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -"Tienes que dar al menos un %s y un %s revision.\n" +"Tienes que dar al menos una revisión %s y una %s.\n" "Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso." -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:330 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10972,10 +11023,10 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" "Tienes que comenzar por \"git bisect start\".\n" -"Después tienes que entregar al menos un %s y una revision %s.\n" +"Después tienes que entregar al menos una revisión %s y una %s.\n" "Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso." -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:350 #, c-format msgid "bisecting only with a %s commit" msgstr "haciendo bisect solo con un commit %s" @@ -10984,15 +11035,15 @@ msgstr "haciendo bisect solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " msgstr "¿Estás seguro [Y/n]? " -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:419 msgid "no terms defined" msgstr "no hay términos definidos" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -11001,7 +11052,7 @@ msgstr "" "Tus términos actuales son %s para el estado viejo\n" "y %s para el estado nuevo.\n" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:432 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -11010,53 +11061,53 @@ msgstr "" "argumento inválido %s para 'git bisect terms'.\n" "Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new." -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 msgid "revision walk setup failed\n" -msgstr "la configuración del recorrido de revisión falló\n" +msgstr "la configuración del recorrido de revisiones falló\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:521 #, c-format msgid "could not open '%s' for appending" msgstr "no se pudo abrir '%s' en modo append" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 msgid "'' is not a valid term" msgstr "'' no es un término válido" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:663 #, c-format msgid "unrecognized option: '%s'" msgstr "opción desconocida: '%s'" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:667 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' no parece ser una revisión válida" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:698 msgid "bad HEAD - I need a HEAD" msgstr "mal HEAD - Necesito un HEAD" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:713 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'." -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" msgstr "no se bisecará en un árbol con cg-seek" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:737 msgid "bad HEAD - strange symbolic ref" msgstr "mal HEAD - ref simbólico extraño" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:757 #, c-format msgid "invalid ref: '%s'" msgstr "ref inválido: '%s'" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:815 msgid "You need to start by \"git bisect start\"\n" msgstr "Debes iniciar con \"git bisect start\"\n" @@ -11064,114 +11115,114 @@ msgstr "Debes iniciar con \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " msgstr "¿Quieres que lo haga por ti [Y/n]? " -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" msgstr "Llame a `--bisect-state` con al menos un argumento" -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:857 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' solo puede tomar un argumento." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" msgstr "Mala entrada rev: %s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:889 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Mala entrada rev (no es un commit): %s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." msgstr "No estamos bisecando." -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" -msgstr "'%s'?? ¿De qué estás hablando?" +msgstr "¿¿'%s'?? ¿De qué estás hablando?" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" msgstr "no se puede leer '%s' para reproducir" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" msgstr "reiniciar el estado de bisect" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "revisar si existen términos malos o buenos" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" msgstr "imprimir los terms del bisect" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "comenzar la sesión de bisect" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" msgstr "encontrar el siguiente commit de bisección" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "marcar el estado de ref (o refs)" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" msgstr "listar los pasos de bisección hasta ahora" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" msgstr "reproducir el proceso de bisección del archivo dado" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" msgstr "saltar algunos commits para checkout" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" msgstr "no hay log para BISECT_WRITE" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset requiere un commit o ningún argumento" +msgstr "--bisect-reset requiere o un commit o ningún argumento" -#: builtin/bisect--helper.c:1092 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check requiere 2 o 3 argumentos" -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requiere 0 o 1 argumentos" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next requiere 0 argumentos" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log requiere 0 argumentos" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" msgstr "ningún logfile proporcionado" #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" -msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" +msgstr "git blame [<opciones>] [<opciones-de-rev>] [<revisión>] [--] <archivo>" #: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" -msgstr "<rev-opts> están documentadas en git-rev-list(1)" +msgstr "<opciones-de-rev> están documentadas en git-rev-list(1)" #: builtin/blame.c:410 #, c-format @@ -11194,7 +11245,7 @@ msgstr "valor inválido para blame.coloring" #: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" -msgstr "no se pudo encontrar revision %s para ignorar" +msgstr "no se pudo encontrar revisión %s para ignorar" #: builtin/blame.c:867 msgid "show blame entries as we find them, incrementally" @@ -11212,10 +11263,10 @@ msgstr "no tratar commits raíces como extremos (Default: off)" msgid "show work cost statistics" msgstr "mostrar estadísticas de costo de trabajo" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "forzar el reporte de progreso" @@ -11241,7 +11292,7 @@ msgstr "mostrar en formato porcelana con información de commit por línea" #: builtin/blame.c:877 msgid "use the same output mode as git-annotate (Default: off)" -msgstr "usar el mismo modo salida como git-annotate (Default: off)" +msgstr "usar el mismo modo de salida como git-annotate (Default: off)" #: builtin/blame.c:878 msgid "show raw timestamp (Default: off)" @@ -11257,13 +11308,13 @@ msgstr "suprimir nombre del autor y timestamp (Default: off)" #: builtin/blame.c:881 msgid "show author email instead of name (Default: off)" -msgstr "mostrar en cambio el email del autor (Default: off)" +msgstr "mostrar el email del autor en cambio de su nombre (Default: off)" #: builtin/blame.c:882 msgid "ignore whitespace differences" msgstr "ignorar diferencias de espacios en blanco" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" msgstr "rev" @@ -11285,11 +11336,11 @@ msgstr "colorear líneas por edad" #: builtin/blame.c:887 msgid "spend extra cycles to find better match" -msgstr "ocupar más ciclos para encontrar mejoras resultados" +msgstr "ocupar más ciclos para encontrar mejores resultados" #: builtin/blame.c:888 msgid "use revisions from <file> instead of calling git-rev-list" -msgstr "use revisiones desde <archivo> en lugar de llamar git-rev-list" +msgstr "use revisiones en <archivo> en lugar de llamar git-rev-list" #: builtin/blame.c:889 msgid "use <file>'s contents as the final image" @@ -11314,11 +11365,13 @@ msgstr "rango" #: builtin/blame.c:893 msgid "process only line range <start>,<end> or function :<funcname>" msgstr "" -"Procesar solo el rango de líneas <inicio>,<fin> o función: <nombre-función>" +"procesar solo el rango de líneas <inicio>,<fin> o función :<nombre-de-" +"función>" #: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "--progress no puede ser usado con --incremental o formatos porcelana" +msgstr "" +"--progress no puede ser usado con --incremental o formatos de porcelana" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -11386,8 +11439,8 @@ msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -"no borrando rama '%s' que todavía no ha sido fusionada\n" -"\ta '%s', aunque se fusione con HEAD." +"no borrando rama '%s' que todavía no ha sido fusionada a\n" +" '%s', aunque se ha fusionado con HEAD." #: builtin/branch.c:172 #, c-format @@ -11409,7 +11462,7 @@ msgstr "Falló de actualización de config-file" #: builtin/branch.c:223 msgid "cannot use -a with -d" -msgstr "no se puede usar-a con -d" +msgstr "no se puede usar -a con -d" #: builtin/branch.c:230 msgid "Couldn't look up commit object for HEAD" @@ -11438,7 +11491,7 @@ msgstr "Eliminada la rama de rastreo remota %s (era %s).\n" #: builtin/branch.c:292 #, c-format msgid "Deleted branch %s (was %s).\n" -msgstr "Eliminada la rama %s (era %s)..\n" +msgstr "Eliminada la rama %s (era %s).\n" #: builtin/branch.c:440 builtin/tag.c:63 msgid "unable to parse format string" @@ -11482,7 +11535,7 @@ msgstr "Cambio de nombre de rama fallido" #: builtin/branch.c:557 msgid "Branch copy failed" -msgstr "Copiado de rama fallido" +msgstr "Duplicación de rama fallida" #: builtin/branch.c:561 #, c-format @@ -11560,15 +11613,15 @@ msgstr "usar salida con colores" #: builtin/branch.c:642 msgid "act on remote-tracking branches" -msgstr "actuar en ramas de traqueo remoto" +msgstr "actuar en ramas de rastreo remoto" #: builtin/branch.c:644 builtin/branch.c:646 msgid "print only branches that contain the commit" -msgstr "mostrar solo ramas que contienen el commit" +msgstr "mostrar solo ramas que contengan el commit" #: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that don't contain the commit" -msgstr "mostrar solo ramas que no contienen el commit" +msgstr "mostrar solo ramas que no contengan el commit" #: builtin/branch.c:650 msgid "Specific git-branch actions:" @@ -11600,7 +11653,7 @@ msgstr "copiar una rama y su reflog" #: builtin/branch.c:658 msgid "copy a branch, even if target exists" -msgstr "copiar una rama, incluso si el objetivo existe" +msgstr "copiar una rama, incluso si el destino existe" #: builtin/branch.c:659 msgid "list branch names" @@ -11620,11 +11673,11 @@ msgstr "edita la descripción de la rama" #: builtin/branch.c:664 msgid "force creation, move/rename, deletion" -msgstr "fuerza la creación,movimiento/renombrado,borrado" +msgstr "fuerza la creación, movimiento/renombramiento, eliminación" #: builtin/branch.c:665 msgid "print only branches that are merged" -msgstr "muestra solo ramas que han sido fusionadas" +msgstr "muestra solo ramas que hayan sido fusionadas" #: builtin/branch.c:666 msgid "print only branches that are not merged" @@ -11642,11 +11695,11 @@ msgstr "objeto" #: builtin/branch.c:670 msgid "print only branches of the object" -msgstr "imprimir sólo las ramas del objeto" +msgstr "imprimir solo las ramas del objeto" #: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 msgid "sorting and filtering are case insensitive" -msgstr "ordenamiento y filtrado son case-insensitive" +msgstr "ordenamiento y filtración son case-insensitive" #: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 #: builtin/verify-tag.c:38 @@ -11655,7 +11708,7 @@ msgstr "formato para usar para el output" #: builtin/branch.c:695 builtin/clone.c:794 msgid "HEAD not found below refs/heads!" -msgstr "¡HEAD no encontrado abajo de refs/heads!" +msgstr "¡HEAD no encontrado dentro de refs/heads!" #: builtin/branch.c:719 msgid "--column and --verbose are incompatible" @@ -11685,11 +11738,11 @@ msgstr "No hay ninguna rama llamada '%s'." #: builtin/branch.c:796 msgid "too many branches for a copy operation" -msgstr "demasiadas ramas para una operación de copiado" +msgstr "demasiadas ramas para una operación de duplicación" #: builtin/branch.c:805 msgid "too many arguments for a rename operation" -msgstr "demasiados argumentos para una operación de renombrado" +msgstr "demasiados argumentos para una operación de renombramiento" #: builtin/branch.c:810 msgid "too many arguments to set new upstream" @@ -11789,7 +11842,7 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" "¡Gracias por prepara un reporte de bug de Git!\n" -"Por favor responde las siguientes preguntas para ayudarnos a entender el " +"Por favor conteste las siguientes preguntas para ayudarnos a entender el " "problema.\n" "\n" "¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el " @@ -11799,7 +11852,7 @@ msgstr "" "\n" "¿Qué sucedio en lugar de eso? (Comportamiento real)\n" "\n" -"¿Qué es diferente entre lo que esperabas y lo que pasó?\n" +"¿Qué es diferente entre lo que esperabas y lo que pasó de verdad?\n" "\n" "Cualquier cosa que quieras agregar:\n" "\n" @@ -11812,7 +11865,8 @@ msgstr "especificar el destino para el archivo de reporte de bug" #: builtin/bugreport.c:138 msgid "specify a strftime format suffix for the filename" -msgstr "especificar el sufijo formato strftime para el nombre del archivo" +msgstr "" +"especificar el sufijo de formato de strftime para el nombre del archivo" #: builtin/bugreport.c:160 #, c-format @@ -11825,12 +11879,12 @@ msgstr "Información del sistema" #: builtin/bugreport.c:170 msgid "Enabled Hooks" -msgstr "Activar Hooks" +msgstr "Hooks habilitados" #: builtin/bugreport.c:177 #, c-format msgid "couldn't create a new file at '%s'" -msgstr "no se pudo crear un archivo en '%s'" +msgstr "no se pudo crear un archivo nuevo en '%s'" #: builtin/bugreport.c:180 #, c-format @@ -11858,19 +11912,19 @@ msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3747 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "no mostrar medidor de progreso" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "mostrar medidor de progreso" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" -#: builtin/bundle.c:74 builtin/pack-objects.c:3754 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress cuando medidor de progreso es mostrado" @@ -11882,29 +11936,29 @@ msgstr "especificar la versión del formato del paquete" msgid "Need a repository to create a bundle." msgstr "Se necesita un repositorio para agrupar." -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 msgid "do not show bundle details" msgstr "no mostrar detalles del bundle" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "%s está bien\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "ser verboso; tiene que ser agregado antes de un subcomando" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Sub-comando desconocido: %s" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:596 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11912,7 +11966,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:597 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11920,74 +11974,74 @@ msgstr "" "git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-" "symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 msgid "only one batch option may be specified" msgstr "solo se puede especificar una opción batch" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> puede ser: blob, tree, commit, tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "mostrar el tipo del objeto" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "mostrar el tamaño del objeto" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" msgstr "salir con cero cuando no haya error" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "realizar pretty-print del contenido del objeto" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "para objetos blob, ejecuta filters en el contenido del objeto" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "use una ruta específica para --textconv/--filters" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" -msgstr "permita -s y -t para trabajar con objetos rotos o corruptos" +msgstr "permita que -s y -t funcionen con objetos rotos o corruptos" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "salida buffer --batch" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" msgstr "mostrar info y content de los objetos alimentados por standard input" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "mostrar info de los objetos alimentados por standard input" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos los objetos con --batch o --batch-check" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" -msgstr "no ordenar el output de --batch-all-objects" +msgstr "no ordenar el salida de --batch-all-objects" #: builtin/check-attr.c:13 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." @@ -12013,14 +12067,14 @@ msgstr "leer nombres de archivos de stdin" msgid "terminate input and output records by a NUL character" msgstr "terminar registros de entrada y salida con un carácter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 -#: builtin/worktree.c:491 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" #: builtin/check-ignore.c:29 msgid "show non-matching input paths" -msgstr "mostrar rutas de entrada que no concuerdan" +msgstr "mostrar rutas de entrada que no concuerden" #: builtin/check-ignore.c:31 msgid "ignore index when checking" @@ -12032,7 +12086,7 @@ msgstr "no se puede especificar los nombres de rutas con --stdin" #: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" -msgstr "-z sólo tiene sentido con --stdin" +msgstr "-z solo tiene sentido con --stdin" #: builtin/check-ignore.c:170 msgid "no path specified" @@ -12048,7 +12102,7 @@ msgstr "no se puede tener ambos --quiet y --verbose" #: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" -msgstr "--non-matching sólo es válida con --verbose" +msgstr "--non-matching solo es válida con --verbose" #: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." @@ -12072,9 +12126,11 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<opciones>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1825 -#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 -#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 +#: builtin/worktree.c:728 msgid "string" msgstr "string" @@ -12170,68 +12226,68 @@ msgstr "ruta '%s': no se puede fusionar" msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusión a '%s'" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Recreado %d conflicto de merge" msgstr[1] "Recreados %d conflictos de merge" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" -msgstr[0] "Actualizada %d ruta para %s" -msgstr[1] "Actualizadas %d rutas para %s" +msgstr[0] "Actualizada %d ruta desde %s" +msgstr[1] "Actualizadas %d rutas desde %s" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" -msgstr[0] "Actualizada %d ruta desde el index" -msgstr[1] "Actualizadas %d rutas desde el index" +msgstr[0] "Actualizada %d ruta desde el índice" +msgstr[1] "Actualizadas %d rutas desde el índice" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" -msgstr "ni '%s' o '%s' están especificados" +msgstr "ni '%s' ni '%s' están especificados" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' tiene que ser usado cuando '%s' no es especificado" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' no puede ser usado con %s" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" -msgstr "ruta '%s' no esta fusionada" +msgstr "ruta '%s' no está fusionada" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "necesitas resolver tu índice actual primero" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12240,50 +12296,50 @@ msgstr "" "no se puede continuar con los cambios en stage en los siguientes archivos:\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" -msgstr "no es posible actualizar HEAD" +msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12296,17 +12352,17 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Peligro: estás saliendo %d commit atrás, no está conectado\n" +"Peligro: estás dejando %d commit atrás, no está conectado\n" "a ninguna rama:\n" "\n" "%s\n" msgstr[1] "" -"Peligro: estás saliendo %d commits atrás, no está conectado\n" +"Peligro: estás dejando %d commits atrás, no están conectados\n" "a ninguna rama:\n" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12333,19 +12389,19 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" -msgstr "error interno en camino de revisión" +msgstr "error interno en recorrido de revisiones" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "Estás en una rama por nacer" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12354,7 +12410,7 @@ msgstr "" "'%s' puede ser tanto un archivo local como una rama de rastreo.\n" "Por favor use -- (y opcionalmente --no-guess) para desambiguar" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12370,56 +12426,55 @@ msgstr "" "\n" " git checkout --track origin/<nombre>\n" "\n" -"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una " -"rama\n" -"de nombre <nombre> remota, como 'origin', considera configurar\n" +"Si quisieras que siempre los checkouts de nombres ambiguos prefieran\n" +"un remoto particular, como 'origin', considera configurar\n" "checkout.defaultRemote=origin en tu configuración." -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto" +msgstr "'%s' concordó con múltiples (%d) ramas de rastreo remoto" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "solo una referencia esperada" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "referencia inválida: %s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" -msgstr "la referencia no es n árbol: %s" +msgstr "la referencia no es un árbol: %s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "se esperaba un branch, se obtuvo tag '%s'" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "se espera una rama, se obtuvo una rama remota '%s'" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" -msgstr "se esperaba branch, se obuto '%s'" +msgstr "se esperaba branch, se obtuvo '%s'" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "se espera una rama, se obtuvo commit '%s'" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12427,7 +12482,7 @@ msgstr "" "no se puede cambiar de branch durante un merge\n" "Considera \"git merge --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12435,7 +12490,7 @@ msgstr "" "no se puede cambiar de branch en medio de una sesión de am\n" "Considera \"git am --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12443,7 +12498,7 @@ msgstr "" "no se puede cambiar de branch durante un rebase\n" "Considera \"git rebase --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12451,7 +12506,7 @@ msgstr "" "no se puede cambiar de branch durante un cherry-pick\n" "Considera \"git cherry-pick --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12459,137 +12514,137 @@ msgstr "" "no se puede cambiar de branch durante un revert\n" "Considera \"git revert --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" -msgstr "estás cambiando ramas durante un bisect" +msgstr "estás cambiando de rama durante un bisect" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' no puede tomar <punto de partida>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No se puede cambiar rama a un '%s' sin commits" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "falta branch o commit como argumento" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 msgid "perform a 3-way merge with the new branch" msgstr "realizar una fusión de tres vías con la rama nueva" -#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" -msgstr "conflicto de estilos (merge o diff3)" +msgstr "estilo de conflictos (merge o diff3)" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" -msgstr "no revise si otro árbol de trabajo contiene la ref entregada" +msgstr "no averiguar si otro árbol de trabajo contiene la ref entregada" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" -msgstr "hacer checkout a nuestra versión para archivos sin fusionar" +msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" -msgstr "no limitar pathspecs a dispersar entradas solamente" +msgstr "no limitar pathspecs a entradas escasas solamente" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p y --overlay son mutuamente exclusivas" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "falta nombre de rama; prueba -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "no se pudo resolver %s" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "especificación de ruta inválida" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no toma un argumento de ruta '%s'" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file es incompatible con --detach" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file es incompatible con --patch" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12597,70 +12652,71 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del índice." -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "debes especificar path(s) para restaurar" -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "usar modo overlay (default)" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "crear y hacer switch a una nueva rama" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "crear/reiniciar y hacer switch a una rama" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "descartar modificaciones locales" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" msgstr "de qué árbol hacer el checkout" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" -msgstr "restaurar el index" +msgstr "restaurar el índice" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "restaurar el árbol de trabajo (default)" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "ignorar entradas no fusionadas" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "usar modo overlay" @@ -12678,7 +12734,7 @@ msgstr "Borrando %s\n" #: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" -msgstr "Sera borrado %s\n" +msgstr "Será borrado %s\n" #: builtin/clean.c:35 #, c-format @@ -12688,14 +12744,14 @@ msgstr "Saltando repositorio %s\n" #: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" -msgstr "Se saltara repositorio %s\n" +msgstr "Se saltará repositorio %s\n" #: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "no se pudo lstat %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12703,12 +12759,12 @@ msgid "" "foo - select item based on unique prefix\n" " - (empty) select nothing\n" msgstr "" -"Ayuda rápida:\n" -"1 - selecciona un objeto por numero\n" +"Ayuda de comandos:\n" +"1 - selecciona un objeto por número\n" "foo - selecciona un objeto basado en un prefijo único\n" " - (vacío) no elegir nada\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12720,7 +12776,7 @@ msgid "" "* - choose all items\n" " - (empty) finish selecting\n" msgstr "" -"Ayuda rápida:\n" +"Ayuda de comandos:\n" "1 - selecciona un objeto único\n" "3-5 - selecciona un rango de objetos\n" "2-3,6-9 - selecciona múltiples rangos\n" @@ -12729,33 +12785,33 @@ msgstr "" "* - escoger todos los objetos\n" " - (vacío) terminar selección\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "¿Ahh (%s)?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " -msgstr "Input ignora los patrones >> " +msgstr "Ingresa los patrones que ignorar>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "Seleccionar objetos para borrar" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "¿Borrar %s [y/N]? " -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12766,75 +12822,75 @@ msgid "" "? - help for prompt selection" msgstr "" "clean - comenzar la limpieza\n" -"filtrar por patrón - excluye objetos del borrado\n" -"elegir por números - selecciona objetos a ser borrados por numero\n" -"preguntar cada uno - confirmar cada borrado (como \"rm -i\")\n" +"filter by pattern - excluye objetos de la eliminación\n" +"select by numbers - selecciona objetos a ser borrados por número\n" +"ask each - confirmar cada eliminación (como \"rm -i\")\n" "quit - parar limpieza\n" -"help - esta ventana\n" +"help - esta pantalla\n" "? - ayuda para selección de opciones" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Se eliminará el siguiente objeto:" msgstr[1] "Se eliminarán los siguientes objetos:" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "No hay más archivos para limpiar, saliendo." -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "no imprimir nombres de archivos borrados" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "forzar" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "limpieza interactiva" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "borrar directorios completos" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 #: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patrón" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" -msgstr "agregar <patrón> para ignorar reglas" +msgstr "agregar <patrón> a las reglas de ignorancia" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "borrar archivos ignorados, también" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "borrar solo archivos ignorados" -#: builtin/clean.c:929 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; " -"rehusando el clean" +"clean.requireForce configurado como true y ninguno de -i, -n, ni -f " +"entregado; rehusando el clean" -#: builtin/clean.c:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; " +"clean.requireForce default en true y ninguno de -i, -n, ni -f entregado; " "rehusando el clean" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "-x y -X no pueden ser usadas juntas" @@ -12850,13 +12906,13 @@ msgstr "no clonar repositorios superficiales" msgid "don't create a checkout" msgstr "no crear checkout" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "crear un repositorio vacío" #: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" -msgstr "crear un repositorio espejo (implica vacío)" +msgstr "crear un repositorio espejo (implica bare)" #: builtin/clone.c:105 msgid "to clone from a local repository" @@ -12876,32 +12932,32 @@ msgstr "pathspec" #: builtin/clone.c:111 msgid "initialize submodules in the clone" -msgstr "inicializar submódulos en el clonado" +msgstr "inicializar submódulos en el clon" #: builtin/clone.c:115 msgid "number of submodules cloned in parallel" -msgstr "numero de submódulos clonados en paralelo" +msgstr "número de submódulos clonados en paralelo" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "directorio-template" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 -#: builtin/submodule--helper.c:2337 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:123 builtin/submodule--helper.c:1834 -#: builtin/submodule--helper.c:2339 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" -msgstr "usa--reference solamente si estás clonado" +msgstr "usa --reference solamente si estás clonando" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 #: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "nombre" @@ -12918,16 +12974,16 @@ msgstr "checkout <rama> en lugar de HEAD remota" msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "profundidad" #: builtin/clone.c:131 msgid "create a shallow clone of that depth" -msgstr "crear un clon superficial para esa profundidad" +msgstr "crear un clon superficial de esa profundidad" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "tiempo" @@ -12939,16 +12995,16 @@ msgstr "crear un clon superficial desde el tiempo específico" #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 #: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 msgid "revision" -msgstr "revision" +msgstr "revisión" #: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" -msgstr "ahondando historia de clon superficial, excluyendo rev" +msgstr "ahondar historia de clon superficial, excluyendo rev" -#: builtin/clone.c:137 builtin/submodule--helper.c:1844 -#: builtin/submodule--helper.c:2353 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" -msgstr "clonar solo una rama,HEAD o --branch" +msgstr "clonar solo una rama, HEAD o --branch" #: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" @@ -12958,11 +13014,11 @@ msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan" msgid "any cloned submodules will be shallow" msgstr "cualquier submódulo clonado será superficial" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "separa git dir del árbol de trabajo" @@ -12975,22 +13031,22 @@ msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" -msgstr "especifico-de-servidor" +msgstr "específico-al-servidor" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "opción para trasmitir" #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" @@ -13052,7 +13108,7 @@ msgid "" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -"Clonado exitoso, pero falló el checkout.\n" +"Clonación exitosa, pero falló el checkout.\n" "Puedes inspeccionar a qué se hizo checkout con 'git status'\n" "y volver a intentarlo con 'git restore --source=HEAD :/'\n" @@ -13089,11 +13145,11 @@ msgstr "no se puede reempaquetar para limpiar" #: builtin/clone.c:959 msgid "cannot unlink temporary alternates file" -msgstr "no se puede desvincular archivos alternos temporales" +msgstr "no se puede desvincular archivo de alternos temporal" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." -msgstr "Muchos argumentos." +msgstr "Demasiados argumentos." #: builtin/clone.c:1005 msgid "You must specify a repository to clone." @@ -13113,10 +13169,10 @@ msgstr "--bare y --separate-git-dir son incompatibles." msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" -msgstr "profundidad %s no es un numero positivo" +msgstr "profundidad %s no es un número positivo" #: builtin/clone.c:1049 #, c-format @@ -13126,7 +13182,7 @@ msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío." #: builtin/clone.c:1055 #, c-format msgid "repository path '%s' already exists and is not an empty directory." -msgstr "La ruta del repositorio '%s' ya existe y no es un directorio vacío." +msgstr "la ruta del repositorio '%s' ya existe y no es un directorio vacío." #: builtin/clone.c:1069 #, c-format @@ -13134,7 +13190,7 @@ msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." #: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" @@ -13173,15 +13229,18 @@ msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien." #: builtin/clone.c:1231 msgid "--shallow-since is ignored in local clones; use file:// instead." -msgstr "--shallow-since es ignorado en el clon local; use file:// ." +msgstr "" +"--shallow-since es ignorado en clonaciones locales; use file:// en su lugar." #: builtin/clone.c:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "--shallow-exclude es ignorado en clones locales; use file://." +msgstr "" +"--shallow-exclude es ignorado en clonaciones locales; use file:// en su " +"lugar." #: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." -msgstr "--filter es ignorado en clones locales; usa file:// en su lugar." +msgstr "--filter es ignorado en clonaciones locales; usa file:// en su lugar." #: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" @@ -13191,12 +13250,16 @@ msgstr "repositorio fuente es superficial, ignorando --local" msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "transporte remoto reportó error" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1348 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -13206,11 +13269,11 @@ msgstr "git column [<opciones>]" #: builtin/column.c:27 msgid "lookup config vars" -msgstr "revisa las variables de configuraciones" +msgstr "revisa las variables de configuración" #: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" -msgstr "capa a usar" +msgstr "disposición a usar" #: builtin/column.c:30 msgid "maximum width" @@ -13218,15 +13281,15 @@ msgstr "ancho máximo" #: builtin/column.c:31 msgid "padding space on left border" -msgstr "realizando padding en el borde izquierdo" +msgstr "espacio padding en el borde izquierdo" #: builtin/column.c:32 msgid "padding space on right border" -msgstr "realizando padding en el borde derecho" +msgstr "espacio padding en el borde derecho" #: builtin/column.c:33 msgid "padding space between columns" -msgstr "realizando padding entre columnas" +msgstr "espacio padding entre columnas" #: builtin/column.c:51 msgid "--command must be the first argument" @@ -13251,21 +13314,21 @@ msgstr "" #: builtin/commit-graph.c:64 #, c-format msgid "could not find object directory matching %s" -msgstr "no se pudo entoncrar el objeto directorio concordante con %s" +msgstr "no se pudo encontrar el directorio de objetos concordante con %s" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "dir" #: builtin/commit-graph.c:81 builtin/commit-graph.c:211 #: builtin/commit-graph.c:317 msgid "the object directory to store the graph" -msgstr "el directorio de objetos para guardar el gráfico" +msgstr "el directorio de objetos en que guardar el gráfico" #: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" -msgstr "si el commit-graph está cortado, solo verifica la punta del archivo" +msgstr "si el commit-graph está cortado, solo verifica el archivo tope" #: builtin/commit-graph.c:106 #, c-format @@ -13280,7 +13343,7 @@ msgstr "argumento --split no reconocido, %s" #: builtin/commit-graph.c:155 #, c-format msgid "unexpected non-hex object ID: %s" -msgstr "ID de objeto no hex inesperado:%s" +msgstr "ID de objeto no hex inesperado: %s" #: builtin/commit-graph.c:160 #, c-format @@ -13289,7 +13352,7 @@ msgstr "no es un objeto válido: %s" #: builtin/commit-graph.c:213 msgid "start walk at all refs" -msgstr "comenzar caminata en todas las refs" +msgstr "comenzar recorrido en todas las refs" #: builtin/commit-graph.c:215 msgid "scan pack-indexes listed by stdin for commits" @@ -13297,11 +13360,11 @@ msgstr "escanear paquete de índices por stdin por commits" #: builtin/commit-graph.c:217 msgid "start walk at commits listed by stdin" -msgstr "comenzar a caminar a los commits listados por stdin" +msgstr "comenzar recorrido a los commits listados por stdin" #: builtin/commit-graph.c:219 msgid "include all commits already in the commit-graph file" -msgstr "inclye todos los commits que ya están en el archivo commit-graph" +msgstr "incluye todos los commits que ya están en el archivo commit-graph" #: builtin/commit-graph.c:221 msgid "enable computation for changed paths" @@ -13313,15 +13376,15 @@ msgstr "permitir escribir un archivo commit-graph incremental" #: builtin/commit-graph.c:228 msgid "maximum number of commits in a non-base split commit-graph" -msgstr "máximo número de commits en un commit-graph sin base cortada" +msgstr "número máximo de commits en un commit-graph sin base cortada" #: builtin/commit-graph.c:230 msgid "maximum ratio between two levels of a split commit-graph" -msgstr "radio máximo entre dos niveles de corte de commit-graph" +msgstr "razón máxima entre dos niveles de corte de commit-graph" #: builtin/commit-graph.c:232 msgid "only expire files older than a given date-time" -msgstr "expirar objetos más viejos a una fecha dada" +msgstr "solo caducar objetos más viejos a una fecha dada" #: builtin/commit-graph.c:234 msgid "maximum number of changed-path Bloom filters to compute" @@ -13348,7 +13411,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "padre duplicado %s ignorado" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "no es un nombre de objeto válido %s" @@ -13376,13 +13439,13 @@ msgstr "padre" msgid "id of a parent commit object" msgstr "id del objeto commit padre" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 #: builtin/tag.c:456 msgid "message" msgstr "mensaje" -#: builtin/commit-tree.c:115 builtin/commit.c:1614 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "mensaje del commit" @@ -13390,7 +13453,7 @@ msgstr "mensaje del commit" msgid "read commit log message from file" msgstr "leer mensaje de commit desde un archivo" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Firmar commit con GPG" @@ -13418,7 +13481,7 @@ msgid "" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" "Has solicitado un amend en tu commit más reciente, pero hacerlo lo\n" -"vaciaría. Puedes repetir el comando con --alow-empty, o puedes eliminar\n" +"vaciaría. Puedes repetir el comando con --allow-empty, o puedes eliminar\n" "el commit completamente con \"git reset HEAD^\".\n" #: builtin/commit.c:56 @@ -13476,7 +13539,7 @@ msgstr "--pathspec-from-file con -a no tiene sentido" #: builtin/commit.c:374 msgid "No paths with --include/--only does not make sense." -msgstr "No hay rutas con --include/--only no tiene sentido." +msgstr "--include/--only sin ruta no tiene sentido." #: builtin/commit.c:386 msgid "unable to create temporary index" @@ -13492,7 +13555,7 @@ msgstr "no es posible actualizar el índice temporal" #: builtin/commit.c:412 msgid "Failed to update main cache tree" -msgstr "Falló al actualizar el cache principal del árbol" +msgstr "Falló al actualizar el árbol de caché principal" #: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" @@ -13537,10 +13600,10 @@ msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -"no es posible seleccionar un carácter de comentario que no es usado\n" +"no es posible seleccionar un carácter de comentario que no sea usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" @@ -13576,7 +13639,48 @@ msgstr "no se pudo leer MERGE_MSG" msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:900 +#: builtin/commit.c:893 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"Por favor ingresa el mensaje del commit para tus cambios. Las\n" +" líneas que comiencen con '%c' serán ignoradas.\n" + +#: builtin/commit.c:895 +#, 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 "" +"Por favor ingresa el mensaje del commit para tus cambios. Las\n" +" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n" +" vacío aborta el commit.\n" + +#: builtin/commit.c:899 +#, 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" +msgstr "" +"Por favor ingresa el mensaje del commit para tus cambios. Las\n" +" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n" +" usted mismo si lo desea.\n" + +#: builtin/commit.c:903 +#, 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 "" +"Por favor ingresa el mensaje del commit para tus cambios. Las\n" +" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n" +" usted mismo si lo desea.\n" +"Un mensaje vacío aborta el commit.\n" + +#: builtin/commit.c:915 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13590,7 +13694,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "e intenta de nuevo.\n" -#: builtin/commit.c:905 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13599,100 +13703,78 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que puede estar cometiendo una selección de cerebros.\n" +"Parece que puede estar cometiendo una selección de cerezas.\n" "Si esto no es correcto, ejecute\n" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "e intenta de nuevo.\n" -#: builtin/commit.c:915 -#, 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 "" -"Por favor ingresa el mensaje del commit para tus cambios. Las\n" -" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n" -" vacío aborta el commit.\n" - -#: builtin/commit.c:923 -#, 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 "" -"Por favor ingresa el mensaje del commit para tus cambios. Las\n" -" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n" -" usted mismo si lo desea.\n" -"Un mensaje vacío aborta el commit.\n" - -#: builtin/commit.c:940 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:948 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:955 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:1018 +#: builtin/commit.c:1025 msgid "unable to pass trailers to --trailers" msgstr "no se puede pasar trailers a --trailers" -#: builtin/commit.c:1058 +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n" -#: builtin/commit.c:1116 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún " "autor existente" -#: builtin/commit.c:1130 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" -msgstr "Modo ignorado inválido '%s'" +msgstr "Modo de ignorancia inválido '%s'" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" -msgstr "Modo inválido de los archivos no rastreados '%s'" +msgstr "Modo inválido de archivos no rastreados '%s'" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1219 +#: builtin/commit.c:1226 msgid "You are in the middle of a merge -- cannot reword." msgstr "Estás en medio de una fusión -- no puedes renombrar." -#: builtin/commit.c:1221 +#: builtin/commit.c:1228 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Está en medio de un cherry-pick -- no se puede renombrar." -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" msgstr "no se puede combinar opción de renombrar de --fixup con ruta '%s'" -#: builtin/commit.c:1226 +#: builtin/commit.c:1233 msgid "" "reword option of --fixup is mutually exclusive with --patch/--interactive/--" "all/--include/--only" @@ -13700,103 +13782,103 @@ msgstr "" "opción de refraseado de --fixup es mutuamente exclusiva con --patch/--" "interactive/--all/--include/--only" -#: builtin/commit.c:1245 +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1259 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Está en medio de un cherry-pick -- no se puede enmendar." -#: builtin/commit.c:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado." -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "La opción -m no puede ser combinada con -c/-C/-F." -#: builtin/commit.c:1285 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." +msgstr "--reset-author solo puede ser usada con -C, -c o --amend." -#: builtin/commit.c:1303 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado." -#: builtin/commit.c:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "opción desconocida: --fixup=%s:%s" -#: builtin/commit.c:1345 +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1480 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atrás" -#: builtin/commit.c:1484 +#: builtin/commit.c:1491 msgid "version" msgstr "version" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 -#: builtin/worktree.c:681 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" -msgstr "output formato-maquina" +msgstr "output en formato de máquina" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 #: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "modo" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " "(Predeterminado: all)" -#: builtin/commit.c:1497 +#: builtin/commit.c:1504 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13804,215 +13886,215 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "cuando" -#: builtin/commit.c:1500 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -"ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. " +"ignorar cambios en submódulos, opcional cuando: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1502 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1503 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1505 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" -msgstr "detectar renombres, opcionalmente configurar similaridad de índice" +msgstr "detectar renombrados, opcionalmente configurar similaridad de índice" -#: builtin/commit.c:1525 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinación de argumentos de archivos ignorados y no rastreados no soportada" -#: builtin/commit.c:1607 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1608 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1610 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "author" msgstr "autor" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "fecha" -#: builtin/commit.c:1613 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 #: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1615 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" -msgstr "reusar y editar el mensaje de un commit especifico" +msgstr "reusar y editar el mensaje de un commit específico" -#: builtin/commit.c:1616 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" -msgstr "reusar el mensaje de un commit especifico" +msgstr "reusar el mensaje de un commit específico" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el amend/renombrado del " "commit especificado" -#: builtin/commit.c:1622 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "" -"usar el mensaje de formato autosquash para realizar squash al commit " +"usar el mensaje de formato autosquash para realizar squash al commit " "especificado" -#: builtin/commit.c:1623 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)" -#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "trailer" -#: builtin/commit.c:1624 +#: builtin/commit.c:1634 msgid "add custom trailer(s)" msgstr "agregando trailer(s) personalizados" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" -msgstr "agregar un firmado por al final" +msgstr "agregar una línea Signed-off-by al final" -#: builtin/commit.c:1626 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1627 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1629 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1634 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1635 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1636 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1637 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1638 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1639 +#: builtin/commit.c:1649 msgid "commit only specified files" -msgstr "sólo confirmar archivos específicos" +msgstr "solo confirmar archivos específicos" -#: builtin/commit.c:1640 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1641 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "mostrar lo que sería incluido en el commit" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1655 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" -msgstr "gancho bypass post reescritura" +msgstr "salta el gancho de postreescritura" -#: builtin/commit.c:1662 +#: builtin/commit.c:1672 msgid "ok to record an empty change" -msgstr "ok al grabar un cambio vacío" +msgstr "vale grabar un cambio vacío" -#: builtin/commit.c:1664 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" -msgstr "ok al grabar un cambio con un mensaje vacío" +msgstr "vale grabar un cambio con un mensaje vacío" -#: builtin/commit.c:1737 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1744 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1765 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abortando commit debido que el mensaje está en blanco.\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1790 #, c-format msgid "Aborting commit; you did not edit the message.\n" -msgstr "Abortando commit; no se ha editado el mensaje\n" +msgstr "Abortando commit; no se ha editado el mensaje.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1801 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "Abortando commit debido que el cuerpo del mensaje está en blanco.\n" -#: builtin/commit.c:1824 +#: builtin/commit.c:1837 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 restore --staged :/\" to recover." msgstr "" "el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n" -"new_index. Verifique que el disco no este lleno y la quota no ha\n" -"sido superada, y luego \"git restore --sateged :/\" para recuperar." +"new_index. Verifique que el disco no esté lleno y la cuota no haya\n" +"sido superada, y luego \"git restore --staged :/\" para recuperar." #: builtin/config.c:11 msgid "git config [<options>]" @@ -14029,7 +14111,7 @@ msgstr "solo un tipo a la vez" #: builtin/config.c:130 msgid "Config file location" -msgstr "Ubicación del archivo configuración" +msgstr "Ubicación del archivo de configuración" #: builtin/config.c:131 msgid "use global config file" @@ -14045,11 +14127,11 @@ msgstr "usar archivo de config del repositorio" #: builtin/config.c:134 msgid "use per-worktree config file" -msgstr "usar un archivo de config por árbol de trabajo" +msgstr "usar archivo de config del árbol de trabajo" #: builtin/config.c:135 msgid "use given config file" -msgstr "usar archivo config especificado" +msgstr "usar archivo de config especificado" #: builtin/config.c:136 msgid "blob-id" @@ -14077,7 +14159,7 @@ msgstr "obtener valores para regexp: name-regex [value-pattern]" #: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" -msgstr "obtener valor especifico para el URL: sección[.var] URL" +msgstr "obtener valor específico para el URL: sección[.var] URL" #: builtin/config.c:142 msgid "replace all matching variables: name value [value-pattern]" @@ -14138,7 +14220,7 @@ msgstr "valor es \"true\" o \"false\"" #: builtin/config.c:156 msgid "value is decimal number" -msgstr "valor es un numero decimal" +msgstr "valor es un número decimal" #: builtin/config.c:157 msgid "value is --bool or --int" @@ -14154,7 +14236,7 @@ msgstr "valor es una ruta (archivo o nombre de directorio)" #: builtin/config.c:160 msgid "value is an expiry date" -msgstr "valor es una fecha de expiración" +msgstr "valor es una fecha de caducidad" #: builtin/config.c:161 msgid "Other" @@ -14174,7 +14256,8 @@ msgstr "respetar directivas include en la búsqueda" #: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" -msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" +msgstr "" +"mostrar el origen de configuración (archivo, stdin, blob, línea de comandos)" #: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" @@ -14213,7 +14296,7 @@ msgstr "falló al formatear el valor por defecto de configuración: %s" #: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" -msgstr "no se analizar color '%s'" +msgstr "no se puede analizar color '%s'" #: builtin/config.c:483 msgid "unable to parse default color value" @@ -14272,7 +14355,7 @@ msgid "" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" "section in \"git help worktree\" for details" msgstr "" -"--worktree no puede ser usado con multiples árboles de trabajo a menos que " +"--worktree no puede ser usado con múltiples árboles de trabajo a menos que " "la\n" "extensión worktreeConfig esté habilitada. Por favor lea \"CONFIGURATION FILE" "\"\n" @@ -14280,7 +14363,7 @@ msgstr "" #: builtin/config.c:743 msgid "--get-color and variable type are incoherent" -msgstr "--get-color y tipo de variable incoherente" +msgstr "--get-color con tipo de variable es incoherente" #: builtin/config.c:748 msgid "only one action at a time" @@ -14334,7 +14417,7 @@ msgid "" " Use a regexp, --add or --replace-all to change %s." msgstr "" "no se puede sobrescribir múltiples valores con un único valor\n" -"\tUse una regexp, --add o --replace-all para cambiar %s." +" Use una regexp, --add o --replace-all para cambiar %s." #: builtin/config.c:943 builtin/config.c:954 #, c-format @@ -14409,7 +14492,7 @@ msgstr "tag anotado %s no disponible" #: builtin/describe.c:281 #, c-format msgid "tag '%s' is externally known as '%s'" -msgstr "tag '%s' es literalmente conocida como '%s'" +msgstr "tag '%s' es externamente conocida como '%s'" #: builtin/describe.c:328 #, c-format @@ -14419,12 +14502,12 @@ msgstr "no hay tag que concuerde exactamente con '%s'" #: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" -msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n" +msgstr "No hay coincidencia exacta en refs o tags, buscando para describir\n" #: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" -msgstr "búsqueda finalizada a las %s\n" +msgstr "búsqueda finalizada a %s\n" #: builtin/describe.c:424 #, c-format @@ -14441,7 +14524,7 @@ msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -"Ningún tag puede describit '%s'.\n" +"Ningún tag puede describir '%s'.\n" "Intente --always, o cree algunos tags." #: builtin/describe.c:458 @@ -14455,7 +14538,7 @@ msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -"se encontró más de %i tags; se mostró %i más reciente\n" +"se encontró más de %i tags; se mostraron las %i más recientes\n" "fin de la búsqueda en %s\n" #: builtin/describe.c:529 @@ -14495,7 +14578,7 @@ msgstr "siempre usar formato largo" #: builtin/describe.c:559 msgid "only follow first parent" -msgstr "solo seguir el primer patrón" +msgstr "solo seguir el primer padre" #: builtin/describe.c:562 msgid "only output exact matches" @@ -14503,7 +14586,7 @@ msgstr "solo mostrar concordancias exactas" #: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" -msgstr "considerar <n> tags más recientes (default:10)" +msgstr "considerar <n> tags más recientes (default: 10)" #: builtin/describe.c:566 msgid "only consider tags matching <pattern>" @@ -14547,7 +14630,7 @@ msgstr "--broken es incompatible con commit-ismos" #: builtin/diff-tree.c:155 msgid "--stdin and --merge-base are mutually exclusive" -msgstr "--stdin and --merge-baseson mutuamente exclusivas" +msgstr "--stdin and --merge-base son mutuamente exclusivas" #: builtin/diff-tree.c:157 msgid "--merge-base only works with two commits" @@ -14642,36 +14725,36 @@ msgstr "archivo temporal existe en '%s'." msgid "you may want to cleanup or recover these." msgstr "tal vez desees limpiar o recuperar estos." -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use `diff.guitool` en lugar de `diff.tool`" -#: builtin/difftool.c:702 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "realizar un diff de todo el directorio" -#: builtin/difftool.c:704 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "no mostrar antes de lanzar una herramienta de diff" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "usar enlaces simbólicos en modo dir-diff" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "tool" msgstr "herramienta" -#: builtin/difftool.c:711 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "usar la herramienta de diff especificada" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14679,31 +14762,31 @@ msgstr "" "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " "código de salida distinto de cero" -#: builtin/difftool.c:719 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "especificar un comando personalizado para ver diffs" -#: builtin/difftool.c:720 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "pasado a `diff`" -#: builtin/difftool.c:735 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "difftool requiere un árbol de trabajo o --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" -msgstr "--dirty-diff es incompatible con --no-index" +msgstr "--dir-diff es incompatible con --no-index" -#: builtin/difftool.c:745 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool y --extcmd son mutuamente exclusivas" -#: builtin/difftool.c:753 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" -#: builtin/difftool.c:760 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" @@ -14792,9 +14875,9 @@ msgstr "use el feature done para terminar el stream" #: builtin/fast-export.c:1221 msgid "skip output of blob data" -msgstr "saltar el output de data blob" +msgstr "saltar el salida de data blob" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "refspec" @@ -14817,7 +14900,7 @@ msgstr "convertir <de> a <para> en output anonimizado" #: builtin/fast-export.c:1229 msgid "reference parents which are not in fast-export stream by object id" msgstr "" -"padres de la referencia que no estan en fast-export stream por id de objeto" +"referir a los padres que no estén en fast-export stream por id de objeto" #: builtin/fast-export.c:1231 msgid "show original object ids of blobs/commits" @@ -14858,7 +14941,7 @@ msgstr "Se esperaba comando 'to', se obtuvo %s" #: builtin/fast-import.c:3322 msgid "Expected format name:filename for submodule rewrite option" msgstr "" -"Formato esperado de nombre:nombre de archivo para la opción de sobreescribir " +"Formato esperado de nombre:nombre-de-archivo para la opción de sobreescribir " "submódulo" #: builtin/fast-import.c:3377 @@ -14909,7 +14992,7 @@ msgstr "usar transacción atómica para actualizar referencias" #: builtin/fetch.c:153 builtin/pull.c:191 msgid "path to upload pack on remote end" -msgstr "ruta para cargar el paquete al final del remoto" +msgstr "ruta al paquete al lado remoto" #: builtin/fetch.c:154 msgid "force overwrite of local reference" @@ -14943,7 +15026,7 @@ msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto" #: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -"limpiar tags locales que no se encuentran en el remoto y eliminar tags " +"limpiar tags locales que no se encuentren en el remoto y eliminar tags " "cambiados" #: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 @@ -14969,11 +15052,11 @@ msgstr "permitir actualizar la ref HEAD" #: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" -msgstr "historia profunda de un clon superficial" +msgstr "profundizar la historia de un clon superficial" #: builtin/fetch.c:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" -msgstr "historia profunda de un repositorio superficial basado en tiempo" +msgstr "profundizar la historia de un repositorio superficial hasta un tiempo" #: builtin/fetch.c:189 builtin/pull.c:221 msgid "convert to a complete repository" @@ -14981,7 +15064,7 @@ msgstr "convertir a un repositorio completo" #: builtin/fetch.c:192 msgid "prepend this to submodule path output" -msgstr "anteponer esto a salida de la ruta del submódulo" +msgstr "anteponer esto a la salida de ruta del submódulo" #: builtin/fetch.c:195 msgid "" @@ -15031,7 +15114,7 @@ msgstr "aceptar refspecs de stdin" #: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" -msgstr "No se puedo encontrar ref remota HEAD" +msgstr "No se pudo encontrar ref remota HEAD" #: builtin/fetch.c:757 #, c-format @@ -15062,11 +15145,11 @@ msgstr "[actualización de tag]" #: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 #: builtin/fetch.c:956 msgid "unable to update local ref" -msgstr "no se posible actualizar el ref local" +msgstr "no es posible actualizar el ref local" #: builtin/fetch.c:889 msgid "would clobber existing tag" -msgstr "podría golpear tag existente" +msgstr "sobrescribiría tag existente" #: builtin/fetch.c:911 msgid "[new tag]" @@ -15086,7 +15169,7 @@ msgstr "actualización forzada" #: builtin/fetch.c:961 msgid "non-fast-forward" -msgstr "avance lento" +msgstr "avance no rápido" #: builtin/fetch.c:1065 msgid "" @@ -15119,8 +15202,8 @@ msgstr "%s no envió todos los objetos necesarios\n" #: builtin/fetch.c:1129 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "rechazado %s porque raíces superficiales no pueden ser actualizada" #: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format @@ -15139,12 +15222,12 @@ msgstr "" #: builtin/fetch.c:1327 #, c-format msgid " (%s will become dangling)" -msgstr " (%s se pondrá colgado)" +msgstr " (%s se volverá colgante)" #: builtin/fetch.c:1328 #, c-format msgid " (%s has become dangling)" -msgstr " (%s se ha colgado)" +msgstr " (%s se ha vuelto colgante)" #: builtin/fetch.c:1360 msgid "[deleted]" @@ -15162,7 +15245,7 @@ msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío" #: builtin/fetch.c:1403 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" +msgstr "Valor \"%2$s\" de opción \"%1$s\" no es válido para %3$s" #: builtin/fetch.c:1406 #, c-format @@ -15220,48 +15303,52 @@ msgstr "" msgid "You need to specify a tag name." msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1995 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only necesita uno o más --negotiate-tip=*" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:2002 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" -msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" +msgstr "Extraer un grupo y especificar refspecs no tiene sentido" -#: builtin/fetch.c:2055 +#: builtin/fetch.c:2058 msgid "must supply remote when using --negotiate-only" msgstr "tiene que proveer un remoto cuando usa --negotiate-only" -#: builtin/fetch.c:2060 +#: builtin/fetch.c:2063 msgid "Protocol does not support --negotiate-only, exiting." msgstr "Protocolo no soporta --negotiate-only, saliendo." -#: builtin/fetch.c:2079 +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15269,11 +15356,11 @@ msgstr "" "--filter solo puede ser usado con el remoto configurado en extensions." "partialclone" -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic solo se puede usar cuando se busca desde un control remoto" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin solo se puede usar cuando se busca desde un control remoto" @@ -15341,7 +15428,7 @@ msgstr "mostrar solo <n> refs encontradas" #: builtin/for-each-ref.c:41 builtin/tag.c:483 msgid "respect format colors" -msgstr "respetar el formato de colores" +msgstr "respetar los colores de formato" #: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" @@ -15349,37 +15436,37 @@ msgstr "mostrar solo refs que apunten al objeto dado" #: builtin/for-each-ref.c:46 msgid "print only refs that are merged" -msgstr "mostrar solo refs que son fusionadas" +msgstr "mostrar solo refs que sean fusionadas" #: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" -msgstr "mostrar solo refs que no son fusionadas" +msgstr "mostrar solo refs que no sean fusionadas" #: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" -msgstr "mostrar solo refs que contienen el commit" +msgstr "mostrar solo refs que contengan el commit" #: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" -msgstr "mostrar solo refs que no contienen el commit" +msgstr "mostrar solo refs que no contengan el commit" #: builtin/for-each-repo.c:9 msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<config> <argumetnos-de-comando>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "config" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "clave de configuración que almacena una lista de rutas de repositorio" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "falta --config=<config>" -#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "desconocido" @@ -15395,16 +15482,16 @@ msgstr "error en %s %s: %s" msgid "warning in %s %s: %s" msgstr "peligro en %s %s: %s" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "link roto de %7s %s" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "tipo de objeto equivocado en link" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -15413,211 +15500,211 @@ msgstr "" "link roto de %7s %s\n" " a %7s %s" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" -msgstr "faltan %s %s" +msgstr "falta %s %s" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "inalcanzable %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "actualizando %s %s" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "no se pudo crear lost-found" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "no se pudo finalizar '%s'" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "Revisando %s" -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Verificando conectividad (%d objetos)" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "Revisando %s %s" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "links rotos" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "raíz %s" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" -msgstr "tag %s %s (%s) en %s" +msgstr "tagged %s %s (%s) en %s" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecto corrupto o faltante" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: referencia inválida %s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "Revisando reflog %s->%s" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: puntero sha1 inválido %s" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "%s: no es un commit" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "aviso: No hay referencias por defecto" -#: builtin/fsck.c:605 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objeto corrupto o no encontrado: %s" -#: builtin/fsck.c:618 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" -msgstr "%s: no se puede analizar objeto: %s" +msgstr "%s: no se pudo analizar objeto: %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "mal sha1 de archivo: %s" -#: builtin/fsck.c:653 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "Revisando directorio de objetos" -#: builtin/fsck.c:656 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "Revisando objetos directorios" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "Revisando link %s" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "%s inválido" -#: builtin/fsck.c:683 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "%s apunta a algo extraño (%s)" -#: builtin/fsck.c:689 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" -msgstr "%s: HEAD desacoplado apunta a nada" +msgstr "%s: HEAD desacoplado no apunta a nada" -#: builtin/fsck.c:693 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "aviso: %s apunta a un branch no nacido (%s)" -#: builtin/fsck.c:705 +#: builtin/fsck.c:706 msgid "Checking cache tree" -msgstr "Revisando el cache tree" +msgstr "Revisando el tree caché" -#: builtin/fsck.c:710 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntero inválido sha1 en cache-tree" -#: builtin/fsck.c:719 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "non-tree en cache-tree" -#: builtin/fsck.c:750 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" -#: builtin/fsck.c:756 +#: builtin/fsck.c:757 msgid "show unreachable objects" -msgstr "mostrar objetos ilegibles" +msgstr "mostrar objetos inalcanzables" -#: builtin/fsck.c:757 +#: builtin/fsck.c:758 msgid "show dangling objects" -msgstr "mostrar objetos colgados" +msgstr "mostrar objetos colgantes" -#: builtin/fsck.c:758 +#: builtin/fsck.c:759 msgid "report tags" msgstr "reportar tags" -#: builtin/fsck.c:759 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "reportar nodos raíz" -#: builtin/fsck.c:760 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "hacer objetos índices cabezas de nodos" -#: builtin/fsck.c:761 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "hacer reflogs cabeza de nodos (default)" -#: builtin/fsck.c:762 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "también considerar paquetes y objetos alternos" -#: builtin/fsck.c:763 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "revisar solo conectividad" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "habilitar revisión más estricta" -#: builtin/fsck.c:766 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" -msgstr "escribir objetos colgados en .git/lost-found" +msgstr "escribir objetos colgantes en .git/lost-found" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "mostrar progreso" -#: builtin/fsck.c:768 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" -msgstr "mostrar nombres verboso para objetos alcanzables" +msgstr "mostrar nombres verbosos de objetos alcanzables" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Revisando objetos" -#: builtin/fsck.c:855 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "%s: objeto faltante" -#: builtin/fsck.c:866 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'" @@ -15639,7 +15726,7 @@ msgstr "falló al analizar '%s' valor '%s'" #: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" -msgstr "no se pudo definir '%s'" +msgstr "no se puede hacer stat en '%s'" #: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 #, c-format @@ -15713,14 +15800,14 @@ msgstr "Vea \"git help gc\" para limpieza manual.\n" msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no " +"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force si no " "es así)" #: builtin/gc.c:705 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -"Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para " +"Hay demasiados objetos sueltos inalcanzables; ejecute 'git prune' para " "eliminarlos." #: builtin/gc.c:715 @@ -15748,11 +15835,11 @@ msgstr "falló al hacer prefetch a los remotos" #: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" -msgstr "no pudo iniciar el proceso 'git pack-objects'" +msgstr "no se pudo iniciar el proceso 'git pack-objects'" #: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" -msgstr "no pudo finalizar el proceso 'git pack-objects'" +msgstr "no se pudo finalizar el proceso 'git pack-objects'" #: builtin/gc.c:1091 msgid "failed to write multi-pack-index" @@ -15815,11 +15902,11 @@ msgstr "tarea" #: builtin/gc.c:1422 msgid "run a specific task" -msgstr "ruta a tarea específica" +msgstr "ejecutar una tarea específica" #: builtin/gc.c:1439 msgid "use at most one of --auto and --schedule=<frequency>" -msgstr "usar como máximo una entre --auto y --schedule=<frecuencia>" +msgstr "usar como máximo una de --auto y --schedule=<frecuencia>" #: builtin/gc.c:1482 msgid "failed to run 'git config'" @@ -15832,7 +15919,7 @@ msgstr "falló al expandir la ruta '%s'" #: builtin/gc.c:1576 msgid "failed to start launchctl" -msgstr "Falló al iniciar launchctl." +msgstr "falló al iniciar launchctl" #: builtin/gc.c:1613 #, c-format @@ -15850,21 +15937,21 @@ msgstr "no se pudo crear el archivo temp xml" #: builtin/gc.c:1835 msgid "failed to start schtasks" -msgstr "no pudo iniciar schtasks" +msgstr "no se pudo iniciar schtasks" #: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" -"no pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'" +"no se pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'" #: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" -"no pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'" +"no se pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'" #: builtin/gc.c:1900 msgid "failed to open stdin of 'crontab'" -msgstr "no pudo abrir stdin de 'crontab'" +msgstr "no se pudo abrir stdin de 'crontab'" #: builtin/gc.c:1942 msgid "'crontab' died" @@ -15905,8 +15992,8 @@ msgstr "número inválido de hilos especificado (%d) para %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 -#: builtin/pack-objects.c:2969 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" @@ -15914,255 +16001,255 @@ msgstr "no hay soporte para hilos, ignorando %s" #: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 #, c-format msgid "unable to read tree (%s)" -msgstr "no es posible leer el árbol (%s)" +msgstr "no es posible leer el árbol (%s)" #: builtin/grep.c:658 #, c-format msgid "unable to grep from object of type %s" msgstr "no es posible realizar grep del objeto de tipo %s" -#: builtin/grep.c:739 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:838 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:840 +#: builtin/grep.c:839 msgid "find in contents not managed by git" -msgstr "encontrar en contenidos no manejados por git" +msgstr "buscar en contenidos no manejados por git" -#: builtin/grep.c:842 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:844 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados vía '.gitignore'" -#: builtin/grep.c:846 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:849 +#: builtin/grep.c:848 msgid "show non-matching lines" -msgstr "mostrar líneas que no concuerdan" +msgstr "mostrar líneas que no concuerden" -#: builtin/grep.c:851 +#: builtin/grep.c:850 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:853 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:855 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:857 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:860 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:862 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" msgstr "buscar en subdirectorios (default)" -#: builtin/grep.c:864 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" -msgstr "descender como máximo <valor-de-profundiad> niveles" +msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:868 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:871 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:874 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" -msgstr "interpretar patrones como strings arreglados" +msgstr "interpretar patrones como strings fijos" -#: builtin/grep.c:877 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:880 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:881 +#: builtin/grep.c:880 msgid "show column number of first match" -msgstr "mostrar el número de columna de la primer coincidencia" +msgstr "mostrar el número de columna de la primera coincidencia" -#: builtin/grep.c:882 +#: builtin/grep.c:881 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:883 +#: builtin/grep.c:882 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:885 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:887 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:892 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "show only matching parts of a line" -msgstr "mostrar solo partes que concuerdan de una línea" +msgstr "mostrar solo las partes que concuerden de una línea" -#: builtin/grep.c:899 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "mostrar el número de concordancias en lugar de las líneas concordantes" -#: builtin/grep.c:900 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:902 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:904 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" msgstr "" "mostrar el nombre de archivo solo una vez para concordancias en el mismo " "archivo" -#: builtin/grep.c:907 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" -#: builtin/grep.c:910 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:912 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:914 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:915 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:918 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" msgstr "" "mostrar una línea con el nombre de la función antes de las concordancias" -#: builtin/grep.c:920 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:923 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:925 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:927 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:939 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:941 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" msgstr "" -"mostrar solo concordancias con archivos que concuerdan todos los patrones" +"mostrar solo concordancias con archivos que concuerdan con todos los patrones" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" msgstr "paginador" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 msgid "no pattern given" -msgstr "no se ha entregado patrón" +msgstr "no se ha entregado ningún patrón" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" -msgstr "no se posible resolver revisión: %s" +msgstr "no es posible resolver revisión: %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked no es soportada con --recurse-submodules" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "combinación de opciones inválida, ignorando --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no pueden ser usadas con --no-index" -#: builtin/grep.c:1161 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" msgstr "--untracked no se puede usar con --cached" -#: builtin/grep.c:1167 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado" -#: builtin/grep.c:1175 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" -msgstr "--cached y árboles han sido entregados" +msgstr "ambos --cached y árboles han sido entregados" #: builtin/hash-object.c:85 msgid "" @@ -16190,14 +16277,14 @@ msgstr "leer el objeto de stdin" #: builtin/hash-object.c:103 msgid "store file as is without filters" -msgstr "guardar el archivo como es sin filtros" +msgstr "guardar el archivo tal cual sin filtros" #: builtin/hash-object.c:104 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "solo realizar un hash a cualquier basura random para crear un objeto " -"corrupto para hacer debugging de Gti" +"corrupto para hacer debugging de Git" #: builtin/hash-object.c:105 msgid "process file as it were from this path" @@ -16213,7 +16300,7 @@ msgstr "excluir las guias" #: builtin/help.c:49 msgid "print list of useful guides" -msgstr "mostrar una lista de nociones utiles" +msgstr "mostrar una lista de guías útiles" #: builtin/help.c:50 msgid "print all configuration variable names" @@ -16221,15 +16308,15 @@ msgstr "imprimir todos los nombres de variables de configuración" #: builtin/help.c:52 msgid "show man page" -msgstr "mostrar la pagina del manual" +msgstr "mostrar la página del manual" #: builtin/help.c:53 msgid "show manual in web browser" -msgstr "mostrar la pagina del manual en un navegador web" +msgstr "mostrar la página del manual en un navegador web" #: builtin/help.c:55 msgid "show info page" -msgstr "mostrar la pagina de info" +msgstr "mostrar la página de info" #: builtin/help.c:57 msgid "print command description" @@ -16255,7 +16342,7 @@ msgstr "Falló al analizar la versión de emacsclient." #: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." -msgstr "la versión '%d' de emacsclient es muy antigua (<22)." +msgstr "la versión '%d' de emacsclient es demasiada antigua (<22)." #: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format @@ -16268,8 +16355,8 @@ msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -"'%s': ruta para el visualizador del manual no soportada.\n" -"Por favor considere usar 'man.<herramienta.cmd'." +"'%s': ruta para un visualizador del manual no soportado.\n" +"Por favor considere usar 'man.<herramienta>.cmd'." #: builtin/help.c:319 #, c-format @@ -16277,7 +16364,7 @@ msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -"'%s': comando no soportado para man viewer.\n" +"'%s': comando para man viewer soportado.\n" "Por favor considere usar 'man.<herramienta>.path." #: builtin/help.c:436 @@ -16285,30 +16372,30 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "'%s': visualizador de man desconocido." -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" -msgstr "ningún visualizador de manual proceso la petición" +msgstr "ningún visualizador de manual procesó la petición" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" -msgstr "ningún visor de info manejo la petición" +msgstr "ningún visor de info manejó la petición" -#: builtin/help.c:520 builtin/help.c:531 git.c:348 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' tiene el alias '%s'" -#: builtin/help.c:534 git.c:380 +#: builtin/help.c:531 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "mal alias.%s string: %s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "uso: %s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "'git help config' para más información" @@ -16340,15 +16427,15 @@ msgstr "EOF temprano" #: builtin/index-pack.c:306 msgid "read error on input" -msgstr "leer error en input" +msgstr "error al leer en input" #: builtin/index-pack.c:318 msgid "used more bytes than were available" msgstr "se usaron más bytes de los disponibles" -#: builtin/index-pack.c:325 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" -msgstr "paquete muy grande para la definición actual de off_t" +msgstr "paquete demasiado grande para la definición actual de off_t" #: builtin/index-pack.c:328 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" @@ -16373,245 +16460,245 @@ msgstr "firma del paquete no concuerda" msgid "pack version %<PRIu32> unsupported" msgstr "versión de paquete %<PRIu32> no soportada" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "inflate devolvió %d" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "valor de offset desbordado para el objeto base delta" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "offset de base delta está fuera de límites" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "tipo de objeto %d desconocido" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" -msgstr "no se puede propagar el paquete" +msgstr "no se puede hacer pread en el paquete" -#: builtin/index-pack.c:587 +#: builtin/index-pack.c:585 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante" msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" -#: builtin/index-pack.c:613 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 -#: builtin/index-pack.c:827 builtin/index-pack.c:836 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" -msgstr "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" +msgstr "¡ COLISIÓN DE SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:761 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" -msgstr "no se posible leer %s" +msgstr "no es posible leer %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "no se puede leer la información existente del objeto %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s inválido" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "error de fsck en el objeto empaquetado" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No todos los objetos hijos de %s son alcanzables" -#: builtin/index-pack.c:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "falló al aplicar delta" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "Recibiendo objetos" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "Indexando objetos" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paquete está corrompido (SHA1 no concuerda)" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "no se puede fstat al archivo de paquete" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "el paquete tiene basura al final" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusión más allá de la locura en parse_pack_objects()" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "Resolviendo deltas" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "no es posible crear hilo: %s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "confusión más allá de la locura" -#: builtin/index-pack.c:1289 +#: builtin/index-pack.c:1287 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "completado con %d objeto local" msgstr[1] "completado con %d objetos locales" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1303 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paquete tiene %d delta sin resolver" msgstr[1] "paquete tiene %d deltas sin resolver" -#: builtin/index-pack.c:1329 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no es posible desinflar el objeto adjunto (%d)" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s está corrompido" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" -msgstr "no se puede escribir %s en el archivo '%s'" +msgstr "no se puede escribir archivo '%2$s' de %1$s" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" -msgstr "no se puede cerrar escrito %s en archivo '%s'" +msgstr "no se puede cerrar el archivo escrito '%2$s' de %1$s" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" -msgstr "error mientras se cierra el archivo paquete" +msgstr "error mientras se cerraba el archivo paquete" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "no se puede guardar el archivo paquete" -#: builtin/index-pack.c:1526 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "no se puede guardar el archivo índice" -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" -msgstr "No se puede abrir el índice del archivo paquete para '%s'" +msgstr "No se puede abrir el archivo índice del paquete para '%s'" -#: builtin/index-pack.c:1701 +#: builtin/index-pack.c:1699 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "no delta: %d objeto" msgstr[1] "no delta: %d objetos" -#: builtin/index-pack.c:1708 +#: builtin/index-pack.c:1706 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "largo de cadena = %d: %lu objeto" msgstr[1] "largo de cadena = %d: %lu objetos" -#: builtin/index-pack.c:1750 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "No se puede regresar a cwd" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 -#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algoritmo hash desconocido '%s'" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format no se puede usar con --stdin" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" #: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" -msgstr "no se pudo definir template '%s'" +msgstr "no se pudo hacer stat en la template '%s'" #: builtin/init-db.c:68 #, c-format @@ -16648,56 +16735,56 @@ msgstr "template no encontrado en %s" msgid "not copying templates from '%s': %s" msgstr "no se copian templates de '%s': %s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "nombre de rama inicial inválido: '%s'" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "no es posible manejar el tipo de archivo %d" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "no se puede mover %s a %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" -msgstr "intentar reinicializar el repositorio con un hash diferente" +msgstr "intento de reinicializar el repositorio con un hash diferente" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s ya existe" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: ignorando --initial-branch=%s" -#: builtin/init-db.c:462 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n" -#: builtin/init-db.c:463 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Reinicializado el repositorio Git existente en %s%s\n" -#: builtin/init-db.c:467 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Inicializado repositorio Git compartido vacío en %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Inicializado repositorio Git vacío en %s%s\n" -#: builtin/init-db.c:517 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16705,42 +16792,42 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--" "shared[=<permisos>]] [<directorio>]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especifica que el repositorio de git será compartido entre varios usuarios" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "sobrescribir el nombre de la rama inicial" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "especificar el algoritmo hash a usar" -#: builtin/init-db.c:559 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir y --bare son mutuamente excluyentes" -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" -msgstr "no se pude crear directorio %s" +msgstr "no se puede crear directorio %s" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "no se puede aplicar chdir a %s" -#: builtin/init-db.c:626 +#: builtin/init-db.c:627 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -16749,12 +16836,12 @@ msgstr "" "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-" "dir=<directorio>)" -#: builtin/init-db.c:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "No se puede acceder al árbol de trabajo '%s'" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir incompatible con el repositorio desnudo" @@ -16768,7 +16855,7 @@ msgstr "" #: builtin/interpret-trailers.c:95 msgid "edit files in place" -msgstr "editar archivos en el lugar" +msgstr "editar archivos en lugar" #: builtin/interpret-trailers.c:96 msgid "trim empty trailers" @@ -16780,7 +16867,7 @@ msgstr "donde colocar el nuevo trailer" #: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" -msgstr "acción if trailer ya existe" +msgstr "acción si trailer ya existe" #: builtin/interpret-trailers.c:103 msgid "action if trailer is missing" @@ -16820,7 +16907,7 @@ msgstr "no se entregó archivo de entrada para edición en lugar" #: builtin/log.c:59 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" +msgstr "git log [<opciones>] [<rango-de-revisiones>] [[--] <ruta>...]" #: builtin/log.c:60 msgid "git show [<options>] <object>..." @@ -16849,99 +16936,99 @@ msgstr "no decorar refs que concuerden con <patrón>" #: builtin/log.c:187 msgid "decorate options" -msgstr "opciones de decorado" +msgstr "opciones de decoración" #: builtin/log.c:190 msgid "" "trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" msgstr "" -"rastrear la evolución del rango de línea <inicio>, <fin> o función: <nombre-" +"rastrear la evolución del rango de línea <inicio>,<fin> o función :<nombre-" "funcion> en <archivo>" #: builtin/log.c:213 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<rango>:<archivo> no se puede usar con pathspec" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:568 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "no se pudo leer objeto %s" -#: builtin/log.c:698 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "tipo desconocido: %d" -#: builtin/log.c:843 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: modo cover from description inválido" -#: builtin/log.c:850 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers sin valor" -#: builtin/log.c:979 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "no se puede abrir archivo patch %s" -#: builtin/log.c:996 +#: builtin/log.c:999 msgid "need exactly one range" -msgstr "necesita exactamente un rango" +msgstr "se necesita exactamente un rango" -#: builtin/log.c:1006 +#: builtin/log.c:1009 msgid "not a range" msgstr "no es un rango" -#: builtin/log.c:1170 +#: builtin/log.c:1173 msgid "cover letter needs email format" -msgstr "letras de portada necesita formato email" +msgstr "carta de portada necesita formato email" -#: builtin/log.c:1176 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "falló al crear los archivos cover-letter" -#: builtin/log.c:1263 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1290 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1348 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "¿dos directorios de salida?" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "commit desconocido %s" -#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "falló al resolver '%s' como ref válida" -#: builtin/log.c:1519 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "no se pudo encontrar una base de fusión exacta" -#: builtin/log.c:1529 +#: builtin/log.c:1532 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16953,294 +17040,294 @@ msgstr "" "O puedes especificar un commit base mediante --base=<id-commit-base> " "manualmente" -#: builtin/log.c:1552 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "falló al encontrar una base de fusión exacta" -#: builtin/log.c:1569 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "el commit base debe ser el ancestro de la lista de revisión" -#: builtin/log.c:1579 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "el commit base no debe estar en la lista de revisión" -#: builtin/log.c:1637 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1700 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" msgstr "falló al inferir rangos range-diff de la serie actual" -#: builtin/log.c:1702 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "usando '%s' como origen de diferencia de rango de la serie actual" -#: builtin/log.c:1746 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un único parche" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con múltiples parches" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1755 +#: builtin/log.c:1758 msgid "generate a cover letter" -msgstr "generar letra de cover" +msgstr "generar carta de cover" -#: builtin/log.c:1757 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "" -"usar una secuencia simple de números para salida de nombres de archivos" +"usar una secuencia simple de números para los nombres de archivos de salida" -#: builtin/log.c:1758 +#: builtin/log.c:1761 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1759 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1761 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1762 +#: builtin/log.c:1765 msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c:1763 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1765 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "tamaño máximo de nombre de archivo resultante" -#: builtin/log.c:1767 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "use [RFC PATCH] en lugar de [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "modo-cover-from-description" -#: builtin/log.c:1771 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "" "genera partes de una carta de presentación basado en la descripción de la " "rama" -#: builtin/log.c:1773 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1776 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1779 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1782 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1784 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" -msgstr "salida como hash de todos-ceros en la cabecera From" +msgstr "poner hash de todos ceros en la cabecera From" -#: builtin/log.c:1786 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "no incluya un parche que coincida con un commit en upstream" -#: builtin/log.c:1788 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1790 +#: builtin/log.c:1793 msgid "Messaging" -msgstr "Mensajeando" +msgstr "Mensajería" -#: builtin/log.c:1791 +#: builtin/log.c:1794 msgid "header" msgstr "cabezal" -#: builtin/log.c:1792 +#: builtin/log.c:1795 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "email" -#: builtin/log.c:1793 +#: builtin/log.c:1796 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1794 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1795 +#: builtin/log.c:1798 msgid "ident" msgstr "ident" -#: builtin/log.c:1796 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -"configurar dirección From a <ident> ( o identidad de committer si está " +"configurar dirección From a <ident> (o identidad de committer si está " "ausente)" -#: builtin/log.c:1798 +#: builtin/log.c:1801 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1799 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "límite" -#: builtin/log.c:1801 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1804 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "poner el parche en línea" -#: builtin/log.c:1808 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1810 +#: builtin/log.c:1813 msgid "signature" msgstr "firma" -#: builtin/log.c:1811 +#: builtin/log.c:1814 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1812 +#: builtin/log.c:1815 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1813 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "" "agregar información de árbol de requisitos previos a la serie de parches" -#: builtin/log.c:1816 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1817 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1819 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1821 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" msgstr "muestra cambios contra <rev> en cover letter o en un solo parche" -#: builtin/log.c:1824 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "porcentaje por el cual la creación es pesada" -#: builtin/log.c:1913 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "línea de identificación inválida: %s" -#: builtin/log.c:1928 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n y -k son mutuamente exclusivas" -#: builtin/log.c:1930 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos" -#: builtin/log.c:1938 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1940 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1942 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1964 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout, --output, and --output-directory son mutuamente exclusivas" -#: builtin/log.c:2087 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiere --cover-letter o un parche único" -#: builtin/log.c:2091 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2092 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contra v%d:" -#: builtin/log.c:2098 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiere --range-diff" -#: builtin/log.c:2102 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiere --cover-letter o parche único" -#: builtin/log.c:2110 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:2111 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff contra v%d:" -#: builtin/log.c:2122 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:2158 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:2202 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "falló al crear los archivos de salida" -#: builtin/log.c:2261 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17286,16 +17373,15 @@ msgstr "mostrar archivos ignorados en la salida" #: builtin/ls-files.c:636 msgid "show staged contents' object name in the output" -msgstr "" -"mostrar contenido de nombres de objetos en el área de stage en la salida" +msgstr "mostrar nombre de objeto del contenido del área de stage en la salida" #: builtin/ls-files.c:638 msgid "show files on the filesystem that need to be removed" -msgstr "mostrar archivos en el filesystem que necesitan ser borrados" +msgstr "mostrar archivos en el filesystem que necesiten ser borrados" #: builtin/ls-files.c:640 msgid "show 'other' directories' names only" -msgstr "mostrar solo nombres de 'directorios otros'" +msgstr "mostrar solo nombres de 'otros' directorios" #: builtin/ls-files.c:642 msgid "show line endings of files" @@ -17323,8 +17409,7 @@ msgstr "excluir patrones leídos de <archivo>" #: builtin/ls-files.c:657 msgid "read additional per-directory exclude patterns in <file>" -msgstr "" -"leer patrones de exclusión de manera adicional por directorio en <archivo>" +msgstr "leer patrones adicionales de exclusión por directorio en <archivo>" #: builtin/ls-files.c:659 msgid "add the standard git exclusions" @@ -17349,7 +17434,7 @@ msgstr "árbol-ismo" #: builtin/ls-files.c:670 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -"fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> " +"fingir que las rutas hayan sido borradas ya que todavía hay <árbol-ismos> " "presentes" #: builtin/ls-files.c:672 @@ -17523,7 +17608,7 @@ msgstr "mostrar todos los ancestros comunes" #: builtin/merge-base.c:145 msgid "find ancestors for a single n-way merge" -msgstr "encontrar ancestros para una única fusión de n-vías" +msgstr "encontrar ancestros para una única fusión de n vías" #: builtin/merge-base.c:147 msgid "list revs not reachable from others" @@ -17535,7 +17620,7 @@ msgstr "¿es el primer ancestro del otro?" #: builtin/merge-base.c:151 msgid "find where <commit> forked from reflog of <ref>" -msgstr "encontrar donde <commit> forjó del reflog de <ref>" +msgstr "encontrar donde <commit> bifurcó del reflog de <ref>" #: builtin/merge-file.c:9 msgid "" @@ -17551,7 +17636,7 @@ msgstr "mandar resultados a standard output" #: builtin/merge-file.c:36 msgid "use a diff3 based merge" -msgstr "usar un fusión basada en diff3" +msgstr "usar una fusión basada en diff3" #: builtin/merge-file.c:37 msgid "for conflicts, use our version" @@ -17567,7 +17652,7 @@ msgstr "por conflictos, usar una versión de unión" #: builtin/merge-file.c:44 msgid "for conflicts, use this marker size" -msgstr "por conflictos, usar el tamaño de este marcador" +msgstr "por conflictos, usar este tamaño de marcador" #: builtin/merge-file.c:45 msgid "do not warn about conflicts" @@ -17596,7 +17681,7 @@ msgstr[1] "no se puede manejar más de %d bases. Ignorando %s." #: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." -msgstr "no manejando nada distinto a fusiones de dos heads." +msgstr "no manejando nada distinto a fusión de dos heads." #: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format @@ -17612,17 +17697,9 @@ msgstr "Fusionando %s con %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opciones>] [<commit>...]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - #: builtin/merge.c:123 msgid "switch `m' requires a value" -msgstr "cambiar `m' requiere un valor" +msgstr "opción `m' requiere un valor" #: builtin/merge.c:146 #, c-format @@ -17676,7 +17753,7 @@ msgstr "editar mensaje antes de realizar commit" #: builtin/merge.c:271 msgid "allow fast-forward (default)" -msgstr "permitir fast-forwars (default)" +msgstr "permitir fast-forward (default)" #: builtin/merge.c:273 builtin/pull.c:161 msgid "abort if fast-forward is not possible" @@ -17684,7 +17761,7 @@ msgstr "abortar si fast-forward no es posible" #: builtin/merge.c:277 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" -msgstr "verificar que el commit nombrado tiene una firma GPG válida" +msgstr "verificar que el commit nombrado tenga una firma GPG válida" #: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 #: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 @@ -17713,7 +17790,7 @@ msgstr "abortar la fusión en progreso actual" #: builtin/merge.c:292 msgid "--abort but leave index and working tree alone" -msgstr "--abort pero deja el índice y el árbol de trabajo solos" +msgstr "--abort pero no tocar el índice ni el árbol de trabajo" #: builtin/merge.c:294 msgid "continue the current in-progress merge" @@ -17763,38 +17840,37 @@ msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningún commit" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opción desconocida para merge-recursive: -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" -msgstr "No se puedo leer de '%s'" +msgstr "No se pudo leer de '%s'" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"No se realiza commit de la fusión; use 'git commit' para completar la " -"fusión.\n" +"No se realiza commit de fusión; use 'git commit' para completar la fusión.\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 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" @@ -17806,87 +17882,87 @@ msgstr "" "tópico.\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "Un mensaje vacío aborta el commit.\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" -" el commit.\n" +"el commit.\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Fusión automática falló; arregle los conflictos y luego realice un commit " "con el resultado.\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." -msgstr "Por defecto, no hay un upstream definido para la rama actual." +msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" -msgstr "No hay rama de rastreo remoto para %s de %s" +msgstr "No hay rama de rastreo remota para %s de %s" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor erróneo '%s' en el entorno '%s'" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit no espera argumentos" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17894,7 +17970,7 @@ msgstr "" "No has concluido la fusión (existe MERGE_HEAD).\n" "Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17902,89 +17978,89 @@ msgstr "" "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" "Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "No se puede combinar --squash con --commit." -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" -msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" +msgstr "Aplastar un commit a un head vacío no es soportado todavía" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "Solo se puede fusionar exactamente un commit en un head vacío" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" -msgstr "Nop.\n" +msgstr "No.\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "Usando el %s para preparar resolución a mano.\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "Usando estrategia %s para preparar resolución a mano.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -18012,12 +18088,12 @@ msgstr "%d (FSCK_IGNORE?) nunca debería activar esta devolución de llamada" #: builtin/mktag.c:56 #, c-format msgid "could not read tagged object '%s'" -msgstr "no se pudo leer objeto de tag '%s'" +msgstr "no se pudo leer objeto etiquetado '%s'" #: builtin/mktag.c:59 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" -msgstr "objeto '%s' es taggeado como '%s', pero es un tipo '%s'" +msgstr "objeto '%s' es etiquetado como '%s', pero es de tipo '%s'" #: builtin/mktag.c:97 msgid "tag on stdin did not pass our strict fsck check" @@ -18065,7 +18141,8 @@ msgstr "git multi-pack-index [<opciones>] repack [--batch-size=<tamaño>]" #: builtin/multi-pack-index.c:54 msgid "object directory containing set of packfile and pack-index pairs" -msgstr "objeto directorio conteniendo conjuntos de pares packfile y pack-index" +msgstr "" +"directorio de objetos conteniendo conjunto de pares de packfile y pack-index" #: builtin/multi-pack-index.c:69 msgid "preferred-pack" @@ -18081,9 +18158,9 @@ msgid "" "larger than this size" msgstr "" "durante el repack, recolectar los pack-files de tamaño menor en un batch que " -"es más grande que este tamaño" +"sea más grande que este tamaño" -#: builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "subcomando desconocido: %s" @@ -18100,8 +18177,8 @@ msgstr "¿Directorio %s está en el índice y no hay submódulo?" #: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash " -"para proceder" +"Por favor agrega tus cambios a .gitmodules al stage o realiza un stash para " +"proceder" #: builtin/mv.c:103 #, c-format @@ -18110,7 +18187,7 @@ msgstr "%.*s está en el índice" #: builtin/mv.c:125 msgid "force move/rename even if target exists" -msgstr "forzar mover/renombrar incluso si el objetivo existe" +msgstr "forzar mover/renombrar incluso si el destino existe" #: builtin/mv.c:127 msgid "skip move/rename errors" @@ -18132,7 +18209,7 @@ msgstr "mala fuente" #: builtin/mv.c:188 msgid "can not move directory into itself" -msgstr "no se pude mover un directorio en sí mismo" +msgstr "no se puede mover un directorio en sí mismo" #: builtin/mv.c:191 msgid "cannot move directory over file" @@ -18144,7 +18221,7 @@ msgstr "directorio de fuente está vacío" #: builtin/mv.c:225 msgid "not under version control" -msgstr "no se encuentra bajo control de versión" +msgstr "no se encuentra bajo control de versiones" #: builtin/mv.c:227 msgid "conflicted" @@ -18165,7 +18242,7 @@ msgstr "No se puede sobrescribir" #: builtin/mv.c:244 msgid "multiple sources for the same target" -msgstr "múltiples fuentes para el mismo objetivo" +msgstr "múltiples fuentes para el mismo destino" #: builtin/mv.c:246 msgid "destination directory does not exist" @@ -18184,7 +18261,7 @@ msgstr "Renombrando %s a %s\n" #: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 #, c-format msgid "renaming '%s' failed" -msgstr "renombrando '%s' falló" +msgstr "renombrar '%s' falló" #: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." @@ -18204,7 +18281,7 @@ msgstr "imprimir solo nombres basados en referencias (sin nombres de objetos)" #: builtin/name-rev.c:525 msgid "only use tags to name the commits" -msgstr "sólo usar tags para nombrar commits" +msgstr "solo usar tags para nombrar commits" #: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" @@ -18395,7 +18472,7 @@ msgstr "falló al leer objeto '%s'." #: builtin/notes.c:268 #, c-format msgid "cannot read note data from non-blob object '%s'." -msgstr "no se puede leer la data de la nota de un objeto no-blob '%s'." +msgstr "no se puede leer los datos de la nota de un objeto no blob '%s'." #: builtin/notes.c:309 #, c-format @@ -18437,7 +18514,7 @@ msgstr "contenidos de la nota en un archivo" #: builtin/notes.c:416 builtin/notes.c:582 msgid "reuse and edit specified note object" -msgstr "reutilizar y editar el objeto de nota especificada" +msgstr "reutilizar y editar el objeto de nota especificado" #: builtin/notes.c:419 builtin/notes.c:585 msgid "reuse specified note object" @@ -18468,7 +18545,7 @@ msgstr "Sobrescribiendo notas existentes para objeto %s\n" #: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 #, c-format msgid "Removing note for object %s\n" -msgstr "Removiendo nota para objeto %s\n" +msgstr "Quitando nota del objeto %s\n" #: builtin/notes.c:497 msgid "read objects from stdin" @@ -18480,7 +18557,7 @@ msgstr "cargar configuración de reescritura para <comando> (implica --stdin)" #: builtin/notes.c:517 msgid "too few arguments" -msgstr "muy pocos argumentos" +msgstr "demasiados pocos argumentos" #: builtin/notes.c:538 #, c-format @@ -18489,12 +18566,12 @@ msgid "" "existing notes" msgstr "" "No se puede copiar notas. Se encontró notas existentes para el objeto %s. " -"Use '-f' para sobrescribir las notes existentes" +"Use '-f' para sobrescribir las notas existentes" #: builtin/notes.c:550 #, c-format msgid "missing notes on source object %s. Cannot copy." -msgstr "faltan notas en la fuente del objeto %s. No se puede copiar." +msgstr "faltan notas en el objeto de fuente %s. No se puede copiar." #: builtin/notes.c:603 #, c-format @@ -18535,7 +18612,7 @@ msgstr "falló al resolver NOTES_MERGE_REF" #: builtin/notes.c:742 msgid "failed to finalize notes merge" -msgstr "falló al finalizar las notas de fusión" +msgstr "falló al finalizar la fusión de notas" #: builtin/notes.c:768 #, c-format @@ -18555,7 +18632,7 @@ msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -"resolver conflictos de notas usando la estrategia entregadas (manual/ours/" +"resolver conflictos de notas usando la estrategia entregada (manual/ours/" "theirs/union/cat_sort_uniq)" #: builtin/notes.c:790 @@ -18569,19 +18646,19 @@ msgstr "" #: builtin/notes.c:794 msgid "Aborting notes merge resolution" -msgstr "Abortando notas de resolución de fusión" +msgstr "Abortando resolución de fusión de notas" #: builtin/notes.c:796 msgid "abort notes merge" -msgstr "abortar notas de fusión" +msgstr "abortar fusión de notas" #: builtin/notes.c:807 msgid "cannot mix --commit, --abort or -s/--strategy" -msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy" +msgstr "no se pueden mezclar --commit, --abort o -s/--strategy" #: builtin/notes.c:812 msgid "must specify a notes ref to merge" -msgstr "debe especificar una ref de notas a fusionar" +msgstr "se debe especificar una ref de notas a fusionar" #: builtin/notes.c:836 #, c-format @@ -18627,7 +18704,7 @@ msgstr "intentar eliminar una nota no existente no es un error" msgid "read object names from the standard input" msgstr "leer nombres de objetos de standard input" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "no eliminar, solo mostrar" @@ -18643,26 +18720,26 @@ msgstr "referencia-de-notas" msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-" "objetos>]" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18671,111 +18748,111 @@ msgstr "" "write_reuse_object: no se pudo localizar %s, se esperaba en el " "desplazamiento %<PRIuMAX> en el paquete %s" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" -msgstr "mal paquete de objeto CRC para %s" +msgstr "mal CRC del paquete de objeto para %s" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "objeto empaquetado corrupto para %s" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" -msgstr "delta recursivo encontrado para objeto %s" +msgstr "delta recursiva encontrada para objeto %s" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objetos ordenados, esperados %<PRIu32>" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "deshabilitando escritura bitmap, paquetes son divididos debido a pack." "packSizeLimit" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1168 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "falló al iniciar %s" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>" -#: builtin/pack-objects.c:1383 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "deshabilitando escritura bitmap, ya que algunos objetos no están siendo " "empaquetados" -#: builtin/pack-objects.c:1831 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" -msgstr "overflow de offset en la base de delta en paquete para %s" +msgstr "overflow de offset de base de delta en paquete para %s" -#: builtin/pack-objects.c:1840 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" -msgstr "outbound de offset en la base de delta para %s" +msgstr "offset de base de delta está fuera de límites para %s" -#: builtin/pack-objects.c:2121 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "Contando objetos" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "incapaz de analizar header del objeto %s" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 -#: builtin/pack-objects.c:2362 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, c-format msgid "object %s cannot be read" msgstr "objeto %s no puede ser leído" -#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2376 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - fuera de memoria" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compresión delta usando hasta %d hilos" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "no es posible empaquetar objetos alcanzables desde tag %s" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "inconsistencia con la cuenta de delta" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18784,7 +18861,7 @@ msgstr "" "valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-" "objeto> <hash-de-pack> <uri>' (se tuvo '%s')" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3164 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -18792,26 +18869,26 @@ msgstr "" "objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo " "'%s')" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3199 #, c-format msgid "could not get type of object %s in pack %s" msgstr "no se puede obtener el tipo de objeto %s en pack %s" -#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 #, c-format msgid "could not find pack '%s'" msgstr "no se pudo encontrar pack '%s'" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -"se espseraba ID de objeto al borde, se obtuvo basura:\n" +"se esperaba ID de objeto al borde, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18820,259 +18897,259 @@ msgstr "" "se esperaba ID de objeto, se obtuvo basuta:\n" "%s" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "valor inválido para --missing" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "no se puede abrir índice de paquetes" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" -msgstr "objeto perdido en %s no pudo ser examinado" +msgstr "objeto suelto en %s no pudo ser examinado" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" -msgstr "incapaz de forzar un objeto perdido" +msgstr "incapaz de forzar que el objecto se suelte" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "no es una rev '%s'" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "mala revisión '%s'" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "incapaz de añadir objetos recientes" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "<versión>[,<offset>]" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "" "escribir el índice de paquete en la versión de formato idx especificado" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" -msgstr "ignorar objetos paquete" +msgstr "ignorar objetos empaquetados" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" -#: builtin/pack-objects.c:3769 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud máxima de cadena delta permitida en el paquete resultante" -#: builtin/pack-objects.c:3771 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:3779 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" -msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" +msgstr "limitar los objetos a aquellos que no hayan sido empaquetados todavía" -#: builtin/pack-objects.c:3786 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3955 msgid "read packs from stdin" msgstr "leer packs de stdin" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" -msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" +msgstr "incluir objetos tag que refieran a objetos a ser empaquetados" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "usar el algoritmo sparse reachability" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" -msgstr "ignorar paquetes que tienen un archivo .keep acompañante" +msgstr "ignorar paquetes que tengan un archivo .keep acompañante" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "ignorar este paquete" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar un índice bitmap si está disponible para acelerar la cuenta de objetos" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "escribir un índice de bitmap junto al índice de paquete" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "escribir un índice de bitmap si es posible" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "no se puede empaquetar objetos en packfiles promisores" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "respetar islas durante la compresión delta" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "protocolo" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "excluyendo cualquier uploadpack.blobpackfileuri configurado con este " "protocolo" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" -msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d" +msgstr "profundidad de cadena de delta %d es demasiada profunda, forzando %d" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" -msgstr "pack.deltaCacheLimit es muy grande, forzando %d" +msgstr "pack.deltaCacheLimit es demasiado grande, forzando %d" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size no puede ser usado para construir un paquete para " "transferencia" -#: builtin/pack-objects.c:3936 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "tamaño mínimo del paquete es 1 MiB" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin no puede ser usado para construir un paquete indexable" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable y --unpack-unreachable son incompatibles" -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" -msgstr "no se puede usar--filter sin --stdout" +msgstr "no se puede usar --filter sin --stdout" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4112 msgid "cannot use --filter with --stdin-packs" -msgstr "no se puede usar--filter con --stdin-packs" +msgstr "no se puede usar --filter con --stdin-packs" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4116 msgid "cannot use internal rev list with --stdin-packs" msgstr "no se puede usar un lista interna de rev con --stdin-packs" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "Enumerando objetos" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" "reused %<PRIu32>" msgstr "" -"Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-" -"reusado %<PRIu32>" +"Total %<PRIu32> (delta %<PRIu32>), reusados %<PRIu32> (delta %<PRIu32>), " +"pack-reusados %<PRIu32>" #: builtin/pack-redundant.c:601 msgid "" @@ -19083,7 +19160,7 @@ msgid "" "to <git@vger.kernel.org>. Thanks.\n" msgstr "" "'git pack-redundant' está nominado para su eliminación.\n" -"Si todavía usa este comando, agregue un extra\n" +"Si todavía usa este comando, agregue una extra\n" "opción, '--i-still-use-this', en la línea de comando\n" "y háganos saber que todavía lo usa enviando un correo electrónico\n" "a <git@vger.kernel.org>. Gracias.\n" @@ -19114,7 +19191,7 @@ msgstr "reportar objetos recortados" #: builtin/prune.c:136 msgid "expire objects older than <time>" -msgstr "expirar objetos más viejos a <tiempo>" +msgstr "caducar objetos más viejos a <tiempo>" #: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" @@ -19122,7 +19199,7 @@ msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor" #: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" -msgstr "no se puede recortar en un repositorio de objetos-preciosos" +msgstr "no se puede recortar en un repositorio de objetos preciosos" #: builtin/pull.c:45 builtin/pull.c:47 #, c-format @@ -19188,9 +19265,9 @@ msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -"Generalmente esto significa que has proveído un wildcard de refspec que no " +"Generalmente esto significa que has proveído un refspec de wildcard que no " "tiene\n" -"concordancia en el final remoto." +"concordancia en el lado remoto." #: builtin/pull.c:451 #, c-format @@ -19205,7 +19282,7 @@ msgstr "" #: builtin/pull.c:456 builtin/rebase.c:1248 msgid "You are not currently on a branch." -msgstr "No te encuentras actualmente en la rama." +msgstr "No te encuentras actualmente en una rama." #: builtin/pull.c:458 builtin/pull.c:473 msgid "Please specify which branch you want to rebase against." @@ -19236,7 +19313,7 @@ msgstr "No hay información de rastreo para la rama actual." msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -"Si deseas configurar el rastreo de información para esta rama, puedes " +"Si deseas configurar la información de rastreo para esta rama, puedes " "hacerlo con:" #: builtin/pull.c:485 @@ -19246,7 +19323,7 @@ msgid "" "from the remote, but no such ref was fetched." msgstr "" "Tu configuración especifica fusionar con la ref '%s'\n" -"de tu remoto, pero no se pudo hacer fetch a esa ref." +"del remoto, pero no se pudo hacer fetch a esa ref." #: builtin/pull.c:596 #, c-format @@ -19283,23 +19360,23 @@ msgstr "" "\n" "Puedes reemplazar \"git config\" con \"git config --global\" para aplicar\n" "la preferencia en todos los repositorios. Puedes también pasar --rebase,\n" -"--no-rebase, o --ff-only en el comando para sobreescribir la configuración\n" +"--no-rebase, o --ff-only en el comando para sobrescribir la configuración\n" "por defecto en cada invocación.\n" "\n" -#: builtin/pull.c:991 +#: builtin/pull.c:990 msgid "Updating an unborn branch with changes added to the index." -msgstr "Actualizando una rama no nata con cambios agregados al índice." +msgstr "Actualizando una rama no nacida con cambios agregados al índice." -#: builtin/pull.c:995 +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:996 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:1021 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19310,7 +19387,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:1027 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19321,21 +19398,21 @@ msgid "" "to recover." msgstr "" "No se puede realizar fast-forward en tu árbol de trabajo.\n" -"Tras asegurarse que ha guardado todo lo preciado de la salida de\n" +"Tras asegurarse que haya guardado todo lo preciado de la salida de\n" "$ git diff %s\n" ",ejecute\n" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:1042 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:1046 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:1067 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -19343,7 +19420,7 @@ msgstr "" #: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -"git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" +"git push [<opciones>] [<repositorio> [<especificación-de-referencia>...]]" #: builtin/push.c:111 msgid "tag shorthand without <tag>" @@ -19402,7 +19479,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -19416,12 +19493,19 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push." -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"No se especificó ningún refspec para hacer push, y push.default es \"nothing" +"\"." + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -19432,13 +19516,7 @@ msgstr "" "la rama actual '%s', sin decirme qué poner en el push\n" "para actualizar en qué rama de remoto." -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "" -"No se especificó ningún refspecs para hacer push, y push.default es \"nada\"." - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -19450,7 +19528,7 @@ msgstr "" "'git pull ...') antes de hacer push de nuevo.\n" "Mira 'Note about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:273 +#: builtin/push.c:264 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" @@ -19463,7 +19541,7 @@ msgstr "" "(ejem. 'git pull ...') antes de volver a hacer push.\n" "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:279 +#: builtin/push.c:270 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" @@ -19475,134 +19553,133 @@ msgstr "" "no existe localmente. Esto es causado usualmente por otro repositorio\n" "realizando push a la misma ref. Quizás quiera integrar primero los cambios\n" "remotos (ej. 'git pull ...') antes de volver a hacer push.\n" -"Vea 'Notes about fast-forwards0 en 'git push --help' para detalles." +"Vea 'Notes about fast-forwards' en 'git push --help' para detalles." -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto." -#: builtin/push.c:289 +#: builtin/push.c:280 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 "" -"No se puede actualizar un ref remoto que apunta a un objeto no-commit,\n" -"o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" +"No se puede actualizar un ref remoto que apunta a un objeto no commit,\n" +"o actualizar un ref remoto para hacer que apunte a un objeto no commit,\n" "sin usar la opción '--force'.\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" "to integrate those changes locally (e.g., 'git pull ...')\n" "before forcing an update.\n" msgstr "" -"Las actualizaciones se rechazaron porque la sugerencia del seguimiento " -"remoto\n" -"rama se ha actualizado desde la última vez que se realizó la compra. Es " +"Las actualizaciones se rechazaron porque la punta de la rama de seguimiento\n" +"remoto se ha actualizado desde la última vez que se realizó checkout. Es " "posible que desee\n" -"para integrar esos cambios localmente (por ejemplo, 'git pull ...')\n" +"integrar esos cambios localmente (por ejemplo, 'git pull ...')\n" "antes de forzar una actualización.\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "Haciendo push a %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "falló el push de algunas referencias a '%s'" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "repositorio" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "borrar refs" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" msgstr "realizar push a tags (no puede ser usado con --all o --mirror)" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<refname>:<expect>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" -msgstr "requiere haber valor viejo de ref en este valor" +msgstr "requiere que el valor viejo de ref sea este valor" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "requieren que las actualizaciones remotas se integren localmente" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de submódulos" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 #: builtin/send-pack.c:187 msgid "receive pack program" -msgstr "recibir programa de paquete" +msgstr "programa de recepción de paquetes" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "configurar upstream para git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" -msgstr "recortando refs eliminadas localmente" +msgstr "recortar refs eliminadas localmente" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "hacer un bypass al hook pre-push" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "Firmar con GPG el push" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "solicitar transacción atómica en el lado remoto" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete es incompatible con --all, --mirror y --tags" -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tiene sentido sin ninguna referencia" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "mal repositorio '%s'" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19620,33 +19697,33 @@ msgstr "" "\n" " git remote add <nombre> <url>\n" "\n" -"y luego haciendo push al nombre del remoto\n" +"y luego hacer push al nombre del remoto\n" "\n" " git push <nombre>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all y --tags son incompatibles" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all no puede ser combinada con refspecs" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror y --tags son incompatibles" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no puede ser combinado con refspecs" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all y --mirror son incompatibles" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" -msgstr "opciones de push no pueden tener caracteres de línea nueva" +msgstr "opciones de push no pueden tener carácteres de línea nueva" #: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" @@ -19724,11 +19801,11 @@ msgstr "realizar un merge en adición a una lectura" #: builtin/read-tree.c:133 msgid "3-way merge if no file level merging required" -msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo" +msgstr "fusión de 3 vías si no se requiere ninguna fusión a nivel de archivo" #: builtin/read-tree.c:135 msgid "3-way merge in presence of adds and removes" -msgstr "fusión en 3-vías en presencia de adiciones y remociones" +msgstr "fusión de 3 vías en presencia de adiciones y eliminaciones" #: builtin/read-tree.c:137 msgid "same as -m, but discard unmerged entries" @@ -19764,11 +19841,11 @@ msgstr "no actualizar el índice o el árbol de trabajo" #: builtin/read-tree.c:151 msgid "skip applying sparse checkout filter" -msgstr "saltar aplicado de filtro de sparse checkout" +msgstr "saltar aplicación de filtro de sparse checkout" #: builtin/read-tree.c:153 msgid "debug unpack-trees" -msgstr "debug de árboles-desempacados" +msgstr "debug unpack-trees" #: builtin/read-tree.c:157 msgid "suppress feedback messages" @@ -19824,7 +19901,7 @@ msgstr "git rebase--interactive [<opciones>]" #: builtin/rebase.c:494 builtin/rebase.c:1389 msgid "keep commits which start empty" -msgstr "mantener commits que comienzan con vacío" +msgstr "mantener commits que comiencen con vacío" #: builtin/rebase.c:498 builtin/revert.c:128 msgid "allow commits with empty messages" @@ -19832,15 +19909,15 @@ msgstr "permitir commits con mensajes vacíos" #: builtin/rebase.c:500 msgid "rebase merge commits" -msgstr "rebasando commits de fusión" +msgstr "rebasar commits de fusión" #: builtin/rebase.c:502 msgid "keep original branch points of cousins" -msgstr "mantener puntos originales de la rama de sus primos" +msgstr "mantener puntas de bifurcación originales de los primos" #: builtin/rebase.c:504 msgid "move commits that begin with squash!/fixup!" -msgstr "mover commits que comienzan con squash!/fixup!" +msgstr "mover commits que comiencen con squash!/fixup!" #: builtin/rebase.c:505 msgid "sign commits" @@ -19880,7 +19957,7 @@ msgstr "revisar la lista de pendientes" #: builtin/rebase.c:523 msgid "rearrange fixup/squash lines" -msgstr "reorganizar líneas fixup/squash" +msgstr "reordenar líneas fixup/squash" #: builtin/rebase.c:525 msgid "insert exec commands in todo list" @@ -19888,7 +19965,7 @@ msgstr "insertar comando exec en la lista de pendientes" #: builtin/rebase.c:526 msgid "onto" -msgstr "hacia" +msgstr "sobre" #: builtin/rebase.c:529 msgid "restrict-revision" @@ -19904,7 +19981,7 @@ msgstr "squash-onto" #: builtin/rebase.c:532 msgid "squash onto" -msgstr "squash hacia" +msgstr "squash a" #: builtin/rebase.c:534 msgid "the upstream commit" @@ -19940,11 +20017,11 @@ msgstr "la rama o commit para hacer checkout" #: builtin/rebase.c:546 msgid "onto-name" -msgstr "hacia-nombre" +msgstr "sobre-nombre" #: builtin/rebase.c:546 msgid "onto name" -msgstr "hacia nombre" +msgstr "sobre nombre" #: builtin/rebase.c:547 msgid "cmd" @@ -20065,7 +20142,7 @@ msgstr "comando exec vacío" #: builtin/rebase.c:1319 msgid "rebase onto given branch instead of upstream" -msgstr "haciendo rebase hacia rama dada en lugar de upstream" +msgstr "haciendo rebase sobre rama dada en lugar de upstream" #: builtin/rebase.c:1321 msgid "use the merge-base of upstream and branch as the current base" @@ -20077,7 +20154,7 @@ msgstr "permitir ejecutar hook pre-rebase" #: builtin/rebase.c:1325 msgid "be quiet. implies --no-stat" -msgstr "ser silencioso implica --no-stat" +msgstr "ser silencioso. implica --no-stat" #: builtin/rebase.c:1331 msgid "do not show diffstat of what changed upstream" @@ -20085,7 +20162,7 @@ msgstr "no mostrar un diffstat de lo que cambió en upstream" #: builtin/rebase.c:1334 msgid "add a Signed-off-by trailer to each commit" -msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit" +msgstr "agregar una línea \"Signed-off-by\" al mensaje de cada commit" #: builtin/rebase.c:1337 msgid "make committer date match author date" @@ -20101,7 +20178,7 @@ msgstr "sinónimo para --reset-author-date" #: builtin/rebase.c:1343 builtin/rebase.c:1347 msgid "passed to 'git apply'" -msgstr "pasado a 'git-apply'" +msgstr "pasado a 'git apply'" #: builtin/rebase.c:1345 msgid "ignore changes in whitespace" @@ -20157,19 +20234,19 @@ msgstr "como manejar commits que se vuelven vacíos" #: builtin/rebase.c:1393 msgid "move commits that begin with squash!/fixup! under -i" -msgstr "mover commits que comienzan con squash!/fixup! bajo -i" +msgstr "mover commits que comiencen con squash!/fixup! bajo -i" #: builtin/rebase.c:1400 msgid "add exec lines after each commit of the editable list" -msgstr "agregar líneas exec tras cada acommit de la lista editable" +msgstr "agregar líneas exec tras cada commit de la lista editable" #: builtin/rebase.c:1404 msgid "allow rebasing commits with empty messages" -msgstr "permitir rebase commits con mensajes vacíos" +msgstr "permitir rebase de commits con mensajes vacíos" #: builtin/rebase.c:1408 msgid "try to rebase merges instead of skipping them" -msgstr "intentar fusiones por rebase en lugar de saltarlas" +msgstr "intentar rebase de fusiones en lugar de saltarlas" #: builtin/rebase.c:1411 msgid "use 'merge-base --fork-point' to refine upstream" @@ -20226,9 +20303,9 @@ msgstr "¿No hay rebase en progreso?" #: builtin/rebase.c:1501 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -"La acción --edit-todo sólo puede ser usada al rebasar interactivamente." +"La acción --edit-todo solo puede ser usada al rebasar interactivamente." -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" @@ -20336,8 +20413,8 @@ msgstr "No apunta a un commit válido '%s'" msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no existe la rama/commit: '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" @@ -20392,7 +20469,7 @@ msgstr "Cambios desde %s a %s:\n" msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima " -"de ésta...\n" +"de esta...\n" #: builtin/rebase.c:2072 msgid "Could not detach HEAD" @@ -20407,7 +20484,7 @@ msgstr "Avance rápido de %s a %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20440,7 +20517,7 @@ msgstr "" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" "configura 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20452,20 +20529,20 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" "Por defecto, borrar la rama actual está prohibido, porque el siguiente\n" -"'git clone' no resultara en ningún archivo revisado, causando confusión.\n" +"'git clone' no resultará en ningún archivo revisado, causando confusión.\n" "\n" "Se puede configurar la variable 'receive.denyDeleteCurrent' a 'warn' o " "'ignore'\n" -"en el repositorio remoto para permitir borrar la rama actual.\n" +"en el repositorio remoto para permitir borrar la rama actual,\n" "con o sin mensaje de advertencia.\n" "\n" "Para suprimir este mensaje, puedes configurarlo en 'refuse'." -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2478 msgid "quiet" -msgstr "tranquilo" +msgstr "silencioso" -#: builtin/receive-pack.c:2493 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." @@ -20504,7 +20581,7 @@ msgstr "Marcando objectos alcanzables..." #: builtin/reflog.c:647 #, c-format msgid "%s points nowhere!" -msgstr "¡%s apunta a ningún lado!" +msgstr "¡%s no apunta a ningún lado!" #: builtin/reflog.c:699 msgid "no reflog specified to delete" @@ -20639,7 +20716,7 @@ msgstr "importar todos los tags y objetos asociados cuando realiza el fetch" #: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" -msgstr "o no realziar fetch a ningún tag (--no-tags)" +msgstr "o no realizar fetch a ningún tag (--no-tags)" #: builtin/remote.c:171 msgid "branch(es) to track" @@ -20652,7 +20729,7 @@ msgstr "rama master" #: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -"configurar remote como mirror para realizar push o desde el cual realizar " +"configurar remote como mirror al cual realizar push o desde el cual realizar " "fetch" #: builtin/remote.c:186 @@ -20676,7 +20753,7 @@ msgstr "No se pudo configurar master '%s'" #: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" -msgstr "No se pudo realizar el fetch al mapa para refspec %s" +msgstr "No se pudo obtener el mapa de fetch para refspec %s" #: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" @@ -20719,19 +20796,19 @@ msgid "" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" -"No se actualizan refspec de fetch no predeterminada\n" +"No se actualiza refspec de fetch no predeterminada\n" "\t%s\n" "\tPor favor actualice la configuración manualmente si es necesario." #: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" -msgstr "borrando '%s' falló" +msgstr "borrar '%s' falló" #: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" -msgstr "creando '%s' falló" +msgstr "crear '%s' falló" #: builtin/remote.c:882 msgid "" @@ -20764,7 +20841,7 @@ msgstr " rastreada" #: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" -msgstr " viejo ( use 'git remote prune' para eliminar)" +msgstr " viejo (use 'git remote prune' para eliminar)" #: builtin/remote.c:1006 msgid " ???" @@ -20819,7 +20896,7 @@ msgstr "actualizado" #: builtin/remote.c:1124 msgid "fast-forwardable" -msgstr "puede realizar fast-forward" +msgstr "se puede realizar fast-forward" #: builtin/remote.c:1127 msgid "local out of date" @@ -20890,7 +20967,7 @@ msgstr "(desconocido)" msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -" HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" +" Rama HEAD (HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" #: builtin/remote.c:1277 #, c-format @@ -20954,12 +21031,12 @@ msgstr "No se pudo configurar %s" #: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" -msgstr " ¡%s será colgado!" +msgstr " ¡%s se volverá colgante!" #: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" -msgstr " ¡%s ha sido colgado!" +msgstr " ¡%s se ha vuelto colgante!" #: builtin/remote.c:1392 #, c-format @@ -20974,7 +21051,7 @@ msgstr "URL: %s" #: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" -msgstr " * [ejecutará prune] %s" +msgstr " * [se acortará] %s" #: builtin/remote.c:1412 #, c-format @@ -21039,7 +21116,7 @@ msgstr "No se encontró URL: %s" #: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" -msgstr "No borrará todos los URLs de no-push" +msgstr "No borrará todos los URLs no de push" #: builtin/repack.c:26 msgid "git repack [<options>]" @@ -21050,7 +21127,7 @@ msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -"Re empaquetados incrementales son incompatibles con índices bitmap. Use\n" +"Reempaquetados incrementales son incompatibles con índices bitmap. Use\n" "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps." #: builtin/repack.c:198 @@ -21060,7 +21137,8 @@ msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" #: builtin/repack.c:270 builtin/repack.c:630 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -"repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects." +"repack: Esperando líneas de ID de objeto completas en hex solo desde pack-" +"objects." #: builtin/repack.c:294 msgid "could not finish pack-objects to repack promisor objects" @@ -21088,7 +21166,7 @@ msgstr "empaquetar todo en un único paquete" #: builtin/repack.c:462 msgid "same as -a, and turn unreachable objects loose" -msgstr "lo mismo que -a, y pierde objetos inaccesibles" +msgstr "lo mismo que -a, y soltar objetos inalcanzables" #: builtin/repack.c:465 msgid "remove redundant packs, and run git-prune-packed" @@ -21120,7 +21198,7 @@ msgstr "pasar --delta-islands a git-pack-objects" #: builtin/repack.c:479 msgid "approxidate" -msgstr "aproxime" +msgstr "approxidate" #: builtin/repack.c:480 msgid "with -A, do not loosen objects older than this" @@ -21128,11 +21206,11 @@ msgstr "con -A, no perder objetos más antiguos que este" #: builtin/repack.c:482 msgid "with -a, repack unreachable objects" -msgstr "con -a, re empaquetar objetos inalcanzables" +msgstr "con -a, reempaquetar objetos inalcanzables" #: builtin/repack.c:484 msgid "size of the window used for delta compression" -msgstr "tamaño de la ventana usado para la compresión delta" +msgstr "tamaño de la ventana usada para la compresión delta" #: builtin/repack.c:485 builtin/repack.c:491 msgid "bytes" @@ -21141,7 +21219,7 @@ msgstr "bytes" #: builtin/repack.c:486 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -"lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar " +"lo mismo que arriba, pero limita el tamaño de memoria en lugar del número de " "entradas" #: builtin/repack.c:488 @@ -21158,7 +21236,7 @@ msgstr "tamaño máximo de cada paquete" #: builtin/repack.c:494 msgid "repack objects in packs marked with .keep" -msgstr "re-empaquetar objetos en paquetes marcados con .keep" +msgstr "reempaquetar objetos en paquetes marcados con .keep" #: builtin/repack.c:496 msgid "do not repack this pack" @@ -21170,7 +21248,7 @@ msgstr "encontrar una progresión geométrica con factor <N>" #: builtin/repack.c:508 msgid "cannot delete packs in a precious-objects repo" -msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" +msgstr "no se pueden borrar paquetes en un repositorio de objetos preciosos" #: builtin/repack.c:512 msgid "--keep-unreachable and -A are incompatible" @@ -21196,7 +21274,7 @@ msgstr "no se pudo desvincular: %s" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" -msgstr "git replace [-f] <objeto> <remplazo>" +msgstr "git replace [-f] <objeto> <reemplazo>" #: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" @@ -21230,12 +21308,12 @@ msgstr "" #: builtin/replace.c:125 #, c-format msgid "replace ref '%s' not found" -msgstr "rama de reemplazo '%s' no encontrada" +msgstr "referencia de reemplazo '%s' no encontrada" #: builtin/replace.c:141 #, c-format msgid "Deleted replace ref '%s'" -msgstr "Borradas replace refs '%s'" +msgstr "Borrada replace ref '%s'" #: builtin/replace.c:153 #, c-format @@ -21255,8 +21333,8 @@ msgid "" "while '%s' points to a replacement object of type '%s'." msgstr "" "Objeto debe ser del mismo tipo.\n" -"'%s' puntos para un objeto reemplazado de tipo '%s'\n" -"mientras '%s' puntos para un reemplazo de tipo de objeto '%s'." +"'%s' apunta a un objeto reemplazado de tipo '%s'\n" +"mientras '%s' apunta a un objeto de reemplazo de tipo '%s'." #: builtin/replace.c:229 #, c-format @@ -21291,7 +21369,7 @@ msgstr "mktree no devolvió un nombre de objeto" #: builtin/replace.c:298 #, c-format msgid "unable to fstat %s" -msgstr "incapaz de correr fstat %s" +msgstr "incapaz de ejecutar fstat %s" #: builtin/replace.c:303 msgid "unable to write object to database" @@ -21306,7 +21384,7 @@ msgstr "nombre de objeto no válido: '%s'" #: builtin/replace.c:326 #, c-format msgid "unable to get object type for %s" -msgstr "no es obtener tipo de objeto para %s" +msgstr "no se puede obtener tipo de objeto para %s" #: builtin/replace.c:342 msgid "editing object file failed" @@ -21348,7 +21426,7 @@ msgstr "el commit original '%s' tiene una firma gpg" #: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" -msgstr "la firma será eliminada en el commit de reemplazo!" +msgstr "¡la firma será eliminada en el commit de reemplazo!" #: builtin/replace.c:480 #, c-format @@ -21363,7 +21441,7 @@ msgstr "graft para '%s' innecesario" #: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" -msgstr "nuevo commit es le mismo que el antiguo: '%s'" +msgstr "nuevo commit es el mismo que el antiguo: '%s'" #: builtin/replace.c:527 #, c-format @@ -21388,7 +21466,7 @@ msgstr "editar objeto existente" #: builtin/replace.c:551 msgid "change a commit's parents" -msgstr "cambiar un padre de commit" +msgstr "cambiar los padres de un commit" #: builtin/replace.c:552 msgid "convert existing graft file" @@ -21400,7 +21478,7 @@ msgstr "reemplazar el ref si este existe" #: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" -msgstr "no se puede imprimir contenidos para --edit" +msgstr "no imprimir bonitamente los contenidos para --edit" #: builtin/replace.c:556 msgid "use this format" @@ -21446,15 +21524,15 @@ msgstr "solo se puede dar un patrón con -l" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <ruta>... | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "registrar resoluciones limpias en el índice" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "'git rerere forget' sin rutas está deprecado" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "no es posible generar diff para '%s'" @@ -21505,7 +21583,7 @@ msgstr "No hay un HEAD válido." #: builtin/reset.c:85 msgid "Failed to find tree of HEAD." -msgstr "Falló al encontrar el HEAD del árbol." +msgstr "Falló al encontrar el árbol de HEAD." #: builtin/reset.c:91 #, c-format @@ -21520,7 +21598,7 @@ msgstr "HEAD está ahora en %s" #: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." -msgstr "No se puede realziar un reset %s en medio de una fusión." +msgstr "No se puede realizar un reset %s en medio de una fusión." #: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 #: builtin/stash.c:687 @@ -21529,7 +21607,7 @@ msgstr "ser silencioso, solo reportar errores" #: builtin/reset.c:297 msgid "reset HEAD and index" -msgstr "reiniciar HEAD e index" +msgstr "reiniciar HEAD e índice" #: builtin/reset.c:298 msgid "reset only HEAD" @@ -21545,8 +21623,7 @@ msgstr "reiniciar HEAD pero mantener cambios locales" #: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" -msgstr "" -"grabar solo el hecho de que las rutas eliminadas serán agregadas después" +msgstr "grabar solo el hecho de que las rutas eliminadas serán agregadas luego" #: builtin/reset.c:344 #, c-format @@ -21579,7 +21656,7 @@ msgstr "%s reset no está permitido en un repositorio vacío" #: builtin/reset.c:392 msgid "-N can only be used with --mixed" -msgstr "-N sólo puede ser usada con --mixed" +msgstr "-N solo puede ser usada con --mixed" #: builtin/reset.c:413 msgid "Unstaged changes after reset:" @@ -21608,19 +21685,19 @@ msgstr "No se puede reiniciar el índice a la revisión '%s'." msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." -#: builtin/rev-list.c:538 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no se puede combinar --exclude-promisor-objects y --missing" -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" -msgstr "filtrado de objetos requiere --objects" +msgstr "filtración de objetos requiere --objects" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "conteo de marcas es incompatible con --objects" @@ -21634,11 +21711,23 @@ msgstr "mantener el `--` pasado como un arg" #: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" -msgstr "detener análisis tras el primer argumento que no es opción" +msgstr "detener análisis tras el primer argumento que no sea opción" #: builtin/rev-parse.c:419 msgid "output in stuck long form" -msgstr "salida en formulario largo de atasco" +msgstr "salida en forma larga ajuntada" + +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "fin de input prematuro" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "no se ha entregado cadena antes del separador`--'" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "Se necesitó una revisión singular" #: builtin/rev-parse.c:552 msgid "" @@ -21655,6 +21744,50 @@ msgstr "" "Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer " "uso." +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir requiere un argumento" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "no es un gitdir '%s'" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "--git-path requiere un argumento" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "-n requiere un argumento" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "--path-format requiere un argumento" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "argumento inválido para --path-format: %s" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "--default requiere un argumento" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "--prefix requiere un argumento" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "modo desconocido para --abbrev-ref: %s" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "modo desconocidopara --show-object-format: %s" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<opciones>] <commit-ish>..." @@ -21756,7 +21889,7 @@ msgstr[0] "" "el siguiente archivo tiene contenido en stage diferente al archivo\n" "y a HEAD:" msgstr[1] "" -"los siguientes archivos tienen contenido diferente a los mismos\n" +"los siguientes archivos tienen contenido en stage diferente a los mismos\n" "y a HEAD:" #: builtin/rm.c:213 @@ -21789,7 +21922,7 @@ msgstr[1] "los siguientes archivos tienen modificaciones locales:" #: builtin/rm.c:244 msgid "do not list removed files" -msgstr "no listar archivos eliminado" +msgstr "no listar archivos eliminados" #: builtin/rm.c:245 msgid "only remove from the index" @@ -21797,7 +21930,7 @@ msgstr "solo eliminar del índice" #: builtin/rm.c:246 msgid "override the up-to-date check" -msgstr "sobrescribir el check de actualizado" +msgstr "salta el check de actualización" #: builtin/rm.c:247 msgid "allow recursive removal" @@ -21809,13 +21942,13 @@ msgstr "salir con estado cero incluso si nada coincide" #: builtin/rm.c:283 msgid "No pathspec was given. Which files should I remove?" -msgstr "Se entregó un nuevo pathspec. ¿Qué archivos debería eliminar?" +msgstr "No se entregó un pathspec. ¿Qué archivos se deberían eliminar?" #: builtin/rm.c:310 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" -"por favor agrega el stage de tus cambios a .gitmodules o realiza un stash " -"para proceder" +"por favor agrega tus cambios a .gitmodules al stage o realiza un stash para " +"proceder" #: builtin/rm.c:331 #, c-format @@ -21857,11 +21990,11 @@ msgstr "mostrar status del remote helper" #: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" +msgstr "git shortlog [<opciones>] [<rango-de-revisiones>] [[--] <ruta>...]" #: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" -msgstr "git log --pretty=short | git shorlog [<opciones>]" +msgstr "git log --pretty=short | git shortlog [<opciones>]" #: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" @@ -21869,7 +22002,7 @@ msgstr "no se admite el uso de múltiples opciones de grupo --group con stdin" #: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" -msgstr "el uso de --group = trailer con stdin no es compatible" +msgstr "el uso de --group=trailer con stdin no es compatible" #: builtin/shortlog.c:323 #, c-format @@ -21898,7 +22031,7 @@ msgstr "<w>[,<i1>[,<i2>]]" #: builtin/shortlog.c:360 msgid "linewrap output" -msgstr "salida de línea" +msgstr "ajustar las líneas de salida" #: builtin/shortlog.c:362 msgid "field" @@ -21950,7 +22083,7 @@ msgstr "mostrar ramas de rastreo remoto" #: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" -msgstr "color '*!+-' correspondiendo a la rama" +msgstr "colorear '*!+-' correspondiendo a la rama" #: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" @@ -21986,11 +22119,11 @@ msgstr "mostrar commits en orden topológico" #: builtin/show-branch.c:667 msgid "show only commits not on the first branch" -msgstr "mostrar solo commits que no están en la primera rama" +msgstr "mostrar solo commits que no estén en la primera rama" #: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" -msgstr "mostrar fusiones alcanzables solo por una punta" +msgstr "mostrar fusiones alcanzables por solo una punta" #: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" @@ -22049,7 +22182,7 @@ msgstr "no se puede encontrar el commit %s (%s)" #: builtin/show-index.c:21 msgid "hash-algorithm" -msgstr "algoritmo-hash" +msgstr "algoritmo hash" #: builtin/show-index.c:31 msgid "Unknown hash algorithm" @@ -22085,11 +22218,11 @@ msgstr "mostrar la referencia de HEAD, incluso si se filtrara" #: builtin/show-ref.c:171 msgid "dereference tags into object IDs" -msgstr "tags de deferencia en IDs de objeto" +msgstr "desreferenciar tags a IDs de objeto" #: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" -msgstr "solo mostrar hash SHA1 usando <n> dígitos" +msgstr "solo mostrar hash SHA1 usando <n> cifras" #: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" @@ -22097,7 +22230,7 @@ msgstr "no mostrar resultados en stdout (útil con --verify)" #: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" -msgstr "mostrar refs de stdin que no están en el repositorio local" +msgstr "mostrar refs de stdin que no estén en el repositorio local" #: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" @@ -22110,7 +22243,7 @@ msgstr "git sparse-checkout list" #: builtin/sparse-checkout.c:72 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" -"este árbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no " +"este árbol de trabajo no es sparse (archivo sparse-checkout tal vez no " "existe)" #: builtin/sparse-checkout.c:227 @@ -22148,37 +22281,37 @@ msgstr "falló al modificar la configuración del índice sparse" msgid "failed to open '%s'" msgstr "falló al abrir '%s'" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "no se pudo normalizar la ruta %s" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" -msgstr "no es posible dequote para la cadena de estilo C '%s'" +msgstr "no es posible dequote la cadena de estilo C '%s'" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" msgstr "no se pudo cargar patrones de sparse-checkout existentes" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "leer patrones de standard in" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "error al refrescar directorio de trabajo" @@ -22200,11 +22333,7 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" #: builtin/stash.c:28 builtin/stash.c:65 msgid "git stash branch <branchname> [<stash>]" -msgstr "git stash branch <nombre-rama> [<stash>]" - -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" +msgstr "git stash branch <nombre-de-rama> [<stash>]" #: builtin/stash.c:30 msgid "" @@ -22251,7 +22380,7 @@ msgstr "" #: builtin/stash.c:130 #, c-format msgid "'%s' is not a stash-like commit" -msgstr "'%s' no es un commit estilo stash" +msgstr "'%s' no es un commit de estilo stash" #: builtin/stash.c:150 #, c-format @@ -22278,8 +22407,8 @@ msgid "" " %s -> %s\n" " to make room.\n" msgstr "" -"ADVERTENCIA: Archivo sin seguimiento en forma de archivo con seguimiento. " -"Renombrar\n" +"ADVERTENCIA: Archivo sin seguimiento en el camino de archivo con " +"seguimiento. Renombrando\n" " %s ->%s\n" " Para hacer espacio.\n" @@ -22290,7 +22419,7 @@ msgstr "no se puede aplicar un stash en medio de un merge" #: builtin/stash.c:503 #, c-format msgid "could not generate diff %s^!." -msgstr "no se pudo generar diff %s^!." +msgstr "¡no se pudo generar diff %s^!." #: builtin/stash.c:510 msgid "conflicts in index. Try without --index." @@ -22298,11 +22427,11 @@ msgstr "conflictos en índice. Intente sin --index." #: builtin/stash.c:516 msgid "could not save index tree" -msgstr "no se puede guardar el índice del árbol" +msgstr "no se pudo guardar el árbol de índice" #: builtin/stash.c:525 msgid "could not restore untracked files from stash" -msgstr "no se pueden restaurar archivos no rastreados de la entrada stash" +msgstr "no se pudo restaurar archivos no rastreados de la entrada stash" #: builtin/stash.c:539 #, c-format @@ -22315,12 +22444,12 @@ msgstr "El índice no fue sacado de stash." #: builtin/stash.c:591 builtin/stash.c:689 msgid "attempt to recreate the index" -msgstr "intento de recrear el index" +msgstr "intento de recrear el índice" #: builtin/stash.c:635 #, c-format msgid "Dropped %s (%s)" -msgstr "Botado %s (%s)" +msgstr "Descartado %s (%s)" #: builtin/stash.c:638 #, c-format @@ -22356,98 +22485,98 @@ msgstr "incluir archivos no rastreados en el stash" msgid "only show untracked files in the stash" msgstr "solo mostrar archivos no rastreados en el stash" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "No se puede actualizar %s con %s" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "mensaje de stash" -#: builtin/stash.c:960 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#: builtin/stash.c:1175 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: builtin/stash.c:1275 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "Aún no tienes un commit inicial" -#: builtin/stash.c:1302 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del índice" -#: builtin/stash.c:1311 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#: builtin/stash.c:1359 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" -#: builtin/stash.c:1408 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" -#: builtin/stash.c:1426 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "¿Olvidaste 'git add'?" -#: builtin/stash.c:1441 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: builtin/stash.c:1448 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: builtin/stash.c:1463 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: builtin/stash.c:1468 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" -msgstr "Directorio de trabajo guardado y estado de índice %s" +msgstr "Directorio de trabajo y estado de índice %s guardados" -#: builtin/stash.c:1558 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "No se pueden eliminar cambios del árbol de trabajo" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "mantener index" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "stash en modo patch" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "modo tranquilo" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "incluir archivos sin seguimiento en stash" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "incluir archivos ignorados" -#: builtin/stash.c:1704 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -"el soporte para stash.useBuiltin ha sido eliminado!\n" +"¡el soporte para stash.useBuiltin ha sido eliminado!\n" "Vea su entrada en 'git help config' para detalles." #: builtin/stripspace.c:18 @@ -22461,79 +22590,80 @@ msgstr "git stripspace [-c | --comment-lines]" #: builtin/stripspace.c:37 msgid "skip and remove all lines starting with comment character" msgstr "" -"saltar y borrar todas las líneas que comienzan con un carácter de comentario" +"saltar y borrar todas las líneas que comiencen con un carácter de comentario" #: builtin/stripspace.c:40 msgid "prepend comment character and space to each line" msgstr "anteponer carácter de comentario y espacio a cada línea" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote no toma argumentos" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "Entrando '%s'\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" "." msgstr "" -"run_command devolvió estado no-cero para %s\n" +"run_command devolvió estado no cero para %s\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " "submodules of %s\n" "." msgstr "" -"run_command devolvió estado no-cero mientras cursaba en los submódulos " +"run_command devolvió estado no cero mientras cursaba en los submódulos " "anidados de %s\n" "." -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" -msgstr "suprime la salida al inicializar cada comando de submódulo" +msgstr "suprime la salida de inicializar cada comando de submódulo" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 -#: builtin/submodule--helper.c:1488 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "recursar en submódulos anidados" -#: builtin/submodule--helper.c:573 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22542,57 +22672,57 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Error al registrar el modo de actualización para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" -msgstr "suprime la salida para inicializar un submódulo" +msgstr "suprime la salida de inicializar un submódulo" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" -msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'" +msgstr "no se pudo resolver ref de HEAD dentro del submódulo '%s'" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "falló al recursar en el submódulo '%s'" -#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" -msgstr "suprimir output del estado del submódulo" +msgstr "suprimir salida del estado del submódulo" -#: builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22600,157 +22730,157 @@ msgstr "" "usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:894 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "no se pudo realizar hash del objeto '%s'" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "modo %o inesperado\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "" "usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:1303 -msgid "to compare the commit in the index with that in the submodule HEAD" +#: builtin/submodule--helper.c:1304 +msgid "compare the commit in the index with that in the submodule HEAD" msgstr "" "usar el commit guardado en el índice para comparar con el guardado en el " "submódulo HEAD" -#: builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "omitir submódulos con el valor 'ignore_config' establecido en 'all'" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "limitar el tamaño de resumen" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "no se puede obtener la revisión para HEAD" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached y --files son mutuamente exclusivos" -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del submódulo para '%s'\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "error al actualizar el remoto para el submódulo '%s'" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" -msgstr "suprime la salida del url del submódulo que se sincroniza" +msgstr "suprime la salida de sincronizar el url del submódulo" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" -"El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -" +"El árbol de trabajo de submódulo '%s' contiene un directorio .git (use 'rm -" "rf' si realmente quieres eliminarlo incluyendo todo en su historia)" -#: builtin/submodule--helper.c:1559 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "" -"El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa " -"'-f' para descartarlas" +"El árbol de trabajo de submódulo '%s' contiene modificaciones locales; usa '-" +"f' para descartarlas" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" -msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n" +msgstr "No se pudo eliminar el árbol de trabajo de submódulo '%s'\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "no se pudo crear directorio vacío de submódulo %s" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1597 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "" -"remover árboles de trabajo de submódulos incluso si contienen cambios locales" +"quitar árboles de trabajo de submódulos incluso si contienen cambios locales" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "quitar todos los submódulos" -#: builtin/submodule--helper.c:1631 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1645 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos" +msgstr "Usa '--all' si realmente quieres desinicializar todos los submódulos" -#: builtin/submodule--helper.c:1714 +#: builtin/submodule--helper.c:1690 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22764,46 +22894,67 @@ msgstr "" "con\n" "'--reference-if-able' en lugar de '--reference'." -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1823 +#: builtin/submodule--helper.c:1800 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo" + +#: builtin/submodule--helper.c:1841 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "clonación de '%s' en la ruta de submódulo '%s' falló" + +#: builtin/submodule--helper.c:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "directorio no está vacío: '%s'" + +#: builtin/submodule--helper.c:1858 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "no se pudo obtener el directorio de submódulo para '%s'" + +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" -msgstr "forzar el proceso de clonado" +msgstr "forzar el proceso de clonación" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "no permitir clonar en directorios no vacíos" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22813,104 +22964,83 @@ msgstr "" "<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --" "url <url> --path <ruta>" -#: builtin/submodule--helper.c:1874 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo" - -#: builtin/submodule--helper.c:1885 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "clon de '%s' en la ruta de submódulo '%s' falló" - -#: builtin/submodule--helper.c:1889 -#, c-format -msgid "directory not empty: '%s'" -msgstr "directorio no está vacío: '%s'" - -#: builtin/submodule--helper.c:1901 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "no se pudo obtener el directorio de submódulo para '%s'" - -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1953 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1941 +#: builtin/submodule--helper.c:1957 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:2042 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "¿Tal vez quieres usar 'update --init'?" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" -msgstr "ruta hacia el árbol de trabajo" +msgstr "ruta al árbol de trabajo" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" -msgstr "" -"ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" +msgstr "ruta al árbol de trabajo, a través de fronteras de submódulos anidados" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" -msgstr "crea un clon superficial truncado al número especificado de revisión" +msgstr "crea un clon superficial truncado al número especificado de revisiones" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" -msgstr "trabajos paralelos" +msgstr "tareas paralelas" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" -msgstr "si el clon inicial debe seguir la recomendación superficial" +msgstr "si el clon inicial debe seguir la recomendación de superficialidad" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" -msgstr "no mostrar el progreso de clonado" +msgstr "no mostrar el progreso de clonación" -#: builtin/submodule--helper.c:2358 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:2419 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22919,85 +23049,144 @@ msgstr "" "Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero " "el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:2542 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" -msgstr "no se pudo conseguir un handle para el submódulo '%s'" +msgstr "no se pudo conseguir un handle de repositorio para el submódulo '%s'" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" -#: builtin/submodule--helper.c:2637 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" -msgstr "revisar is es seguro escribir el archivo .gitmodules" +msgstr "revisar si es seguro escribir al archivo .gitmodules" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" -msgstr "desconfigura la opción en elarchivo .gitmodules" +msgstr "desconfigura la opción en el archivo .gitmodules" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nombre> [<valor>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nombre>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -"por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo" +"por favor asegúrate que el archivo .gitmodules esté en el árbol de trabajo" -#: builtin/submodule--helper.c:2682 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" -msgstr "suprime la salida para inicializar la url de un submódulo" +msgstr "suprime la salida de inicializar la url de un submódulo" -#: builtin/submodule--helper.c:2686 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>" -#: builtin/submodule--helper.c:2719 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "configurar la rama de rastreo por defecto a master" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "configurar la rama de rastreo por defecto" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2741 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>" -#: builtin/submodule--helper.c:2726 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>" -#: builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" -msgstr "--branch o --default requeridos" +msgstr "--branch o --default requerido" -#: builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch y --default son mutuamente exclusivos" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "Agregando el repositorio existente en '%s' al índice\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "'%s' ya existe y no es un repositorio git válido" + +#: builtin/submodule--helper.c:2828 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "" +"Se encontró localmente un directorio git para '%s' con el(los) remoto(s):" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n" +" %s\n" +"usa la opción '--force'. Si el directorio git local no es el repositorio " +"correcto\n" +"o no estás seguro de lo que esto significa, escoge otro nombre con la opción " +"'--name'.\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "Reactivando directorio git local para el submódulo '%s'.\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "no es posible hacer checkout al submódulo '%s'" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "la rama del repositorio para hacer checkout durante clonado" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "permitir agregar una ruta de submódulo sino ignorada" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "" +"git submodule--helper add-clone [<options>...] --url <url> --path <ruta> --" +"name <nombre>" + +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:2799 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper válido" @@ -23119,7 +23308,7 @@ msgstr "tipo de objeto erróneo." #: builtin/tag.c:328 msgid "no tag message?" -msgstr "¿Sin mensaje de tag?" +msgstr "¿sin mensaje de tag?" #: builtin/tag.c:335 #, c-format @@ -23184,23 +23373,23 @@ msgstr "mostrar lista de tags en columnas" #: builtin/tag.c:469 builtin/tag.c:471 msgid "print only tags that contain the commit" -msgstr "mostrar solo tags que contienen el commit" +msgstr "mostrar solo tags que contengan el commit" #: builtin/tag.c:470 builtin/tag.c:472 msgid "print only tags that don't contain the commit" -msgstr "mostrar solo tags que no contienen el commit" +msgstr "mostrar solo tags que no contengan el commit" #: builtin/tag.c:473 msgid "print only tags that are merged" -msgstr "sólo imprimir las tags que están fusionadas" +msgstr "solo imprimir las tags que estén fusionadas" #: builtin/tag.c:474 msgid "print only tags that are not merged" -msgstr "sólo imprimir las tags que no están fusionadas" +msgstr "solo imprimir las tags que no estén fusionadas" #: builtin/tag.c:478 msgid "print only tags of the object" -msgstr "sólo imprimir tags de el objeto" +msgstr "solo imprimir tags del objeto" #: builtin/tag.c:526 msgid "--column and -n are incompatible" @@ -23224,11 +23413,11 @@ msgstr "opción --points-at solo es permitida en modo lista" #: builtin/tag.c:556 msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "opciones --merged y --no-merged solo están permitidas en modo lista" +msgstr "opciones --merged y --no-merged solo están permitidas en modo lista" #: builtin/tag.c:567 msgid "only one -F or -m option is allowed." -msgstr "sólo se permite una de las opciones, -m ó -F." +msgstr "solo se permite una de las opciones, -m o -F." #: builtin/tag.c:592 #, c-format @@ -23312,7 +23501,7 @@ msgstr "git update-index [<opciones>] [--] [<archivo>...]" #: builtin/update-index.c:976 msgid "continue refresh even when index needs update" msgstr "" -"continuar refresh (Actualización) incluso cuando el índice necesita " +"continuar refresh (refrescamiento) incluso cuando el índice necesita " "actualización" #: builtin/update-index.c:979 @@ -23325,11 +23514,11 @@ msgstr "no ignorar archivos nuevos" #: builtin/update-index.c:984 msgid "let files replace directories and vice-versa" -msgstr "permitir que archivos remplacen directorios y vice-versa" +msgstr "permitir que archivos remplacen directorios y viceversa" #: builtin/update-index.c:986 msgid "notice files missing from worktree" -msgstr "avisar de archivos faltando en el árbol de trabajo" +msgstr "avisar de archivos faltando del árbol de trabajo" #: builtin/update-index.c:988 msgid "refresh even if index contains unmerged entries" @@ -23337,7 +23526,7 @@ msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios" #: builtin/update-index.c:991 msgid "refresh stat information" -msgstr "refresh información de estado" +msgstr "refrescar información de estado" #: builtin/update-index.c:995 msgid "like --refresh, but ignore assume-unchanged setting" @@ -23387,7 +23576,7 @@ msgstr "con --stdin: las líneas de entrada son terminadas con bytes nulos" #: builtin/update-index.c:1030 msgid "read list of paths to be updated from standard input" -msgstr "leer la lista de rutas para ser actualizada desde standard input" +msgstr "leer la lista de rutas que actualizar desde standard input" #: builtin/update-index.c:1034 msgid "add entries from standard input to the index" @@ -23399,7 +23588,7 @@ msgstr "repoblar stages #2 y #3 para las rutas listadas" #: builtin/update-index.c:1042 msgid "only update entries that differ from HEAD" -msgstr "solo actualizar entradas que difieren de HEAD" +msgstr "solo actualizar entradas que difieran de HEAD" #: builtin/update-index.c:1046 msgid "ignore files missing from worktree" @@ -23411,7 +23600,7 @@ msgstr "reportar acciones por standard output" #: builtin/update-index.c:1051 msgid "(for porcelains) forget saved unresolved conflicts" -msgstr "(para porcelanas) olvidar conflictos sin resolver guardados" +msgstr "(para porcelanas) olvidar conflictos guardados sin resolución" #: builtin/update-index.c:1055 msgid "write index in this format" @@ -23454,15 +23643,15 @@ msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -"core.splitIndex está configurado en false; remuévelo o cámbialo, si " -"realmente quieres habilitar el índice partido" +"core.splitIndex está configurado en false; quítalo o cámbialo, si realmente " +"quieres habilitar el índice partido" #: builtin/update-index.c:1184 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -"core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente " +"core.splitIndex está configurado en true; quítalo o cámbialo, si realmente " "quieres deshabilitar el índice partido" #: builtin/update-index.c:1196 @@ -23470,7 +23659,7 @@ msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -"core.untrackedCache está configurado en true; remuévelo o cámbialo, si " +"core.untrackedCache está configurado en true; quítalo o cámbialo, si " "realmente quieres deshabilitar el chaché no rastreado" #: builtin/update-index.c:1200 @@ -23482,7 +23671,7 @@ msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -"core.untrackedCache está configurado en false; remuévelo o cámbialo, si " +"core.untrackedCache está configurado en false; quítalo o cámbialo, si " "realmente quieres habilitar el caché no rastreado" #: builtin/update-index.c:1212 @@ -23504,7 +23693,7 @@ msgstr "fsmonitor activado" msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -"core.fsmonitor está configurado; remuévelo si realmente quieres deshabilitar " +"core.fsmonitor está configurado; quítalo si realmente quieres deshabilitar " "el fsmonitor" #: builtin/update-index.c:1231 @@ -23531,7 +23720,7 @@ msgstr "eliminar la referencia" #: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" -msgstr "actualiza <refname> no a lo que apunta" +msgstr "actualiza <refname> no la a que apunta" #: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" @@ -23555,7 +23744,7 @@ msgstr "git upload-pack [<opciones>] <directorio>" #: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 msgid "quit after a single request/response exchange" -msgstr "sale después de un intercambio petición/respuesta único" +msgstr "sale después de un solo intercambio petición/respuesta" #: builtin/upload-pack.c:25 msgid "exit immediately after initial ref advertisement" @@ -23629,7 +23818,7 @@ msgstr "git worktree remove [<opciones>] <worktree>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:61 builtin/worktree.c:935 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "falló al borrar '%s'" @@ -23639,25 +23828,25 @@ msgstr "falló al borrar '%s'" msgid "Removing %s/%s: %s" msgstr "Eliminando %s/%s: %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "reporta árboles de trabajo recortados" -#: builtin/worktree.c:151 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" -msgstr "expirar árboles de trabajo más viejos a <tiempo>" +msgstr "caducar árboles de trabajo más viejos a <tiempo>" -#: builtin/worktree.c:221 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:230 +#: builtin/worktree.c:228 #, c-format msgid "unusable worktree destination '%s'" msgstr "destino de worktree inutilizable '%s'" -#: builtin/worktree.c:235 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23667,7 +23856,7 @@ msgstr "" "usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para " "limpiar" -#: builtin/worktree.c:237 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23676,27 +23865,31 @@ msgstr "" "'%s' es un árbol de trabajo faltante pero ya registrado;\n" "usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar" -#: builtin/worktree.c:288 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "inicializando" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparando árbol de trabajo (nueva rama '%s')" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)" @@ -23704,7 +23897,7 @@ msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)" #: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -"hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " +"hacer checkout a <rama> incluso si ya hay checkout de ella en otro árbol de " "trabajo" #: builtin/worktree.c:485 @@ -23723,159 +23916,168 @@ msgstr "popular el nuevo árbol de trabajo" msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:493 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "razón para bloquear" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" -#: builtin/worktree.c:504 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:565 +#: builtin/worktree.c:508 +msgid "--reason requires --lock" +msgstr "--reason requiere --lock" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "agregado con --lock" + +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track solo puede ser usado si una nueva rama es creada" -#: builtin/worktree.c:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" "agregue la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>" -#: builtin/worktree.c:693 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose and --porcelain son mutuamente exclusivas" -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "razón para bloquear" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 -#: builtin/worktree.c:963 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -"árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado" +"árboles de trabajo conteniendo submódulos no pueden ser movidos o eliminados" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' es un árbol de trabajo principal" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no se pudo descubrir el nombre de destino de '%s'" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n" -"use 'move -f -f' para sobreescribir o desbloquear primero" +"use 'move -f -f' para forzar o desbloquear primero" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" "no se puede mover un árbol de trabajo bloqueado;\n" -"use 'move -f -f' para sobreescribir o desbloquear primero" +"use 'move -f -f' para forzar o desbloquear primero" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "falló validación, no se puede mover el árbol de trabajo: %s" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "falló al mover '%s' a '%s'" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "falló al ejecutar 'git status' en '%s'" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -"'%s' contiene archivos no rastreados o modificados, use --force para borrarlo" +"'%s' contiene archivos modificados o no rastreados, use --force para borrarlo" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no se pudo ejecutar 'git status' en '%s', código %d" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" -msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado" +msgstr "" +"forzar eliminación incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -"no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n" -"use 'remove -f -f' para sobreescribir o desbloquear primero" +"no se puede eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n" +"use 'remove -f -f' para forzar o desbloquear primero" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" "no se pueden eliminar árbol de trabajo bloqueado;\n" -"use 'remove -f -f' para sobreescribir o desbloquear primero" +"use 'remove -f -f' para forzar o desbloquear primero" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "falló validación, no se puede eliminar árbol de trabajo: %s" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "reparar: %s: %s" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "error: %s: %s" @@ -23890,11 +24092,11 @@ msgstr "<prefijo>/" #: builtin/write-tree.c:29 msgid "write tree object for a subdirectory <prefix>" -msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" +msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" #: builtin/write-tree.c:31 msgid "only useful for debugging" -msgstr "sólo útil para depurar" +msgstr "solo útil para depurar" #: git.c:28 msgid "" @@ -23970,7 +24172,7 @@ msgstr "opción %s desconocida\n" #: git.c:375 #, c-format msgid "while expanding alias '%s': '%s'" -msgstr "al expandir el alias '%s':'%s'" +msgstr "al expandir el alias '%s': '%s'" #: git.c:384 #, c-format @@ -24187,7 +24389,7 @@ msgstr "comando token para enviar al servidor" #: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" -msgstr "valor negativo para http.postbuffer; poniendo el default a %d" +msgstr "valor negativo para http.postbuffer; poniendo el default %d" #: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" @@ -24222,16 +24424,16 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "No se pudo configurar backend SSL para '%s': ya configurado" -#: http.c:2035 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" " asked for: %s\n" " redirect: %s" msgstr "" -"no puede actualizar la base de url de la redirección:\n" +"no se puede actualizar la base de url de la redirección:\n" " preguntaba por: %s\n" -" redireccionamiento: %s" +" redirección: %s" #: remote-curl.c:183 #, c-format @@ -24267,103 +24469,103 @@ msgstr "Autenticación falló para '%s'" #: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" -msgstr "no es posible acceder '%s':%s" +msgstr "no es posible acceder a '%s': %s" #: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "redirigiendo a %s" -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" -msgstr "no debería tener EOF cuando no es gentil en EOF" +msgstr "no se debería tener EOF cuando no es laxo con EOF" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "el servidor remoto envió un separador sin estado (stateless)" +#: remote-curl.c:656 +msgid "remote server sent unexpected response end packet" +msgstr "el servidor remoto envió una respuesta de fin de paquete inesperada" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -"no es posible rebobinar rpc post data - intenta incrementando http.postBuffer" +"no es posible rebobinar rpc post data - intenta incrementar http.postBuffer" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" -msgstr "remote-curl: mal caracter de largo de línea: %.4s" +msgstr "remote-curl: mal carácter de largo de línea: %.4s" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: packet de respuesta final inesperado" -#: remote-curl.c:832 +#: remote-curl.c:834 #, c-format msgid "RPC failed; %s" msgstr "RPC falló; %s" -#: remote-curl.c:872 +#: remote-curl.c:874 msgid "cannot handle pushes this big" msgstr "no se puede manejar pushes tan grandes" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "no se puede desinflar el request; zlib deflate error %d" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "no se puede desinflar el request; zlib end error %d" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "%d bytes de header de longitud fueron recibidos" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "%d bytes de cuerpo se siguen esperando" -#: remote-curl.c:1132 +#: remote-curl.c:1134 msgid "dumb http transport does not support shallow capabilities" msgstr "dump http transport no soporta capacidades superficiales" -#: remote-curl.c:1147 +#: remote-curl.c:1149 msgid "fetch failed." msgstr "fetch falló." -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "no se puede hacer fetch por sha1 sobre smart http" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, c-format msgid "http transport does not support %s" msgstr "http transport no soporta %s" -#: remote-curl.c:1291 +#: remote-curl.c:1293 msgid "git-http-push failed" msgstr "git-http-push falló" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remote> [<url>]" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" -msgstr "remote-curl: error leyendo command stream de git" +msgstr "remote-curl: error al leer command stream de git" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: fetch intentado sin un repositorio local" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: comando '%s' desconocido de git" @@ -24386,7 +24588,7 @@ msgstr "filtrado de objeto" #: parse-options.h:184 msgid "expiry-date" -msgstr "fecha de expiración" +msgstr "fecha de caducidad" #: parse-options.h:198 msgid "no-op (backward compatibility)" @@ -24398,11 +24600,11 @@ msgstr "ser más verboso" #: parse-options.h:312 msgid "be more quiet" -msgstr "ser más discreto" +msgstr "ser más callado" #: parse-options.h:318 msgid "use <n> digits to display object names" -msgstr "use <n> dígitos para mostrar los nombres de los objetos" +msgstr "use <n> cifras para mostrar los nombres de los objetos" #: parse-options.h:337 msgid "how to strip spaces and #comments from message" @@ -24435,7 +24637,7 @@ msgstr "" #: command-list.h:50 msgid "Add file contents to the index" -msgstr "Agrega contenido de carpetas al índice" +msgstr "Agrega contenido de archivos al índice" #: command-list.h:51 msgid "Apply a series of patches from a mailbox" @@ -24447,7 +24649,7 @@ msgstr "Anotar líneas de archivo con información de commit" #: command-list.h:53 msgid "Apply a patch to files and/or to the index" -msgstr "Aplicar un parche a archivos y/o el índice" +msgstr "Aplicar un parche a archivos y/o al índice" #: command-list.h:54 msgid "Import a GNU Arch repository into Git" @@ -24455,7 +24657,7 @@ msgstr "Importar un repositorio GNU Arch en Git" #: command-list.h:55 msgid "Create an archive of files from a named tree" -msgstr "Crear un archivo o archivos de un árbol nombrado" +msgstr "Crear una crónica de archivos de un árbol nombrado" #: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" @@ -24476,12 +24678,13 @@ msgstr "Recolectar información para el usuario para generar un reporte de bug" #: command-list.h:60 msgid "Move objects and refs by archive" -msgstr "Mover objetos y referencias por archivo" +msgstr "Mover objetos y referencias por crónica" #: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "" -"Proveer contenido o tipo y tamaño de información para objetos de repositorio" +"Proveer contenido o información de tipo y tamaño de los objetos de " +"repositorio" #: command-list.h:62 msgid "Display gitattributes information" @@ -24489,15 +24692,16 @@ msgstr "Mostrar información de gitattributes" #: command-list.h:63 msgid "Debug gitignore / exclude files" -msgstr "Debug a gitignore / excluir archivos" +msgstr "Debug a gitignore / archivos de exclusión" #: command-list.h:64 msgid "Show canonical names and email addresses of contacts" -msgstr "Mostrar nombres canónicos y direcciones de correo de contactos" +msgstr "" +"Mostrar nombres canónicos y direcciones de correo electrónico de contactos" #: command-list.h:65 msgid "Switch branches or restore working tree files" -msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo" +msgstr "Cambia de rama o restaura archivos del árbol de trabajo" #: command-list.h:66 msgid "Copy files from the index to the working tree" @@ -24509,7 +24713,7 @@ msgstr "Asegura que un nombre de referencia esté bien formado" #: command-list.h:68 msgid "Find commits yet to be applied to upstream" -msgstr "Encuentra commits que faltan aplicar en upstream" +msgstr "Encuentra commits que falten aplicar en upstream" #: command-list.h:69 msgid "Apply the changes introduced by some existing commits" @@ -24521,7 +24725,7 @@ msgstr "Opción gráfica a git-commit" #: command-list.h:71 msgid "Remove untracked files from the working tree" -msgstr "Remueve archivos del árbol de trabajo no rastreados" +msgstr "Quitar archivos no rastreados del árbol de trabajo" #: command-list.h:72 msgid "Clone a repository into a new directory" @@ -24533,11 +24737,11 @@ msgstr "Mostrar data en columnas" #: command-list.h:74 msgid "Record changes to the repository" -msgstr "Graba los cambios en tu repositorio" +msgstr "Graba los cambios al repositorio" #: command-list.h:75 msgid "Write and verify Git commit-graph files" -msgstr "Escribe y verifica los archivos de Git commit-graph" +msgstr "Escribe y verifica los archivos commit-graph de Git" #: command-list.h:76 msgid "Create a new commit object" @@ -24557,7 +24761,7 @@ msgstr "Obtener y guardar credenciales de usuario" #: command-list.h:80 msgid "Helper to temporarily store passwords in memory" -msgstr "Auxiliar para almacenar temporalmente claves en memoria" +msgstr "Auxiliar para almacenar temporalmente contraseñas en memoria" #: command-list.h:81 msgid "Helper to store credentials on disk" @@ -24573,7 +24777,7 @@ msgstr "Salva tus datos de otro SCM que la gente adora odiar" #: command-list.h:84 msgid "A CVS server emulator for Git" -msgstr "Un servidor emulador de CVS para Git" +msgstr "Un emulador de servidor de CVS para Git" #: command-list.h:85 msgid "A really simple server for Git repositories" @@ -24629,7 +24833,7 @@ msgstr "Reescribir ramas" #: command-list.h:97 msgid "Produce a merge commit message" -msgstr "Produce un mensaje de commit para fusión" +msgstr "Produce un mensaje de commit de fusión" #: command-list.h:98 msgid "Output information on each ref" @@ -24654,11 +24858,11 @@ msgstr "Limpia archivos innecesarios y optimiza el repositorio local" #: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" -msgstr "Extrae el ID de commit de un archivo creado usando git-archive" +msgstr "Extrae el ID de commit de una crónica creada usando git-archive" #: command-list.h:104 msgid "Print lines matching a pattern" -msgstr "Imprime las líneas que concuerdan con el patron" +msgstr "Imprime las líneas que concuerden con el patrón" #: command-list.h:105 msgid "A portable graphical interface to Git" @@ -24670,7 +24874,7 @@ msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo" #: command-list.h:107 msgid "Display help information about Git" -msgstr "Mostrar información sobre Git" +msgstr "Mostrar información de ayuda sobre Git" #: command-list.h:108 msgid "Server side implementation of Git over HTTP" @@ -24690,7 +24894,7 @@ msgstr "Enviar una colección de parches de stdin a una carpeta IMAP" #: command-list.h:112 msgid "Build pack index file for an existing packed archive" -msgstr "Constuye un archivo de índice para un archivo empaquetado existente" +msgstr "Construye un archivo de índice para una crónica empaquetada existente" #: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" @@ -24698,7 +24902,7 @@ msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe" #: command-list.h:114 msgid "Instantly browse your working repository in gitweb" -msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb" +msgstr "Navegar instantáneamente tu repositorio de trabajo en gitweb" #: command-list.h:115 msgid "Add or parse structured information in commit messages" @@ -24714,7 +24918,7 @@ msgstr "Muestra los logs de los commits" #: command-list.h:118 msgid "Show information about files in the index and the working tree" -msgstr "Muestra información sobre archivos in el índice y el árbol de trabajo" +msgstr "Muestra información sobre archivos en el índice y el árbol de trabajo" #: command-list.h:119 msgid "List references in a remote repository" @@ -24742,7 +24946,7 @@ msgstr "Junta dos o más historiales de desarrollo juntos" #: command-list.h:125 msgid "Find as good common ancestors as possible for a merge" -msgstr "Encuentra un ancestro común bueno para una posible fusión" +msgstr "Encuentra ancestros tan buenos como posible para una fusión" #: command-list.h:126 msgid "Run a three-way file merge" @@ -24750,7 +24954,7 @@ msgstr "Ejecuta una fusión de tres vías en un archivo" #: command-list.h:127 msgid "Run a merge for files needing merging" -msgstr "Ejecuta una fusión para archivos que la necesitan" +msgstr "Ejecuta una fusión para archivos que la necesiten" #: command-list.h:128 msgid "The standard helper program to use with git-merge-index" @@ -24788,7 +24992,7 @@ msgstr "Encontrar nombres simbólicos para revs dados" #: command-list.h:136 msgid "Add or inspect object notes" -msgstr "Agrega o inspecciona objetos nota" +msgstr "Agrega o inspecciona notas de objeto" #: command-list.h:137 msgid "Import from and submit to Perforce repositories" @@ -24796,11 +25000,11 @@ msgstr "Importar desde y enviar a repositorios Perforce" #: command-list.h:138 msgid "Create a packed archive of objects" -msgstr "Crea un archivo de objetos empaquetados" +msgstr "Crea una crónica de objetos empaquetada" #: command-list.h:139 msgid "Find redundant pack files" -msgstr "Encuentra archivos empaquetados de manera redundante" +msgstr "Encuentra archivos de paquete redundantes" #: command-list.h:140 msgid "Pack heads and tags for efficient repository access" @@ -24816,7 +25020,7 @@ msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos" #: command-list.h:143 msgid "Remove extra objects that are already in pack files" -msgstr "Remover objetos extra que ya están en archivos empaquetados" +msgstr "Quitar objetos extras que ya estén en archivos empaquetados" #: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" @@ -24836,7 +25040,7 @@ msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)" #: command-list.h:148 msgid "Reads tree information into the index" -msgstr "Lee información del ábol en el índice" +msgstr "Lee información del árbol al índice" #: command-list.h:149 msgid "Reapply commits on top of another base tip" @@ -24872,11 +25076,11 @@ msgstr "Reutilizar la resolución registrada de fusiones conflictivas" #: command-list.h:157 msgid "Reset current HEAD to the specified state" -msgstr "Reinicia el HEAD actual a un estado especifico" +msgstr "Reinicia el HEAD actual a un estado específico" #: command-list.h:158 msgid "Restore working tree files" -msgstr "Restaurar archivos de árboles de trabajo" +msgstr "Restaurar archivos del árbol de trabajo" #: command-list.h:159 msgid "Revert some existing commits" @@ -24908,7 +25112,7 @@ msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git" #: command-list.h:166 msgid "Summarize 'git log' output" -msgstr "Resumir la salida 'git log'" +msgstr "Resumir la salida de 'git log'" #: command-list.h:167 msgid "Show various types of objects" @@ -24920,7 +25124,7 @@ msgstr "Mostrar ramas y sus commits" #: command-list.h:169 msgid "Show packed archive index" -msgstr "Mostrar el índice de archivo empaquetado" +msgstr "Mostrar el índice de crónica empaquetado" #: command-list.h:170 msgid "List references in a local repository" @@ -24932,7 +25136,7 @@ msgstr "El código de configuración i18n de Git para scripts de shell" #: command-list.h:172 msgid "Common Git shell script setup code" -msgstr "Código de configuración de script de shell común de Git" +msgstr "Código común de configuración de script de shell de Git" #: command-list.h:173 msgid "Initialize and modify the sparse-checkout" @@ -24940,9 +25144,7 @@ msgstr "Inicializa y modifica el sparse-checkout" #: command-list.h:174 msgid "Stash the changes in a dirty working directory away" -msgstr "" -"Poner en un stash los cambios en un directorio de trabajo sucio de todas " -"maneras" +msgstr "Poner en un stash los cambios en un directorio de trabajo sucio" #: command-list.h:175 msgid "Add file contents to the staging area" @@ -24974,7 +25176,7 @@ msgstr "Lee, modifica y borra referencias simbólicas" #: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" +msgstr "Crea, lista, borra o verifica un objeto de tag firmado con GPG" #: command-list.h:183 msgid "Creates a temporary file with a blob's contents" @@ -24982,7 +25184,7 @@ msgstr "Crea un archivo temporal con contenidos de un blob" #: command-list.h:184 msgid "Unpack objects from a packed archive" -msgstr "Desempaqueta objetos de un archivo empaquetado" +msgstr "Desempaqueta objetos de una crónica empaquetada" #: command-list.h:185 msgid "Register file contents in the working tree to the index" @@ -25001,7 +25203,7 @@ msgstr "" #: command-list.h:188 msgid "Send archive back to git-archive" -msgstr "Enviar archivo a git-archive" +msgstr "Enviar crónica de vuelta a git-archive" #: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" @@ -25017,7 +25219,7 @@ msgstr "Verificar firma GPG de commits" #: command-list.h:192 msgid "Validate packed Git archive files" -msgstr "Valida archivos Git empaquetados" +msgstr "Valida crónicas Git empaquetadas" #: command-list.h:193 msgid "Check the GPG signature of tags" @@ -25041,7 +25243,7 @@ msgstr "Crea un objeto árbol del índice actual" #: command-list.h:198 msgid "Defining attributes per path" -msgstr "Definiendo atributos por ruta" +msgstr "Definir atributos por ruta" #: command-list.h:199 msgid "Git command-line interface and conventions" @@ -25057,7 +25259,7 @@ msgstr "Proporcionar nombres de usuario y contraseñas a Git" #: command-list.h:202 msgid "Git for CVS users" -msgstr "Git para usuarios CVS" +msgstr "Git para usuarios de CVS" #: command-list.h:203 msgid "Tweaking diff output" @@ -25065,7 +25267,7 @@ msgstr "Afinar la salida de diff" #: command-list.h:204 msgid "A useful minimum set of commands for Everyday Git" -msgstr "Un conjunto mínimo útil de comandos diarios de Git" +msgstr "Un conjunto mínimo útil de comandos cotidianos de Git" #: command-list.h:205 msgid "Frequently asked questions about using Git" @@ -25091,7 +25293,7 @@ msgstr "" #: command-list.h:210 msgid "Defining submodule properties" -msgstr "Definiendo las propiedades del submódulo" +msgstr "Definir las propiedades de submódulo" #: command-list.h:211 msgid "Git namespaces" @@ -25174,7 +25376,7 @@ msgstr "Fusión automatizada no funcionó." #: git-merge-octopus.sh:62 msgid "Should not be doing an octopus." -msgstr "No debería hacer un pulpo." +msgstr "No se debería hacer un pulpo." #: git-merge-octopus.sh:73 #, sh-format @@ -25203,7 +25405,7 @@ msgstr "Fusión simple no funcionó, intentando fusión automática." #: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -"La ruta relativa sólo se puede usar desde el nivel superior del árbol de " +"La ruta relativa solo se puede usar desde el nivel superior del árbol de " "trabajo" #: git-submodule.sh:189 @@ -25226,144 +25428,99 @@ msgstr "'$sm_path' ya existe en el índice y no es un submódulo" msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' no tiene un commit checked out" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "Agregando el repositorio existente en '$sm_path' al índice" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' ya existe y no es un repositorio git válido" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "" -"Se encontró localmente un directorio git para '$sm_name' con el(los) " -"remoto(s):" - -#: git-submodule.sh:261 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n" -" $realrepo\n" -"usa la opción '--force'. Si el directorio git local no es el repositorio " -"correcto\n" -"o no estás seguro de lo que esto significa, escoge otro nombre con la opción " -"'--name'." - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "Reactivar directorio git local para el submódulo '$sm_name'." - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "No es posible hacer checkout al submódulo '$sm_path'" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falló al agregar el submódulo '$sm_path'" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falló al registrar el submódulo '$sm_path'" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No se pudo encontrar la revisión actual en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " -"de submódulo '$sm_path'" +"de submódulo '$sm_path'" -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" "No es posible realizar fetch en la ruta de submódulo '$displaypath'; " -"intentando hacer un fetch directo $sha1:" +"intentando hacer un fetch directo de $sha1:" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. " -"Fetch directo del commit falló." +"Fetch realizado en la ruta de submódulo '$displaypath', pero no contenía " +"$sha1. Fetch directo del commit falló." -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -"No se posible ejecutar rebase a '$sha1' en la ruta de submódulo " +"No es posible ejecutar rebase a '$sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'" +msgstr "Ruta de submódulo '$displaypath': rebasado a '$sha1'" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'" +msgstr "Ruta de submódulo '$displaypath': fusionado en '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -"Falló la ejecución de '$command $sha1' en la ruta de submódulo " -"'$displaypath'" +"Falló la ejecución de '$command $sha1' en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" @@ -25421,7 +25578,7 @@ msgstr "" "s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n" "f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de " "este commit\n" -"x, exec <commit> = ejecuta comando ( el resto de la línea) usando un shell\n" +"x, exec <commit> = ejecuta comando (el resto de la línea) usando un shell\n" "d, drop <commit> = eliminar commit\n" "l, label <label> = poner label al HEAD actual con un nombre\n" "t, reset <label> = reiniciar HEAD al label\n" @@ -25484,12 +25641,12 @@ msgstr "No se puede mover HEAD a $first_parent" #: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" -msgstr "Rehusando a ejecutar squash en fusión: $sha1" +msgstr "Rehusando ejecutar squash en fusión: $sha1" #: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" -msgstr "Error rehaciendo fusión $sha1" +msgstr "Error al rehacer fusión $sha1" #: git-rebase--preserve-merges.sh:448 #, sh-format @@ -25526,7 +25683,7 @@ msgstr "Esto es una combinación de 2 commits." #: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" -msgstr "No se puede aplicar $sha1... $rest" +msgstr "No se pudo aplicar $sha1... $rest" #: git-rebase--preserve-merges.sh:601 #, sh-format @@ -25647,7 +25804,7 @@ msgstr "" #: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "" -"Error tratando de encontrar la identidad del autor para remediar el commit" +"Error al tratar de encontrar la identidad del autor para remediar el commit" #: git-rebase--preserve-merges.sh:829 msgid "" @@ -25696,7 +25853,7 @@ msgstr "Tenga en cuenta que los commits vacíos están comentados" #: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" -msgstr "No se puede inicializar los commits reescritos" +msgstr "No se pudo inicializar los commits reescritos" #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format @@ -25785,7 +25942,7 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -"Si el parche aplica limpiamente, el hunk editado será marcado\n" +"Si el parche aplica limpiamente, el fragmento editado será marcado\n" "inmediatamente para el área de stage." #: git-add--interactive.perl:1059 @@ -25793,15 +25950,15 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -"Si el parche aplica limpiamente, el hunk editado será marcado\n" -"inmediatamente para aplicar stash." +"Si el parche aplica limpiamente, el fragmento editado será marcado\n" +"inmediatamente para hacer stash." #: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -"Si el parche aplica limpiamente, el hunk editado será marcado\n" +"Si el parche aplica limpiamente, el fragmento editado será marcado\n" "inmediatamente para sacar del área de stage." #: git-add--interactive.perl:1065 git-add--interactive.perl:1074 @@ -25810,7 +25967,7 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -"Si el parche aplica de forma limpia, el hunk editado será marcado\n" +"Si el parche aplica de forma limpia, el fragmento editado será marcado\n" "inmediatamente para aplicar." #: git-add--interactive.perl:1068 git-add--interactive.perl:1071 @@ -25819,13 +25976,13 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -"Si el parche aplica de forma limpia, el hunk editado será marcado\n" +"Si el parche aplica de forma limpia, el fragmento editado será marcado\n" "inmediatamente para descarte." #: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" -msgstr "falló al abrir el archivo de adición del hunk para escritura: %s" +msgstr "falló al abrir el archivo de adición del fragmento para escritura: %s" #: git-add--interactive.perl:1121 #, perl-format @@ -25836,14 +25993,14 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" "---\n" -"Para eliminar '%s' líneas, haga de ellas líneas ' ' (contexto).\n" +"Para eliminar '%s' líneas, haga de ellas líneas ' ' (contexto).\n" "Para eliminar '%s' líneas, bórrelas.\n" -"Lineas comenzando con %s serán eliminadas.\n" +"Líneas comenzando con %s serán eliminadas.\n" #: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" -msgstr "falló al abrir el archivo de edición del hunk para lectura: %s" +msgstr "falló al abrir el archivo de edición del fragmento para lectura: %s" #: git-add--interactive.perl:1251 msgid "" @@ -25853,11 +26010,11 @@ msgid "" "a - stage this hunk and all later hunks in the file\n" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -"y - aplicar stage a este hunk\n" -"n - no aplicar stage a este hunk\n" -"q - quit; no aplicar stage a este hunk ni ninguno de los restantes\n" -"a - aplicar stage a este hunk y a todos los posteriores en el archivo\n" -"d - no aplicar stage a este hunk ni a ninguno de los posteriores en este " +"y - aplicar stage a este fragmento\n" +"n - no aplicar stage a este fragmento\n" +"q - quit; no aplicar stage a este fragmento ni ninguno de los restantes\n" +"a - aplicar stage a este fragmento y a todos los posteriores en el archivo\n" +"d - no aplicar stage a este fragmento ni a ninguno de los posteriores en este " "archivo" #: git-add--interactive.perl:1257 @@ -25868,11 +26025,11 @@ msgid "" "a - stash this hunk and all later hunks in the file\n" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -"y - aplicar stash a este hunk\n" -"n - no aplicar stash a este hunk\n" -"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n" -"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" -"d - no aplicar stash a este hunk ni ninguno de los posteriores en el archivo" +"y - hacer stash a este fragmento\n" +"n - no hacer stash a este fragmento\n" +"q - quit; no hacer stash a este fragmento ni a ninguno de los restantes\n" +"a - hacer stash a este fragmento y a todos los posteriores en el archivo\n" +"d - no hacer stash a este fragmento ni ninguno de los posteriores en el archivo" #: git-add--interactive.perl:1263 msgid "" @@ -25882,11 +26039,11 @@ msgid "" "a - unstage this hunk and all later hunks in the file\n" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -"y - sacar desde hunk del área de stage\n" -"n - no sacar este hunk del area de stage\n" -"q - quit; no sacar del area de stage este hunk ni ninguno de los restantes\n" -"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n" -"d - no sacar del area de stage este hunk ni ninguno de los posteriores en el " +"y - sacar este fragmento del área de stage\n" +"n - no sacar este fragmento del area de stage\n" +"q - quit; no sacar del area de stage este fragmento ni ninguno de los restantes\n" +"a - sacar del area de stage este fragmento y todos los posteriores en el archivo\n" +"d - no sacar del area de stage este fragmento ni ninguno de los posteriores en el " "archivo" #: git-add--interactive.perl:1269 @@ -25897,11 +26054,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -"y - aplicar este hunk al índice\n" -"n - no aplicar este hunk al índice\n" -"q - quit; no aplicar este hunk ni ninguno de los restantes\n" -"a - aplicar este hunk y todos los posteriores en el archivo\n" -"d - no aplicar este hunk ni ninguno de los posteriores en el archivo" +"y - aplicar este fragmento al índice\n" +"n - no aplicar este fragmento al índice\n" +"q - quit; no aplicar este fragmento ni ninguno de los restantes\n" +"a - aplicar este fragmento y todos los posteriores en el archivo\n" +"d - no aplicar este fragmento ni ninguno de los posteriores en el archivo" #: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" @@ -25911,11 +26068,11 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -"y - descartar este hunk del árbol de trabajo\n" -"n - no descartar este hunk del árbol de trabajo\n" -"q - quit; no descartar este hunk ni ninguno de los que restantes\n" -"a - descartar este hunk y todos los posteriores en este archivo\n" -"d - no descartar este hunk ni ninguno de los posteriores en el archivo" +"y - descartar este fragmento del árbol de trabajo\n" +"n - no descartar este fragmento del árbol de trabajo\n" +"q - quit; no descartar este fragmento ni ninguno de los que restantes\n" +"a - descartar este fragmento y todos los posteriores en este archivo\n" +"d - no descartar este fragmento ni ninguno de los posteriores en el archivo" #: git-add--interactive.perl:1281 msgid "" @@ -25925,11 +26082,11 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -"y - descartar este hunk del índice y el árbol de trabajo\n" -"n - no descartar este hunk del índice ni el árbol de trabajo\n" -"q - quit; no descartar este hunk ni ninguno de los que queden\n" -"a - descartar este hunk y todos los posteriores en este archivo\n" -"d - no descartar este hunk ni ninguno posterior en el archivo" +"y - descartar este fragmento del índice y del árbol de trabajo\n" +"n - no descartar este fragmentodel índice ni del árbol de trabajo\n" +"q - quit; no descartar este fragmento ni ninguno de los que quedan\n" +"a - descartar este fragmento y todos los posteriores en este archivo\n" +"d - no descartar este fragmento ni ninguno posterior en el archivo" #: git-add--interactive.perl:1287 msgid "" @@ -25939,11 +26096,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -"y - aplicar este hunk al índice y al árbol de trabajo\n" -"n - no aplicar este hunk al índice y al árbol de trabajo\n" -"q - quit; no aplicar este hunk ni ninguno de los restantes\n" -"a - aplicar este hunk y todos los posteriores en el archivo\n" -"d - no aplicar este hunk ni ninguno de los siguientes en este archivo" +"y - aplicar este fragmento al índice y al árbol de trabajo\n" +"n - no aplicar este fragmento al índice y al árbol de trabajo\n" +"q - quit; no aplicar este fragmento ni ninguno de los restantes\n" +"a - aplicar este fragmento y todos los posteriores en el archivo\n" +"d - no aplicar este fragmento ni ninguno de los siguientes en este archivo" #: git-add--interactive.perl:1299 msgid "" @@ -25953,11 +26110,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -"y - aplicar este hunk al índice y al árbol de trabajo\n" -"n - no aplicar este hunk al índice y al árbol de trabajo\n" -"q - quit; no aplicar este hunk ni ninguno de los restantes\n" -"a - aplicar este hunk y todos los posteriores en el archivo\n" -"d - no aplicar este hunk ni ninguno de los siguientes en este archivo" +"y - aplicar este fragmento al índice y al árbol de trabajo\n" +"n - no aplicar este fragmento al índice y al árbol de trabajo\n" +"q - quit; no aplicar este fragmento ni ninguno de los restantes\n" +"a - aplicar este fragmento y todos los posteriores en el archivo\n" +"d - no aplicar este fragmento ni ninguno de los siguientes en este archivo" #: git-add--interactive.perl:1314 msgid "" @@ -25972,13 +26129,13 @@ msgid "" "? - print help\n" msgstr "" "g - selecciona un hunk a donde ir\n" -"/ - buscar un hunk que concuerde el regex\n" -"j - dejar este hunk por definir, ver siguiente hunk por definir\n" -"J - dejar este hunk por definir, ver siguiente hunk\n" -"k - dejar este hunk por definir, ver hunk previo por definir\n" -"K - dejar este hunk por definir, ver hunk previo\n" -"s - dividir el hunk actual en hunks más pequeños\n" -"e - editar manualmente el hunk actual\n" +"/ - buscar un hunk que concuerde con el regex dado\n" +"j - dejar este fragmento por definir, ver siguiente fragmento por definir\n" +"J - dejar este fragmento por definir, ver siguiente fragmento\n" +"k - dejar este fragmento por definir, ver fragmento previo por definir\n" +"K - dejar este fragmento por definir, ver fragmento previo\n" +"s - dividir el fragmento actual en hunks más pequeños\n" +"e - editar manualmente el fragmento actual\n" "? - imprimir ayuda\n" #: git-add--interactive.perl:1345 @@ -25993,12 +26150,12 @@ msgstr "ignorando lo no fusionado: %s\n" #: git-add--interactive.perl:1479 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar cambio de modo al árbol de trabajo [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1480 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar eliminación al árbol de trabajo [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1481 #, perl-format @@ -26008,16 +26165,16 @@ msgstr "¿Aplicar adición al árbol de trabajo [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1482 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "¿Aplicar este fragmento al árbol de trabajo [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" -msgstr "No hay más pedazos para el ir\n" +msgstr "No hay más fragmentos a que ir\n" #: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" -msgstr "Numero inválido: '%s'\n" +msgstr "Número inválido: '%s'\n" #: git-add--interactive.perl:1622 #, perl-format @@ -26028,7 +26185,7 @@ msgstr[1] "Lo siento, solo %d hunks disponibles.\n" #: git-add--interactive.perl:1657 msgid "No other hunks to search\n" -msgstr "No hay más pedazos para buscar\n" +msgstr "No hay más fragmentos para buscar\n" #: git-add--interactive.perl:1674 #, perl-format @@ -26037,15 +26194,15 @@ msgstr "Regexp para la búsqueda mal formado %s: %s\n" #: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" -msgstr "No hay hunks que concuerden con el patrón entregado.\n" +msgstr "No hay fragmentos que concuerden con el patrón entregado.\n" #: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" -msgstr "No el anterior hunk\n" +msgstr "Sin hunk previo\n" #: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" -msgstr "No el siguiente hunk\n" +msgstr "Sin hunk siguiente\n" #: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" @@ -26055,8 +26212,8 @@ msgstr "Perdón, no se puede dividir este pedazo\n" #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" -msgstr[0] "Cortar en %d hunk.\n" -msgstr[1] "Cortar en %d hunks.\n" +msgstr[0] "Cortar en %d fragmento.\n" +msgstr[1] "Cortar en %d fragmentos.\n" #: git-add--interactive.perl:1746 msgid "Sorry, cannot edit this hunk\n" @@ -26101,94 +26258,94 @@ msgstr "modo --patch desconocido: %s" msgid "invalid argument %s, expecting --" msgstr "argumento inválido %s, se esperaba --" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" -msgstr "la zona local difiere de GMT por un intervalo de cero minutos\n" +msgstr "la zona local difiere de GMT por un intervalo de minutos no entero\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "el offset del tiempo local es mayor o igual a 24 horas\n" -#: git-send-email.perl:222 +#: git-send-email.perl:214 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "fatal: comando '%s' murió con código de salida %d" -#: git-send-email.perl:235 +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "el editor se cerró inapropiadamente, abortando todo" -#: git-send-email.perl:321 +#: git-send-email.perl:316 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contiene una versión intermedia del correo que se estaba generando.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contiene el email generado.\n" -#: git-send-email.perl:419 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases no es compatible con otras opciones.\n" -#: git-send-email.perl:493 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" "Set sendemail.forbidSendmailVariables to false to disable this check.\n" msgstr "" "fatal: opciones de configuración encontradas para 'sendmail'\n" -"git-send-email está configurado con las opciones sendemail. * - tenga en " +"git-send-email está configurado con las opciones sendemail.* - tenga en " "cuenta la 'e'.\n" "Establezca sendemail.forbidSendmailVariables en false para deshabilitar esta " "verificación.\n" -#: git-send-email.perl:498 git-send-email.perl:700 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n" -#: git-send-email.perl:501 +#: git-send-email.perl:533 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" -"`batch-size` y `relogin` deben ser especificados juntos (via la línea de " +"`batch-size` y `relogin` deben ser especificados juntos (vía la línea de " "comando o por opción de configuración)\n" -#: git-send-email.perl:514 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Campo --suppress-cc desconocido: '%s'\n" -#: git-send-email.perl:545 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Configuración --confirm desconocida: '%s'\n" -#: git-send-email.perl:573 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" -msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n" +msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n" -#: git-send-email.perl:575 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "peligro: `:include:` no soportado: %s\n" -#: git-send-email.perl:577 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "advertencia: redirección `/file` o `|pipe` no soportada: %s\n" -#: git-send-email.perl:582 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "advertencia: línea sendmail no reconocida: %s\n" -#: git-send-email.perl:666 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -26203,12 +26360,12 @@ msgstr "" " * Diciendo \"./%s\" si se quiere decir un archivo; o\n" " * Agregando la opción --format-patch si se quiere decir un rango.\n" -#: git-send-email.perl:687 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Falló al abrir directorio %s: %s" -#: git-send-email.perl:720 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -26218,17 +26375,17 @@ msgstr "" "¡No se especificaron parches!\n" "\n" -#: git-send-email.perl:733 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "¿No hay línea de subject en %s?" -#: git-send-email.perl:743 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Falló al abrir para escritura %s: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -26236,33 +26393,33 @@ msgid "" "\n" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -"Lineas que comienzan en \"GIT:\" serán eliminadas.\n" +"Líneas que comienzan en \"GIT:\" serán eliminadas.\n" "Considere incluir un diffstat global o una tabla de contenidos\n" "para el parche que estás escribiendo.\n" "\n" "Limpiar el contenido de body si no deseas mandar un resumen.\n" -#: git-send-email.perl:778 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "Falló al abrir %s: %s" -#: git-send-email.perl:795 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Falló al abrir %s.final: %s" -#: git-send-email.perl:838 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "Archivo de resumen está vacío, saltando al siguiente\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "¿Estás seguro de que deseas usar <%s> [y/N]? " -#: git-send-email.perl:928 +#: git-send-email.perl:990 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -26270,11 +26427,11 @@ msgstr "" "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:933 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "¿Qué codificación de 8bit debería declarar [UTF-8]? " +msgstr "¿Qué codificación de 8 bits se debería declarar [UTF-8]? " -#: git-send-email.perl:941 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -26284,25 +26441,25 @@ msgid "" msgstr "" "Rehusando mandar el parche porque\n" "\t%s\n" -"tiene el asunto de template '*** SUBJECT HERE ***'. Agrega --force si" +"tiene el asunto de template '*** SUBJECT HERE ***'. Agrega --force si " "realmente lo deseas mandar.\n" -#: git-send-email.perl:960 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" -msgstr "¿A quién se deben mandar los correos (si existe)?" +msgstr "¿A quién se deben mandar los correos (si alguien hay)?" -#: git-send-email.perl:978 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: alias '%s' se expande a si mismo\n" -#: git-send-email.perl:990 +#: git-send-email.perl:1052 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -"¿Qué id de mensaje será usado como In-Reply-To en el primer email (si " -"existe alguno)? " +"¿Qué id de mensaje será usado como In-Reply-To en el primer email (si existe " +"alguno)? " -#: git-send-email.perl:1048 git-send-email.perl:1056 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "error: no es posible extraer una dirección válida de %s\n" @@ -26310,16 +26467,16 @@ msgstr "error: no es posible extraer una dirección válida de %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1060 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " -msgstr "¿Qué hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): " +msgstr "¿Qué hacer con esta dirección? ([q]salir|[d]descartar|[e]ditar): " -#: git-send-email.perl:1377 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Ruta CA \"%s\" no existe" -#: git-send-email.perl:1460 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -26333,10 +26490,9 @@ msgid "" "\n" msgstr "" " La lista Cc ha sido expandida por direcciones adicionales\n" -" encontradas en el mensaje de commit parchado.. Por defecto\n" -" send-email se muestra antes de mandar cualquier cada vez que esto " -"sucede.\n" -" Este comportamiento is controlado por el valor de configuración " +" encontradas en el mensaje de commit parchado. Por defecto\n" +" send-email se muestra antes de mandar si esto sucede.\n" +" Este comportamiento es controlado por el valor de configuración " "sendemail.confirm.\n" "\n" " Para más información, ejecuta 'git send-email --help'.\n" @@ -26347,113 +26503,114 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1475 +#: git-send-email.perl:1544 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "¿Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): " -#: git-send-email.perl:1478 +#: git-send-email.perl:1547 msgid "Send this email reply required" -msgstr "Necesitas mandar esta respuesta de email" +msgstr "Se requiere una respuesta a ¿Mandar este email?" -#: git-send-email.perl:1506 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." -msgstr "El servidor SMTP no esta definido adecuadamente." +msgstr "El servidor SMTP no está definido adecuadamente." -#: git-send-email.perl:1553 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "¡El servidor no soporta STARTTLS! %s" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "¡Falló STARTTLS! %s" -#: git-send-email.perl:1571 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -"No es posible inicializar SMTP adecuadamente. Verificar config y usar --smtp-debug." +"No es posible inicializar SMTP adecuadamente. Verificar config y usar --smtp-" +"debug." -#: git-send-email.perl:1589 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "Falló al enviar %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "Dry-Sent %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Log dice:\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "OK. Log dice:\n" -#: git-send-email.perl:1606 +#: git-send-email.perl:1688 msgid "Result: " msgstr "Resultado: " -#: git-send-email.perl:1609 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1627 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "no se puede abrir el archivo %s" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1680 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Agregando para: %s de la línea '%s'\n" -#: git-send-email.perl:1737 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1772 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1883 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1890 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1894 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) falló al cerrar el pipe a '%s'" -#: git-send-email.perl:1924 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:1932 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "codificación de transferencia inválida" -#: git-send-email.perl:1966 +#: git-send-email.perl:2051 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -26464,12 +26621,12 @@ msgstr "" "%s\n" "peligro: no se mandaron parches\n" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:1979 +#: git-send-email.perl:2064 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26478,983 +26635,28 @@ msgstr "" "fatal: %s: %d es más grande que 998 caracteres\n" "peligro: no se mandaron parches\n" -#: git-send-email.perl:1997 +#: git-send-email.perl:2082 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Saltando %s con el sufijo de backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2001 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "¿Realmente deseas mandar %s? [y|N]: " -#~ msgid "--cached and --3way cannot be used together." -#~ msgstr "--cached y --3way no se pueden utilizar juntas." - -#~ msgid "both" -#~ msgstr "ambos" - -#~ msgid "one" -#~ msgstr "uno" - -#, c-format -#~ msgid "Already up to date!" -#~ msgstr "¡Ya está actualizado!" - -#~ msgid "Already up to date. Yeeah!" -#~ msgstr "Ya está actualizado. ¡Oh, yeaahh!" - -#~ msgid "--batch-size option is only for 'repack' subcommand" -#~ msgstr "opción --batch-size es solo para el subcomando 'repack'" - -#~ msgid "Percentage by which creation is weighted" -#~ msgstr "Porcentaje por el cual la creación es pesada" - -#~ msgid "" -#~ "the rebase.useBuiltin support has been removed!\n" -#~ "See its entry in 'git help config' for details." -#~ msgstr "" -#~ "el soporte para rebase.useBuiltin ha sido eliminado!\n" -#~ "Vea su entrada en 'git help config' para detalles." - -#, perl-format -#~ msgid "%s: patch contains a line longer than 998 characters" -#~ msgstr "%s: el parche contiene una línea con más de 998 caracteres" - -#~ msgid "store only" -#~ msgstr "solo guardar" - -#~ msgid "compress faster" -#~ msgstr "comprimir más rápido" - -#~ msgid "compress better" -#~ msgstr "comprimir mejor" - -#~ msgid "unknown hash algorithm length" -#~ msgstr "largo del algoritmo hash desconocido" - -#~ msgid "rev-list died" -#~ msgstr "rev-list murió" - -#~ msgid "" -#~ "commit-graph chunk lookup table entry missing; file may be incomplete" -#~ msgstr "" -#~ "falta tabla de lookup del chunk en commit-graph; el archivo puede estar " -#~ "incompleto" - -#, c-format -#~ msgid "commit-graph improper chunk offset %08x%08x" -#~ msgstr "offset del chunk de commit-graph inapropiado %08x%08x" - -#, c-format -#~ msgid "commit-graph chunk id %08x appears multiple times" -#~ msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos" - -#~ msgid "Writing changed paths Bloom filters index" -#~ msgstr "Escribiendo cambios de ruta del índice de filtros Bloom" - -#~ msgid "Counting distinct commits in commit graph" -#~ msgstr "Contando commits distintos en commit graph" - -#, c-format -#~ msgid "unexpected duplicate commit id %s" -#~ msgstr "id de commit duplicado inesperado %s" - -#, c-format -#~ msgid "the commit graph format cannot write %d commits" -#~ msgstr "el formato de gráficos de commit no pudede escribir %d commits" - -#, c-format -#~ msgid "hash version %u does not match" -#~ msgstr "versión de hash %u no concuerda" - -#~ msgid "invalid chunk offset (too large)" -#~ msgstr "offset inválido del conjunto (muy grande)" - -#~ msgid "error preparing packfile from multi-pack-index" -#~ msgstr "error preparando packfile de multi-pack-index" - -#~ msgid "Writing chunks to multi-pack-index" -#~ msgstr "Escribiendo chunks a multi-pack-index" - -#~ msgid "Remote with no URL" -#~ msgstr "Remoto sin URL" - -#, c-format -#~ msgid "%%(subject) does not take arguments" -#~ msgstr "%%(subject) no toma ningún argumento" - -#, c-format -#~ msgid "positive value expected objectname:short=%s" -#~ msgstr "valor positivo esperado objectname:short=%s" - -#, c-format -#~ msgid "unrecognized %%(objectname) argument: %s" -#~ msgstr "argumento: %s no reconocido %%(objectname)" - -#, c-format -#~ msgid "option `%s' is incompatible with --merged" -#~ msgstr "opción `%s' es incompatible con --merged" - -#, c-format -#~ msgid "option `%s' is incompatible with --no-merged" -#~ msgstr "opción `%s' es incompatible con --no-merged" - -#, c-format -#~ msgid "could not open '%s' for writing: %s" -#~ msgstr "no se pudo abrir '%s' para escritura: %s" - -#, c-format -#~ msgid "could not read ref '%s'" -#~ msgstr "no se pudo leer la referencia '%s'" - -#, c-format -#~ msgid "ref '%s' already exists" -#~ msgstr "ref '%s' ya existe" - -#, c-format -#~ msgid "unexpected object ID when writing '%s'" -#~ msgstr "ID de objecto inesperado al escribir '%s'" - -#, c-format -#~ msgid "unexpected object ID when deleting '%s'" -#~ msgstr "ID de objecto inesperado al borrar '%s'" - -#, c-format -#~ msgid "The hash algorithm %s is not supported in this build." -#~ msgstr "El algoritmo hash %s no está soportado en este build." - -#, c-format -#~ msgid "%s: not a valid OID" -#~ msgstr "%s no es OID válido" - -#~ msgid "git bisect--helper --next-all [--no-checkout]" -#~ msgstr "git bisect--helper --next-all [--no-checkout]" - -#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>" -#~ msgstr "git bisect--helper --write-terms <mal_término> <buen_término>" - -#~ msgid "" -#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> " -#~ "<good_term> <bad_term>" -#~ msgstr "" -#~ "git bisect--helper --bisect-write [--no-log] <estado> <revision> " -#~ "<buen_term> <mal_term>" - -#~ msgid "" -#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -#~ "<bad_term>" -#~ msgstr "" -#~ "git bisect--helper --bisect-check-and-set-terms <comando> <buen_term> " -#~ "<mal_term>" - -#~ msgid "could not open the file BISECT_TERMS" -#~ msgstr "no se pudo abrir el archivo BISECT_TERMS" - -#~ msgid "perform 'git bisect next'" -#~ msgstr "realiza 'git bisect next'" - -#~ msgid "write the terms to .git/BISECT_TERMS" -#~ msgstr "escribe los términos a .git/BISECT_TERMS" - -#~ msgid "cleanup the bisection state" -#~ msgstr "limpiar el estado de bisección" - -#~ msgid "check for expected revs" -#~ msgstr "revisar por revs esperados" - -#~ msgid "write out the bisection state in BISECT_LOG" -#~ msgstr "escribir el estado de bisect en BISECT_LOG" - -#~ msgid "check and set terms in a bisection state" -#~ msgstr "revisar y configurar los terms en el estado de bisect" - -#~ msgid "update BISECT_HEAD instead of checking out the current commit" -#~ msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" - -#~ msgid "--write-terms requires two arguments" -#~ msgstr "--write-terms requiere dos argumentos" - -#~ msgid "--bisect-clean-state requires no arguments" -#~ msgstr "--bisect-clean-state no requiere argumentos" - -#~ msgid "--bisect-write requires either 4 or 5 arguments" -#~ msgstr "--bisect-write requiere entre 4 o 5 argumentos" - -#~ msgid "--check-and-set-terms requires 3 arguments" -#~ msgstr "--bisect-clean-state no requiere argumentos" - -#~ msgid "Force progress reporting" -#~ msgstr "Forzar el reporte de progreso" - -#~ msgid "n,m" -#~ msgstr "n,m" - -#, c-format -#~ msgid "Error deleting remote-tracking branch '%s'" -#~ msgstr "Error al eliminar la rama de rastreo remota '%s'" - -#, c-format -#~ msgid "Error deleting branch '%s'" -#~ msgstr "Error al eliminar la rama '%s'" - -#~ msgid "show parse tree for grep expression" -#~ msgstr "mostrar árbol analizado para la expresión grep" - -#~ msgid "Process line range n,m in file, counting from 1" -#~ msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" - -#~ msgid "name of output directory is too long" -#~ msgstr "nombre del directorio de salida es muy largo" - -#~ msgid "standard output, or directory, which one?" -#~ msgstr "¿salida standard, o directorio, cual?" - -#~ msgid "print only names (no SHA-1)" -#~ msgstr "imprimir sólo nombres (sin SHA-1)" - -#~ msgid "too many parameters" -#~ msgstr "demasiados parámetros" - -#~ msgid "too few parameters" -#~ msgstr "muy pocos parámetros" - -#~ msgid "passed to 'git am'" -#~ msgstr "pasado a 'git am'" - -#, c-format -#~ msgid "" -#~ "WARNING: Some packs in use have been renamed by\n" -#~ "WARNING: prefixing old- to their name, in order to\n" -#~ "WARNING: replace them with the new version of the\n" -#~ "WARNING: file. But the operation failed, and the\n" -#~ "WARNING: attempt to rename them back to their\n" -#~ "WARNING: original names also failed.\n" -#~ "WARNING: Please rename them in %s manually:\n" -#~ msgstr "" -#~ "WARNING: Algunos packs en uso han sido renombrados\n" -#~ "WARNING: agregando el prefijo old- a sus nombres,para\n" -#~ "WARNING: reemplazarlos con la nueva versión del\n" -#~ "WARNING: archivo. Pero la operación falló, y el intento\n" -#~ "WARNING: de renombrarlos a sus nombres originales\n" -#~ "WARNING: también falló.\n" -#~ "WARNING: Por favor renombralos en %s manualmente:\n" - -#, c-format -#~ msgid "failed to remove '%s'" -#~ msgstr "falló al eliminar'%s'" - -#~ msgid "Recurse into nested submodules" -#~ msgstr "Recursar en submódulos anidados" - -#~ msgid "too many params" -#~ msgstr "demasiados parámetros" - -#~ msgid "Routines to help parsing remote repository access parameters" -#~ msgstr "" -#~ "Rutinas para ayudar a analizar los parámetros de acceso del repositorio " -#~ "remoto" - -#, sh-format -#~ msgid "Bad rev input: $bisected_head" -#~ msgstr "Mala entrada rev: $bisected_head" - -#, sh-format -#~ msgid "Bad rev input: $rev" -#~ msgstr "Mala entrada rev: $rev" - -#~ msgid "The --cached option cannot be used with the --files option" -#~ msgstr "La opción --cached no puede ser usada con la opción --files" - -#, sh-format -#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" -#~ msgstr " Advertencia: $display_name no contiene el commit $sha1_src" - -#, sh-format -#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" -#~ msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" - -#, sh-format -#~ msgid "" -#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -#~ msgstr "" -#~ " Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" - -#, sh-format -#~ msgid "See git-${cmd}(1) for details." -#~ msgstr "Véase git-${cmd}(1) para más detalles." - -#, c-format -#~ msgid "Finding commits for commit graph from %d ref" -#~ msgid_plural "Finding commits for commit graph from %d refs" -#~ msgstr[0] "Encontrando commits para commit graph de %d ref" -#~ msgstr[1] "Encontrando commits para commit graph de %d refs" - -#, c-format -#~ msgid "invalid commit object id: %s" -#~ msgstr "id de objeto commit: %s inválido" - -#, c-format -#~ msgid "Removing worktrees/%s: not a valid directory" -#~ msgstr "Removiendo el worktrees/%s: no es un directorio válido" - -#, c-format -#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -#~ msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)" - -#, c-format -#~ msgid "Removing worktrees/%s: invalid gitdir file" -#~ msgstr "Removiendo worktrees/%s: archivo gitdir inválido" - -#, c-format -#~ msgid "unable to re-add worktree '%s'" -#~ msgstr "no es posible volver a agregar el árbol '%s'" - -#, c-format -#~ msgid "target '%s' already exists" -#~ msgstr "el objetivo '%s' ya existe" - -#, c-format -#~ msgid "" -#~ "Cannot update sparse checkout: the following entries are not up to date:\n" -#~ "%s" -#~ msgstr "" -#~ "No se puede actualizar el sparse checkout: las siguientes entradas no " -#~ "están actualizadas:\n" -#~ "%s" - -#, c-format -#~ msgid "" -#~ "The following working tree files would be overwritten by sparse checkout " -#~ "update:\n" -#~ "%s" -#~ msgstr "" -#~ "Los siguientes archivos del árbol de trabajo serán sobrescritos por la " -#~ "actualización sparse checkout:\n" -#~ "%s" - -#, c-format -#~ msgid "" -#~ "The following working tree files would be removed by sparse checkout " -#~ "update:\n" -#~ "%s" -#~ msgstr "" -#~ "Los siguientes archivos del árbol de trabajo serán eliminados por la " -#~ "actualización sparse checkout:\n" -#~ "%s" - -#, c-format -#~ msgid "annotated tag %s has no embedded name" -#~ msgstr "tag anotado %s no tiene nombre embebido" - -#~ msgid "automatically stash/stash pop before and after rebase" -#~ msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase" - -#~ msgid "--[no-]autostash option is only valid with --rebase." -#~ msgstr "La opción --[no-]autostash sólo es válida con --rebase." - -#~ msgid "(DEPRECATED) keep empty commits" -#~ msgstr "(DEPRECADO) mantener commits vacíos" - -#, c-format -#~ msgid "Could not read '%s'" -#~ msgstr "No se pudo leer '%s'" - -#, c-format -#~ msgid "Cannot store %s" -#~ msgstr "No se puede guardar %s" - -#~ msgid "initialize sparse-checkout" -#~ msgstr "inicializar sparse-checkout" - -#~ msgid "set sparse-checkout patterns" -#~ msgstr "configurar patrones de sparse-checkout" - -#~ msgid "disable sparse-checkout" -#~ msgstr "deshabilitar sparse-checkout" - -#, c-format -#~ msgid "could not exec %s" -#~ msgstr "no se pudo ejecutar %s" - -#~ msgid "Cannot remove temporary index (can't happen)" -#~ msgstr "No se puede eliminar el índice temporal (no puede suceder)" - -#, sh-format -#~ msgid "Cannot update $ref_stash with $w_commit" -#~ msgstr "No se puede actualizar $ref_stash con $w_commit" - -#, sh-format -#~ msgid "error: unknown option for 'stash push': $option" -#~ msgstr "error: opción desconocida para 'stash pus': $option" - -#, sh-format -#~ msgid "Saved working directory and index state $stash_msg" -#~ msgstr "Directorio de trabajo guardado y estado de índice $stash_msg" - -#, sh-format -#~ msgid "unknown option: $opt" -#~ msgstr "opción desconocida: $opt" - -#, sh-format -#~ msgid "Too many revisions specified: $REV" -#~ msgstr "Se especificaron demasiadas revisiones: $REV" - -#, sh-format -#~ msgid "$reference is not a valid reference" -#~ msgstr "$reference no es una referencia válida" - -#, sh-format -#~ msgid "'$args' is not a stash-like commit" -#~ msgstr "'$args' no es un commit estilo stash" - -#, sh-format -#~ msgid "'$args' is not a stash reference" -#~ msgstr "'$args' no es una referencia stash" - -#~ msgid "unable to refresh index" -#~ msgstr "incapaz de refrescar el índice" - -#~ msgid "Cannot apply a stash in the middle of a merge" -#~ msgstr "No se puede aplicar un stash en medio de una fusión" - -#~ msgid "Conflicts in index. Try without --index." -#~ msgstr "Conflictos en índice. Intente sin --index." - -#~ msgid "Could not save index tree" -#~ msgstr "No se puede guardar el índice del árbol" - -#~ msgid "Could not restore untracked files from stash entry" -#~ msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" - -#~ msgid "Cannot unstage modified files" -#~ msgstr "No se puede sacar de stage archivos modificados" - -#, sh-format -#~ msgid "Dropped ${REV} ($s)" -#~ msgstr "Botado ${REV} ($s)" - -#, sh-format -#~ msgid "${REV}: Could not drop stash entry" -#~ msgstr "${REV}: No se pudo borrar entrada stash" - -#~ msgid "(To restore them type \"git stash apply\")" -#~ msgstr "(Para restaurarlos, escribe \"git stash apply\")" - -#, c-format -#~ msgid "Stage mode change [y,n,a,q,d%s,?]? " -#~ msgstr "¿Cambio de modo de stage [y,n,a,q,d%s,?]? " - -#, c-format -#~ msgid "Stage deletion [y,n,a,q,d%s,?]? " -#~ msgstr "¿Aplicar stage al borrado [y,n,a,q,d%s,?]? " - -#, c-format -#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? " -#~ msgstr "¿Aplicar stage a este hunk [y,n,a,q,d%s,?]? " - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for staging.\n" -#~ msgstr "" -#~ "Si el parche aplica limpiamente, el hunk editado será marcado\n" -#~ "inmediatamente para el área de stage.\n" - -#~ msgid "" -#~ "y - stage this hunk\n" -#~ "n - do not stage this hunk\n" -#~ "q - quit; do not stage this hunk or any of the remaining ones\n" -#~ "a - stage this and all the remaining hunks\n" -#~ "d - do not stage this hunk nor any of the remaining hunks\n" -#~ msgstr "" -#~ "y - aplicar stage a este hunk\n" -#~ "n - no aplicar stage a este hunk\n" -#~ "q - quit; no aplicar stage a este hunk ni ninguno de los restantes\n" -#~ "a - aplicar stage a este hunk y a todos los posteriores en el archivo\n" -#~ "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " -#~ "archivo\n" - -#, c-format -#~ msgid "could not copy '%s' to '%s'." -#~ msgstr "no se pudo copiar '%s' a '%s'." - -#~ msgid "malformed ident line" -#~ msgstr "línea de entrada mal formada" - -#, c-format -#~ msgid "could not parse '%.*s'" -#~ msgstr "no se puede analizar '%.*s'" - -#, c-format -#~ msgid "could not checkout %s" -#~ msgstr "no se puede hacer checkout a %s" - -#, c-format -#~ msgid "filename in tree entry contains backslash: '%s'" -#~ msgstr "nombre de archivo en el árbol contiene un backslash: '%s'" - -#, c-format -#~ msgid "Use -f if you really want to add them.\n" -#~ msgstr "Usa -f si realmente quieres agregarlos.\n" - -#, c-format -#~ msgid "Maybe you wanted to say 'git add .'?\n" -#~ msgstr "¿Tal vez quiso decir 'git add .'?\n" - -#, c-format -#~ msgid "packfile is invalid: %s" -#~ msgstr "packfile es inválido: %s" - -#, c-format -#~ msgid "unable to open packfile for reuse: %s" -#~ msgstr "no es posible abrir packfile para reusar: %s" - -#~ msgid "unable to seek in reused packfile" -#~ msgstr "no es posible buscar en los packfile reusados" - -#~ msgid "unable to read from reused packfile" -#~ msgstr "no es posible leer de packfile reusado" - -#~ msgid "no HEAD?" -#~ msgstr "¿Sin HEAD?" - -#~ msgid "preserve empty commits during rebase" -#~ msgstr "preservar commits vacíos durante el rebase" - -#~ msgid "cannot combine --use-bitmap-index with object filtering" -#~ msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" - -#, 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 "" -#~ "La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n" -#~ "$sm_path\n" -#~ "Usa -f si en verdad quieres agregarlo." - -#~ msgid "Use an experimental heuristic to improve diffs" -#~ msgstr "Usar un heurístico experimental para mejorar los diffs" - -#~ msgid "git commit-graph [--object-dir <objdir>]" -#~ msgstr "git commit-graph [--object-dir <objdir>]" - -#~ msgid "git commit-graph read [--object-dir <objdir>]" -#~ msgstr "git commit-graph read [--object-dir <objdir>]" - -#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -#~ msgstr "" -#~ "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por " -#~ "defecto" - -#~ msgid "cannot change partial clone promisor remote" -#~ msgstr "no se puede cambiar un clon parcial remoto promisor" - -#~ msgid "error building trees" -#~ msgstr "error construyendo árboles" - -#~ msgid "invalid date format '%s' in '%s'" -#~ msgstr "formato de fecha inválido '%s' en '%s'" - -#~ msgid "writing root commit" -#~ msgstr "escribiendo commit raíz" - -#~ msgid "staged changes in the following files may be lost: %s" -#~ msgstr "" -#~ "cambios en el área de stage en el siguiente archivo pueden ser perdidos: " -#~ "%s" - -#~ msgid "" -#~ "--filter can only be used with the remote configured in extensions." -#~ "partialClone" -#~ msgstr "" -#~ "--filter solo puede ser usado con el remoto configurado en extensions." -#~ "partialClone" - -#~ msgid "verify commit-msg hook" -#~ msgstr "verificar el hook commit-msg" - -#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" -#~ msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'" - -#~ msgid "invalid sparse value '%s'" -#~ msgstr "valor disperso inválido: '%s'" - -#~ msgid "Server supports multi_ack_detailed" -#~ msgstr "El servidor soporta ulti_ack_detailed" - -#~ msgid "Server supports no-done" -#~ msgstr "El servidor soporta no-done" - -#~ msgid "Server supports multi_ack" -#~ msgstr "El servidor soporta multi_ack" - -#~ msgid "Server supports side-band-64k" -#~ msgstr "El servidor soporta side-band-64k" - -#~ msgid "Server supports side-band" -#~ msgstr "El servidor soporta side-band" - -#~ msgid "Server supports allow-tip-sha1-in-want" -#~ msgstr "El servidor soporta allow-tip-sha1-in-want" - -#~ msgid "Server supports allow-reachable-sha1-in-want" -#~ msgstr "El servidor soporta allow-reachable-sha1-in-want" - -#~ msgid "Server supports ofs-delta" -#~ msgstr "El servidor soporta ofs-delta" - -#~ msgid "Checking out files" -#~ msgstr "Revisando archivos" - -#~ msgid "cannot be interactive without stdin connected to a terminal." -#~ msgstr "no se puede ser interactivo sin stdin conectado a un terminal." - -#~ msgid "failed to stat %s\n" -#~ msgstr "falló al analizar %s\n" - -#~ 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 "" -#~ "Si quiere saltar este commit, use:\n" -#~ "\n" -#~ " git reset\n" -#~ "\n" -#~ "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n" -#~ "para los commits restantes.\n" - -#~ msgid "unrecognized verb: %s" -#~ msgstr "verbo no reconocido: %s" - -#~ msgid "option '%s' requires a value" -#~ msgstr "opción '%s' requiere un valor" - -#~ msgid "could not transform the todo list" -#~ msgstr "no se pudo transformar lista de pendientes" - -#~ msgid "default" -#~ msgstr "default" - -#~ msgid "Could not create directory '%s'" -#~ msgstr "No se pudo crear el directorio '%s'" - -#~ msgid "allow rerere to update index with resolved conflict" -#~ msgstr "permitir rerere actualizar index con conflictos resueltos" - -#~ msgid "could not open %s" -#~ msgstr "no se pudo abrir %s" - -#~ msgid "Could not move back to $head_name" -#~ msgstr "No se puede regresar a $head_name" - -#~ 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 "" -#~ "Parece que ya hay un directorio $state_dir_base, y\n" -#~ "me pregunto si está en medio de otro rebase. Si ese es el\n" -#~ "caso, por favor intente\n" -#~ "\t$cmd_live_rebase\n" -#~ "Si no es el caso, por favor\n" -#~ "\t$cmd_clear_stale_rebase\n" -#~ "y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n" -#~ "algo de valor ahí." - -#~ msgid "" -#~ "fatal: cannot combine am options with either interactive or merge options" -#~ msgstr "" -#~ "fatal: no se puede combinar opciones am con opciones interactivas o de " -#~ "merge" - -#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" -#~ msgstr "fatal: no se puede combinar '--signoff' con '--preserve-merges'" - -#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" -#~ msgstr "" -#~ "fatal: no se puede combinar '--preserve-merges' con '--rebase-merges'" - -#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" -#~ msgstr "" -#~ "fatal: no se puede combinar '--rebase-merges' con '--strategy-option'" - -#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" -#~ msgstr "fatal: no se puede combinar '--rebase-merges' con '--strategy'" - -#~ msgid "invalid upstream '$upstream_name'" -#~ msgstr "upstream inválido '$upstream_name'" - -#~ msgid "$onto_name: there are more than one merge bases" -#~ msgstr "$onto_name: hay más de una base de fusión" - -#~ msgid "$onto_name: there is no merge base" -#~ msgstr "$onto_name: no hay base de fusión" - -#~ msgid "Does not point to a valid commit: $onto_name" -#~ msgstr "No apunta a un commit válido: $onto_name" - -#~ msgid "fatal: no such branch/commit '$branch_name'" -#~ msgstr "fatal: no existe la rama/commit: '$branch_name'" - -#~ msgid "Created autostash: $stash_abbrev" -#~ msgstr "Autostash creado: $stash_abbrev" - -#~ msgid "Current branch $branch_name is up to date." -#~ msgstr "La rama actual $branch_name está actualizada." - -#~ msgid "Current branch $branch_name is up to date, rebase forced." -#~ msgstr "Rama actual $branch_name está actualizada, rebase forzado." - -#~ msgid "Changes to $onto:" -#~ msgstr "Cambios hacia $onto:" - -#~ msgid "Changes from $mb to $onto:" -#~ msgstr "Cambios desde $mb a $onto:" - -#~ msgid "Fast-forwarded $branch_name to $onto_name." -#~ msgstr "Avance rápido de $branch_name a $onto_name." - -#~ msgid "First, rewinding head to replay your work on top of it..." -#~ msgstr "" -#~ "En primer lugar, rebobinando HEAD para después reproducir tus cambios " -#~ "encima de ésta..." - -#~ msgid "ignoring unknown color-moved-ws mode '%s'" -#~ msgstr "ignorando modo desconocido color-moved-ws '%s'" - -#~ msgid "only 'tree:0' is supported" -#~ msgstr "solo 'tree:0' es soportado" - -#~ msgid "Renaming %s to %s and %s to %s instead" -#~ msgstr "Renombrando %s a %s y %s a %s más bien" - -#~ msgid "Adding merged %s" -#~ msgstr "Agregar %s fusionado" - -#~ msgid "Internal error" -#~ msgstr "Error interno" - -#~ msgid "mainline was specified but commit %s is not a merge." -#~ msgstr "línea principal especificada pero el commit %s no es una fusión." - -#~ msgid "unable to write sha1 filename %s" -#~ msgstr "incapaz de escribir el nombre de archivo sha1 %s" - -#~ msgid "cannot read sha1_file for %s" -#~ msgstr "no se puede leer sha1_file para %s" - -#~ msgid "" -#~ "error: cannot combine interactive options (--interactive, --exec, --" -#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am " -#~ "options (%s)" -#~ msgstr "" -#~ "error: no se puede combinar opciones interactivas (--interactive, --exec, " -#~ "--rebase-merges, --preserve-merges, --keep-empty, --root + --onto) con " -#~ "opciones (%s)" - -#~ msgid "" -#~ "error: cannot combine merge options (--merge, --strategy, --strategy-" -#~ "option) with am options (%s)" -#~ msgstr "" -#~ "error: no se puede combinar opciones de merge (--merge, --strategy, --" -#~ "strategy-option) con opciones de am (%s)" - -#~ msgid "unrecognised option: '$arg'" -#~ msgstr "opción no reconocida: '$arg'" - -#~ msgid "'$invalid' is not a valid commit" -#~ msgstr "'$invalid' no es un commit válido" - -#~ msgid "could not parse '%s' (looking for '%s')" -#~ msgstr "no se pudo configurar '%s' (buscando '%s')" - -#~ msgid "deprecated synonym for --create-reflog" -#~ msgstr "sinónimo deprecado para --create-reflog" - -#~ msgid "Can't stat %s" -#~ msgstr "No se puede definir %s" - -#~ msgid "abort rebase" -#~ msgstr "abortar rebase" - -#~ msgid "make rebase script" -#~ msgstr "generar script de rebase" - -#~ msgid "cannot move a locked working tree" -#~ msgstr "no se puede mover un árbol de trabajo encerrado" - -#~ msgid "cannot remove a locked working tree" -#~ msgstr "no se puede eliminar árbol de trabajo encerrado" - -#~ msgid "" -#~ "\n" -#~ "\tHowever, if you remove everything, the rebase will be aborted.\n" -#~ "\n" -#~ "\t" -#~ msgstr "" -#~ "\n" -#~ "\tComo sea, si quieres borrar todo, el rebase será abortado.\n" -#~ "\n" -#~ "\t" - -#~ msgid "Dirty index: cannot merge (dirty: %s)" -#~ msgstr "Índice sucio: no se puede fusionar (sucio: %s)" - -#~ msgid "(+/-)x" -#~ msgstr "(+/-)x" - -#~ msgid "<command>" -#~ msgstr "<comando>" - -#~ msgid "push|fetch" -#~ msgstr "push|fetch" - -#~ msgid "w[,i1[,i2]]" -#~ msgstr "w[,i1[,i2]]" - -#~ msgid "Entering '$displaypath'" -#~ msgstr "Entrando a '$displaypath'" - -#~ msgid "Stopping at '$displaypath'; script returned non-zero status." -#~ msgstr "" -#~ "Deteniendo en '$displaypath'; script devolvió un status distinto de cero." - -#~ msgid "Everyday Git With 20 Commands Or So" -#~ msgstr "Git diario con 20 comandos o algo así" - -#~ msgid "Could not open '%s' for writing" -#~ msgstr "No se pudo abrir '%s' para escritura" - -#~ msgid "" -#~ "unexpected 1st line of squash message:\n" -#~ "\n" -#~ "\t%.*s" -#~ msgstr "" -#~ "1ra línea del mensaje squash no esperada:\n" -#~ "\n" -#~ "\t%.*s" - -#~ msgid "" -#~ "invalid 1st line of squash message:\n" -#~ "\n" -#~ "\t%.*s" -#~ msgstr "" -#~ "1ra línea del mensaje squash inválida:\n" -#~ "\n" -#~ "\t%.*s" - -#~ msgid "BUG: returned path string doesn't match cwd?" -#~ msgstr "BUG: string de ruta recibido no concuerda con cwd?" - -#~ msgid "Error in object" -#~ msgstr "Error en el objeto" - -#~ msgid "git fetch-pack: expected ACK/NAK, got EOF" -#~ msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo EOF" +#~ msgid "unable to write stateless separator packet" +#~ msgstr "no es posible escribir un paquete separador sin estado (stateless)" -#~ msgid "invalid filter-spec expression '%s'" -#~ msgstr "expresión filter-spec inválida '%s'" - -#~ msgid "The copy of the patch that failed is found in: %s" -#~ msgstr "La copia del parche que fallido se encuentra en: %s" +#~ msgid "git merge --abort" +#~ msgstr "git merge --abort" -#~ msgid "pathspec and --all are incompatible" -#~ msgstr "pathspec y --all son incompatibles" +#~ msgid "git merge --continue" +#~ msgstr "git merge --continue" -#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" -#~ msgstr "" -#~ "Anulado el registro del submódulo '$name' ($url) para la ruta " -#~ "'$displaypath'" - -#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" -#~ msgstr "" -#~ "Campos Para/Cc/Bcc no han sido interpretados todavía, han sido ignorados\n" - -#~ msgid "" -#~ "empty strings as pathspecs will be made invalid in upcoming releases. " -#~ "please use . instead if you meant to match all paths" -#~ msgstr "" -#~ "los strings vacíos como pathspecs serán inválidas en las próximas " -#~ "versiones. por favor use . si quería hacer coincidir todas las rutas" - -#~ msgid "could not truncate '%s'" -#~ msgstr "no se pudo truncar '%s'" - -#~ msgid "could not close %s" -#~ msgstr "no se pudo cerrar %s" - -#~ msgid "Copied a misnamed branch '%s' away" -#~ msgstr "Copiada una rama mal llamada '%s' afuera" - -#~ msgid "it does not make sense to create 'HEAD' manually" -#~ msgstr "No tiene sentido crear 'HEAD' manualmente" - -#~ msgid "Don't know how to clone %s" -#~ msgstr "No se sabe como clonar %s" - -#~ msgid "Don't know how to fetch from %s" -#~ msgstr "No se sabe como extraer de %s" - -#~ msgid "'$term' is not a valid term" -#~ msgstr "'$term' no es un término válido" - -#~ msgid "" -#~ "error: unknown option for 'stash save': $option\n" -#~ " To provide a message, use git stash save -- '$option'" -#~ msgstr "" -#~ "error: opción desconocida para 'stash save': $option\n" -#~ " Esto provee un mensaje , use git stash save -- '$option'" - -#~ msgid "Failed to recurse into submodule path '$sm_path'" -#~ msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'" - -#~ msgid "%%(trailers) does not take arguments" -#~ msgstr "%%(trailers) no toma argumentos" - -#~ msgid "submodule update strategy not supported for submodule '%s'" -#~ msgstr "" -#~ "estrategia de actualización de submódulo no soportada para submódulo '%s'" - -#~ msgid "change upstream info" -#~ msgstr "cambie info de upstream" - -#~ msgid "" -#~ "\n" -#~ "If you wanted to make '%s' track '%s', do this:\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Si querías hacer que '%s' rastree '%s', haz esto:\n" -#~ "\n" - -#~ msgid "basename" -#~ msgstr "nombre base" - -#~ msgid "" -#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -#~ " - $line" -#~ msgstr "" -#~ "Peligro: falta el SHA-1 o no es un commit en la siguiente línea:\n" -#~ " - $line" - -#~ msgid "" -#~ "Warning: the command isn't recognized in the following line:\n" -#~ " - $line" -#~ msgstr "" -#~ "Peligro: el comando no es reconocido en la siguiente línea:\n" -#~ " - $line" +#~ msgid "git stash clear" +#~ msgstr "git stash clear" -#~ msgid "Or you can abort the rebase with 'git rebase --abort'." -#~ msgstr "O puedes abortar el rebasamiento con 'git rebase --abort'." +#~ msgid "remote server sent stateless separator" +#~ msgstr "el servidor remoto envió un separador sin estado (stateless)" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.33.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-08-03 17:06+0800\n" -"PO-Revision-Date: 2021-08-09 20:35+0100\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" +"PO-Revision-Date: 2021-08-14 21:14+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -23,7 +23,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" @@ -53,7 +53,7 @@ msgstr "Uppdatera" msgid "could not stage '%s'" msgstr "kunde inte köa \"%s\"" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "kunde inte skriva indexet" @@ -212,9 +212,10 @@ msgstr "ej köad" #: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 #: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "sökväg" @@ -797,7 +798,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -1571,7 +1572,7 @@ msgstr "kan inte läsa %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 #: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 -#: builtin/merge.c:1143 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -1660,7 +1661,8 @@ msgid "list supported archive formats" msgstr "visa understödda arkivformat" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "arkiv" @@ -1855,7 +1857,7 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 #: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 #: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 #: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 @@ -3118,7 +3120,7 @@ msgstr "oväntad filtertyp" msgid "path name too long for external filter" msgstr "sökvägen för lång för externt filter" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3127,16 +3129,16 @@ msgstr "" "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " "inte har filtrerats" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" @@ -3314,7 +3316,7 @@ msgid "" "'dimmed-zebra', 'plain'" msgstr "" "färginställningen för flyttade block måste vara en av \"no\", \"default\", " -"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\"" +"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\"" #: diff.c:325 #, c-format @@ -3355,7 +3357,7 @@ msgstr "extern diff dog, stannar vid %s" #: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" -msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" +msgstr "--name-only, --name-status, --check och -s är ömsesidigt uteslutande" #: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" @@ -3370,10 +3372,10 @@ msgstr "" #: diff.c:4643 msgid "" -"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " "with -G and -S" msgstr "" -"---pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-" +"--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-" "all med -G och -S" #: diff.c:4722 @@ -3929,7 +3931,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:1510 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -3948,51 +3950,51 @@ msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer" msgid "unrecognized pattern: '%s'" msgstr "okänt mönster: %s" -#: dir.c:792 dir.c:806 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "okänt negativt mönster: %s" -#: dir.c:824 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera " "gånger" -#: dir.c:834 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "inaktiverar konmönstermatchning" -#: dir.c:1221 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:2358 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2660 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2784 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3617 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3664 dir.c:3669 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3698 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -4016,7 +4018,7 @@ msgstr "kunde inte ta status på filen \"%s\"" msgid "bad git namespace path \"%s\"" msgstr "felaktig git-namnrymdssökväg \"%s\"" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "kunde inte ställa in GIT_DIR till \"%s\"" @@ -4183,7 +4185,7 @@ msgstr "källarkivet är grunt, tillåter inte kloning." #: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." -msgstr "git fetch-patch: hämtning misslyckades." +msgstr "git fetch-pack: hämtning misslyckades." #: fetch-pack.c:1242 #, c-format @@ -4651,34 +4653,34 @@ msgstr "citerad CRLF upptäcktes" msgid "bad action '%s' for '%s'" msgstr "felaktig funktion \"%s\" för \"%s\"" -#: merge-ort.c:1228 merge-recursive.c:1206 +#: merge-ort.c:1569 merge-recursive.c:1201 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-ort.c:1237 merge-recursive.c:1213 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-ort.c:1246 merge-recursive.c:1220 +#: merge-ort.c:1587 merge-recursive.c:1215 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Misslyckades slå ihop undermodulen %s (incheckningar följer inte " "sammanslagningsbasen)" -#: merge-ort.c:1256 merge-ort.c:1263 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Obs: Snabbspolar undermodulen %s till %s" -#: merge-ort.c:1284 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "Misslyckades slå ihop undermodulen %s" -#: merge-ort.c:1291 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4687,7 +4689,7 @@ msgstr "" "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n" "%s\n" -#: merge-ort.c:1295 merge-recursive.c:1274 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4704,7 +4706,7 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-ort.c:1308 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4714,21 +4716,21 @@ msgstr "" "finns:\n" "%s" -#: merge-ort.c:1527 merge-recursive.c:1363 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-ort.c:1532 merge-recursive.c:1368 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-ort.c:1539 merge-recursive.c:1401 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-ort.c:1678 merge-recursive.c:2123 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4737,7 +4739,7 @@ msgstr "" "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." -#: merge-ort.c:1688 merge-recursive.c:2133 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4746,7 +4748,7 @@ msgstr "" "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" -#: merge-ort.c:1746 +#: merge-ort.c:2087 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4757,7 +4759,7 @@ msgstr "" "den har namnbytts till flera andra kataloger, utan att någon destination " "fick en majoritet av filerna." -#: merge-ort.c:1900 merge-recursive.c:2469 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4766,7 +4768,7 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-ort.c:2044 merge-recursive.c:3252 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4775,7 +4777,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-ort.c:2051 merge-recursive.c:3259 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4784,7 +4786,7 @@ msgstr "" "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " "namn i %s; flyttar den till %s." -#: merge-ort.c:2064 merge-recursive.c:3255 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4793,7 +4795,7 @@ msgstr "" "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " "%s, föreslår att den bör flyttas till%s." -#: merge-ort.c:2072 merge-recursive.c:3262 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4802,13 +4804,13 @@ msgstr "" "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " "bytte namn i %s; flyttar den till %s." -#: merge-ort.c:2228 +#: merge-ort.c:2569 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s." -#: merge-ort.c:2323 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4819,23 +4821,23 @@ msgstr "" "innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till " "nästlade konfliktmarkörer." -#: merge-ort.c:2342 merge-ort.c:2366 +#: merge-ort.c:2683 merge-ort.c:2707 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s." -#: merge-ort.c:2819 merge-recursive.c:3013 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-ort.c:2822 merge-recursive.c:3016 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-ort.c:3250 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4844,7 +4846,7 @@ msgstr "" "KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den " "till %s istället." -#: merge-ort.c:3326 +#: merge-ort.c:3689 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -4853,7 +4855,7 @@ msgstr "" "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge " "så att de kan protokollföras någonstans." -#: merge-ort.c:3333 +#: merge-ort.c:3696 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -4862,24 +4864,24 @@ msgstr "" "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena " "så att de kan protokollföras någonstans." -#: merge-ort.c:3433 merge-recursive.c:3092 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "innehåll" -#: merge-ort.c:3435 merge-recursive.c:3096 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-ort.c:3437 merge-recursive.c:3141 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "undermodul" -#: merge-ort.c:3439 merge-recursive.c:3142 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-ort.c:3470 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4888,7 +4890,7 @@ msgstr "" "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s " "lämnad i trädet." -#: merge-ort.c:3757 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4900,12 +4902,12 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4116 +#: merge-ort.c:4487 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3707 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4915,109 +4917,109 @@ msgstr "" "sammanslagning:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "Redan à jour." -#: merge-recursive.c:357 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:380 +#: merge-recursive.c:375 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." -#: merge-recursive.c:389 +#: merge-recursive.c:384 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar " "sammanslagningen." -#: merge-recursive.c:877 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:888 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:902 merge-recursive.c:921 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:911 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:952 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:957 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:982 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:993 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:998 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" ska hanteras" -#: merge-recursive.c:1228 merge-recursive.c:1240 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1231 merge-recursive.c:1243 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1266 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar " "hittades inte)" -#: merge-recursive.c:1270 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1271 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n" -#: merge-recursive.c:1283 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1425 +#: merge-recursive.c:1420 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället." -#: merge-recursive.c:1497 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5026,7 +5028,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1502 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5035,7 +5037,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet." -#: merge-recursive.c:1509 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5044,7 +5046,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1514 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5053,40 +5055,40 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1549 +#: merge-recursive.c:1544 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1549 +#: merge-recursive.c:1544 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1610 +#: merge-recursive.c:1605 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen." -#: merge-recursive.c:1668 +#: merge-recursive.c:1663 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s" -#: merge-recursive.c:1699 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1704 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället" -#: merge-recursive.c:1731 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5095,17 +5097,17 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1736 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1823 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:2091 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5116,7 +5118,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2225 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5125,79 +5127,79 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3119 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3172 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3376 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3399 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3404 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3411 +#: merge-recursive.c:3406 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:3420 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3429 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3482 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3576 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3589 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:3639 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3804 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -5207,7 +5209,7 @@ msgid "failed to read the cache" msgstr "misslyckades läsa cachen" #: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -6337,10 +6339,10 @@ msgstr "osorterade köposter för \"%s\"" #: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 #: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:331 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "indexfilen trasig" @@ -6394,36 +6396,36 @@ msgstr "kunde inte uppdatera delat index \"%s\"" msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3074 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "misslyckades omvandla till glest index" -#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3158 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3170 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3199 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3348 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" @@ -6845,17 +6847,17 @@ msgstr "ignorerar referens med trasigt namn %s" msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2498 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2592 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2597 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" @@ -6885,7 +6887,7 @@ msgstr "" "\n" "\tgit config --global init.defaultBranch <namn>\n" "\n" -"Namn som ofta används instället för \"master\" är \"main\", \"trunk\" och\n" +"Namn som ofta används istället för \"master\" är \"main\", \"trunk\" och\n" "\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n" "\n" "\tgit branch -m <namn>\n" @@ -7312,7 +7314,7 @@ msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" #: rerere.c:865 submodule.c:2076 builtin/log.c:2002 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -7350,7 +7352,7 @@ msgstr "kan inte uppdatera katalogen rr-cache" msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: reset.c:70 reset.c:76 sequencer.c:3689 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." @@ -7558,7 +7560,7 @@ msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" #: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 -#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -7706,7 +7708,7 @@ msgstr "kunde inte tolka HEAD" msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" @@ -7714,7 +7716,7 @@ msgstr "kunde inte tolka HEAD:s incheckning" msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" @@ -7732,8 +7734,8 @@ msgstr "ogiltig författar-identitet \"%s\"" msgid "corrupt author: missing date information" msgstr "trasig författare: saknar datuminformation" -#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" @@ -8524,11 +8526,11 @@ msgstr "\"setsid\" misslyckades" msgid "attempting to use sparse-index without cone mode" msgstr "försöker använda glest index utan \"cone\"-läge" -#: sparse-index.c:174 +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" msgstr "kan inte uppdatera cacheträd, behåller fullt läge" -#: sparse-index.c:261 +#: sparse-index.c:263 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "indexposten är en katalog, men inte gles (%08x)" @@ -8683,7 +8685,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "process för undermodulen \"%s\" misslyckades" -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." @@ -9432,7 +9434,7 @@ msgstr "" msgid "Updating index flags" msgstr "Uppdaterar indexflaggor" -#: unpack-trees.c:2707 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s" @@ -10217,7 +10219,7 @@ msgstr "testkörning" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -10346,14 +10348,14 @@ msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" #: builtin/add.c:526 #, c-format msgid "--chmod param '%s' must be either -x or +x" -msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" +msgstr "--chmod parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 #: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 #: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul kräver --pathspec-from-file" @@ -11175,7 +11177,7 @@ msgstr "vehandla inte rotincheckningar som gränser (Standard: av)" msgid "show work cost statistics" msgstr "visa statistik över arbetskostnad" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 #: builtin/push.c:566 builtin/send-pack.c:198 @@ -11532,7 +11534,7 @@ msgstr "visa endast grenar som inte innehåller incheckningen" #: builtin/branch.c:650 msgid "Specific git-branch actions:" -msgstr "Specifika git-branch-åtgärder:" +msgstr "Specifika git-branch åtgärder:" #: builtin/branch.c:651 msgid "list both remote-tracking and local branches" @@ -11970,7 +11972,7 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 #: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -12029,9 +12031,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<flaggor>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1824 -#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 -#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 #: builtin/worktree.c:728 msgid "string" msgstr "sträng" @@ -12126,68 +12129,68 @@ msgstr "sökväg \"%s\": kan inte slå ihop" msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Återskapade %d sammanslagningskonflikt" msgstr[1] "Återskapade %d sammanslagningskonflikter" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Uppdaterade %d sökväg från %s" msgstr[1] "Uppdaterade %d sökvägar från %s" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Uppdaterade %d sökväg från indexet" msgstr[1] "Uppdaterade %d sökvägar från indexet" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "\"%s\" måste användas när \"%s\" inte anges" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12196,50 +12199,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12262,7 +12265,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12289,19 +12292,19 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12310,7 +12313,7 @@ msgstr "" "\"%s\" kan vara både en lokal fil och en spårande gren.\n" "Använd -- (och möjligen --no-guess) för att göra otvetydig" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12330,51 +12333,51 @@ msgstr "" "föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n" "checkout.defaultRemote=origin i din konfiguration." -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "endast en referens förväntades" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "förväntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "förväntade gren, fick fjärrgrenen \"%s\"" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "förväntade gren, fick \"%s\"" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "förväntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12382,7 +12385,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12390,7 +12393,7 @@ msgstr "" "kan inte växla gren mitt i en \"am\"-körning\n" "Överväg \"git am --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12398,7 +12401,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12406,7 +12409,7 @@ msgstr "" "kan inte växla gren i en \"cherry-pick\"\n" "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12414,139 +12417,139 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "då växlar grenar medan du gör en \"bisect\"" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 msgid "perform a 3-way merge with the new branch" msgstr "utför en 3-vägssammanslagning för den nya grenen" -#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "stil" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay är ömsesidigt uteslutande" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "grennamn saknas; försök med -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file är inkompatibelt med --detach" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file är inkompatibelt med --patch" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12554,70 +12557,71 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "du måste ange katalog(er) att återställa" -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -12848,13 +12852,13 @@ msgstr "mallkatalog" msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:123 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" @@ -12903,8 +12907,8 @@ msgstr "revision" msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:137 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" @@ -13013,7 +13017,7 @@ msgid "" msgstr "" "Klonen lyckades, men utcheckningen misslyckades.\n" "Du kan inspektera det som checkades ut med \"git status\"\n" -"och försöka med \"git restore -source=HEAD :/\"\n" +"och försöka med \"git restore --source=HEAD :/\"\n" #: builtin/clone.c:594 #, c-format @@ -13293,7 +13297,7 @@ msgstr "maximalt antal Bloom-filer med ändrad sökväg att beräkna" #: builtin/commit-graph.c:255 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" +msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs" #: builtin/commit-graph.c:287 msgid "Collecting commits from input" @@ -13952,36 +13956,36 @@ msgstr "ok att registrera en tom ändring" msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1747 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1754 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1775 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1782 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1787 +#: builtin/commit.c:1790 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1798 +#: builtin/commit.c:1801 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n" -#: builtin/commit.c:1834 +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -15344,15 +15348,15 @@ msgstr "visa endast referenser som inte innehåller incheckningen" msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<konfig> <kommandoargument>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "konfig" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "saknar --config=<konfig>" @@ -16728,7 +16732,7 @@ msgstr "Kan inte komma åt arbetskatalogen \"%s\"" #: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" -msgstr "--separatebgit-dir är inkompatibelt med naket arkiv" +msgstr "--separate-git-dir är inkompatibelt med naket arkiv" #: builtin/interpret-trailers.c:16 msgid "" @@ -17711,38 +17715,38 @@ msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 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" @@ -17753,11 +17757,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17766,73 +17770,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "inte något vi kan slå ihop med %s: %s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17840,7 +17844,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17848,88 +17852,88 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "Använder %s för att förbereda lösning för hand.\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "Använder strategin %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -18979,7 +18983,7 @@ msgstr "--thin kan inte användas för att bygga ett indexerbart paket" #: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" +msgstr "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt" #: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" @@ -20255,7 +20259,7 @@ msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" #: builtin/rebase.c:1929 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2414 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" @@ -21825,7 +21829,7 @@ msgstr "git log --pretty=short | git shortlog [<flaggor>]" #: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" -msgstr "mer än en --group-flagga stöds inte med standard in" +msgstr "mer än en --group flagga stöds inte med standard in" #: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" @@ -22106,37 +22110,37 @@ msgstr "misslyckades ändra inställning för sparse-index" msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "kunde inte normalisera sökvägen \"%s\"" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "kan inte ta bort citering av C-sträng \"%s\"" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" msgstr "kunde inte läsa in existerande mönster för gles utcheckning" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "läs mönster från standard in" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" @@ -22419,7 +22423,7 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -22433,26 +22437,27 @@ msgstr "submodule--helper print-default-remote tar inga argument" msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "Går in i \"%s\"\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22461,7 +22466,7 @@ msgstr "" "run_command returnerade icke-nollstatus för %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22472,20 +22477,20 @@ msgstr "" "undermoduler för %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22494,54 +22499,54 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\"" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22549,98 +22554,98 @@ msgstr "" "visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "kunde inte hasha objekt från \"%s\"" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "okänt läge %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1304 msgid "compare the commit in the index with that in the submodule HEAD" msgstr "jämför incheckningen i indexet med den i undermodulens HEAD" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "" "hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\"" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "begränsa översiktsstorleken" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "" "git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "kunde inte hämta en version för HEAD" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached och --files är ömsesidigt uteslutande" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "dölj utdata från synkronisering av undermodul-url" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22649,7 +22654,7 @@ msgstr "" "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf" "\" om du verkligen vill ta bort den och all dess historik)" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22658,46 +22663,46 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1597 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "" "ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1690 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22709,46 +22714,67 @@ msgstr "" "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n" "med \"--reference-if-able\" istället för \"--reference\"." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1800 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog" + +#: builtin/submodule--helper.c:1841 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" + +#: builtin/submodule--helper.c:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "katalogen inte tom: \"%s\"" + +#: builtin/submodule--helper.c:1858 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" + +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen ska klonas till" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "förhindra kloning till icke-tom katalog" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22758,103 +22784,83 @@ msgstr "" "<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --" "path <sökväg>" -#: builtin/submodule--helper.c:1873 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog" - -#: builtin/submodule--helper.c:1884 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" - -#: builtin/submodule--helper.c:1888 -#, c-format -msgid "directory not empty: '%s'" -msgstr "katalogen inte tom: \"%s\"" - -#: builtin/submodule--helper.c:1900 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" - -#: builtin/submodule--helper.c:1936 +#: builtin/submodule--helper.c:1953 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1940 +#: builtin/submodule--helper.c:1957 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen ska följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22863,84 +22869,143 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" -#: builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" msgstr "se om det är säkert att skriva till .gitmodules-filen" -#: builtin/submodule--helper.c:2639 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "ta bort konfigurationen från .gitmodules-filen" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <namn> [<värde>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "se till att .gitmodules finns i arbetskatalogen" -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "dölj utdata från inställning av url för undermodul" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "välj master som förvald spårad gren" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "välj förvald spårad gren" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2741 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--brand) <gren> <sökväg>" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "--branch eller --default krävs" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch och --default är ömsesidigt uteslutande" -#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "Lägger till befintligt arkiv i \"%s\" i indexet\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "\"%s\" finns redan och är inte ett giltigt git-arkiv" + +#: builtin/submodule--helper.c:2828 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"Om du vill återanvända den lokala git-katalogen istället för att klona på " +"nytt från\n" +" %s\n" +"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är " +"korrekt\n" +"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" +"flaggan \"--name\".\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "Kan inte checka ut undermodulen \"%s\"" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "gren från arkivet att checka ut vid kloning" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "tillåt lägga till en annars ignorerad undermodulsökväg" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "" +"git submodule--helper add-clone [<flaggor>...] --url <url> --path <sökväg> " +"--name <namn>" + +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -23530,7 +23595,7 @@ msgstr "visa endast statistik" #: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tagg>..." #: builtin/verify-tag.c:36 msgid "print tag contents" @@ -25146,70 +25211,27 @@ msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul" msgid "'$sm_path' does not have a commit checked out" msgstr "\"$sm_path\" har inte någon utcheckad incheckning" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" - -#: git-submodule.sh:261 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"Om du vill återanvända den lokala git-katalogen instället för att klona på " -"nytt från\n" -" $realrepo\n" -"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är " -"korrekt\n" -"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" -"flaggan \"--name\"." - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "Kan inte checka ut undermodulen \"$sm_path\"" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -25218,7 +25240,7 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -25227,7 +25249,7 @@ msgstr "" "Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 " "direkt:" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -25236,48 +25258,48 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" @@ -26028,7 +26050,7 @@ msgstr "\"%s.final\" innehåller det skrivna brevet.\n" #: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" -msgstr "--dump-alias är inkompatibelt med andra flaggor\n" +msgstr "--dump-aliases är inkompatibelt med andra flaggor\n" #: git-send-email.perl:525 msgid "" @@ -90,7 +90,7 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-08-03 17:06+0800\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" "PO-Revision-Date: 2021-08-03 18:00+0300\n" "Last-Translator: Emir SARI <emir_sari@msn.com>\n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" @@ -105,7 +105,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "Pardon (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" @@ -135,7 +135,7 @@ msgstr "Güncelle" msgid "could not stage '%s'" msgstr "'%s' hazırlanamadı" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "indeks yazılamadı" @@ -294,9 +294,10 @@ msgstr "hazırlanmamış" #: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 #: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "yol" @@ -871,7 +872,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor." -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)." @@ -1636,7 +1637,7 @@ msgstr "%s okunamıyor" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 #: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 -#: builtin/merge.c:1143 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "'%s' okunamadı" @@ -1725,7 +1726,8 @@ msgid "list supported archive formats" msgstr "desteklenen arşiv biçimlerini listele" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "depo" @@ -1919,7 +1921,7 @@ msgstr "" "--reverse ve --first-parent birlikte en son işlemenin belirtilmesini " "gerektiriyor" -#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 #: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 #: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 #: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 @@ -3177,7 +3179,7 @@ msgstr "beklenmedik süzgeç türü" msgid "path name too long for external filter" msgstr "dış süzgeç için yol adı pek uzun" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3185,16 +3187,16 @@ msgid "" msgstr "" "'%s' dış süzgeci artık kullanılamıyor; ancak tüm yolların süzümü bitmedi" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "doğru/yanlış geçerli bir çalışma ağacı kodlaması değil" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: temiz süzgeç '%s' başarısız oldu" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: is süzgeci %s başarısız oldu" @@ -3424,15 +3426,16 @@ msgstr "-G, -S ve --find-object birlikte kullanılmaz" msgid "" "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" msgstr "" -"-G ve --pickaxe-regex birlikte kullanılamaz, --pickaxe-regex'i -S ile kullanın" +"-G ve --pickaxe-regex birlikte kullanılamaz, --pickaxe-regex'i -S ile " +"kullanın" #: diff.c:4643 msgid "" -"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " "with -G and -S" msgstr "" -"--pickaxe-all ve --find-object birlikte kullanılamaz, --pickaxe-all'u -G ve " -"-S ile kullanın" +"--pickaxe-all ve --find-object birlikte kullanılamaz, --pickaxe-all'u -G ve -" +"S ile kullanın" #: diff.c:4722 msgid "--follow requires exactly one pathspec" @@ -3461,7 +3464,7 @@ msgstr "" #: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" -msgstr "şurada bilinmeyen değişiklik sınıfı '%c': -diff-filter=%s" +msgstr "şurada bilinmeyen değişiklik sınıfı '%c': --diff-filter=%s" #: diff.c:4916 #, c-format @@ -3573,7 +3576,7 @@ msgstr "" #: diff.c:5416 msgid "synonym for --dirstat=cumulative" -msgstr "--dirstat-cumulative eşanlamlısı" +msgstr "--dirstat=cumulative eşanlamlısı" #: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." @@ -3970,8 +3973,9 @@ msgstr "belirli bir dosyaya çıktı ver" #: diff.c:6298 msgid "exhaustive rename detection was skipped due to too many files." -msgstr "Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya " -"olmasından dolayı atlandı." +msgstr "" +"Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya olmasından " +"dolayı atlandı." #: diff.c:6301 msgid "only found copies from modified paths due to too many files." @@ -3992,7 +3996,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "orderfile '%s' okunamadı" -#: diffcore-rename.c:1510 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor" @@ -4011,49 +4015,49 @@ msgstr "yol belirteci '%s' git'in tanıdığı herhangi bir dosya ile eşleşmed msgid "unrecognized pattern: '%s'" msgstr "tanımlanamayan dizgi: '%s'" -#: dir.c:792 dir.c:806 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "tanımlanamayan negatif dizgi: '%s'" -#: dir.c:824 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "sparse-checkout dosyanızın sorunları olabilir: '%s' dizgisi yinelenmiş" -#: dir.c:834 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor" -#: dir.c:1221 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor" -#: dir.c:2358 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "'%s' dizini açılamadı" -#: dir.c:2660 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "çekirdek adı ve bilgisi alınamadı" -#: dir.c:2784 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış" -#: dir.c:3617 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "%s deposundaki indeks dosyası hasarlı" -#: dir.c:3664 dir.c:3669 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "%s için dizinler oluşturulamadı" -#: dir.c:3698 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi" @@ -4077,7 +4081,7 @@ msgstr "'%s' dosyasının bilgileri alınamadı" msgid "bad git namespace path \"%s\"" msgstr "hatalı git ad alanı yolu \"%s\"" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "GIT_DIR şuna ayarlanamadı: '%s'" @@ -4714,32 +4718,32 @@ msgstr "alıntılanmış CRLF algılandı" msgid "bad action '%s' for '%s'" msgstr "hatalı eylem '%s', '%s' için" -#: merge-ort.c:1228 merge-recursive.c:1206 +#: merge-ort.c:1569 merge-recursive.c:1201 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)" -#: merge-ort.c:1237 merge-recursive.c:1213 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "%s altmodülü birleştirilemedi (işlemeler mevcut değil)" -#: merge-ort.c:1246 merge-recursive.c:1220 +#: merge-ort.c:1587 merge-recursive.c:1215 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "%s altmodülü birleştirilemedi (işlemeler merge-base'i takip etmiyor)" -#: merge-ort.c:1256 merge-ort.c:1263 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Not: %s altmodülü %s yönüne ileri sarılıyor" -#: merge-ort.c:1284 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "'%s' altmodülünü birleştirilemedi" -#: merge-ort.c:1291 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4748,7 +4752,7 @@ msgstr "" "%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n" "%s\n" -#: merge-ort.c:1295 merge-recursive.c:1274 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4764,7 +4768,7 @@ msgstr "" "\n" "komutu bu öneriyi kabul edecektir.\n" -#: merge-ort.c:1308 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4774,21 +4778,21 @@ msgstr "" "mevcut:\n" "%s" -#: merge-ort.c:1527 merge-recursive.c:1363 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "İç birleştirme çalıştırılamadı" -#: merge-ort.c:1532 merge-recursive.c:1368 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "%s veritabanına eklenemedi" -#: merge-ort.c:1539 merge-recursive.c:1401 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "%s kendiliğinden birleştiriliyor" -#: merge-ort.c:1678 merge-recursive.c:2123 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4798,7 +4802,7 @@ msgstr "" "örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: " "%s." -#: merge-ort.c:1688 merge-recursive.c:2133 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4808,7 +4812,7 @@ msgstr "" "eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya " "koymayı denedi: %s." -#: merge-ort.c:1746 +#: merge-ort.c:2087 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4819,7 +4823,7 @@ msgstr "" "adlandırılacağı belirsiz; herhangi bir hedef dosyaların çoğunu almadan " "birden çok başka dizine yeniden adlandırılmıştı." -#: merge-ort.c:1900 merge-recursive.c:2469 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4828,7 +4832,7 @@ msgstr "" "UYARI: %s -> %s yeniden adlandırmasını %s ögesine uygulamadan kaçınılıyor, " "çünkü %s ögesinin kendisi yeniden adlandırıldı." -#: merge-ort.c:2044 merge-recursive.c:3252 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4837,7 +4841,7 @@ msgstr "" "Yol güncellendi: %s, (%s içinde eklenen) %s içinde yeniden adlandırılan bir " "dizinde; onu %s konumuna taşıdı." -#: merge-ort.c:2051 merge-recursive.c:3259 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4846,7 +4850,7 @@ msgstr "" "Yol güncellendi: %s, %s olarak yeniden adlandırıldı (%s içinde), %s içinde " "yeniden adlandırılan bir dizinde; onu %s konumuna taşıdı." -#: merge-ort.c:2064 merge-recursive.c:3255 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4855,7 +4859,7 @@ msgstr "" "ÇAKIŞMA (dosya konumu): %s, (%s içinde eklenen) %s içinde yeniden " "adlandırılan bir dizinde, belki de %s konumuna taşınmalı." -#: merge-ort.c:2072 merge-recursive.c:3262 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4864,14 +4868,14 @@ msgstr "" "ÇAKIŞMA (dosya konumu): %s, %s olarak yeniden adlandırıldı (%s içinde), %s " "içinde yeniden adlandırılan bir dizinde, belki de %s konumuna taşınmalı." -#: merge-ort.c:2228 +#: merge-ort.c:2569 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandırıldı (%s içinde) ve " "ek olarak %s olarak da adlandırıldı (%s içinde)." -#: merge-ort.c:2323 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4882,24 +4886,24 @@ msgstr "" "içerik çakışmaları var ve başka bir yolla çarpışıyor; bu iç içe geçmiş " "çakışmaimleyicilerine neden olabilir." -#: merge-ort.c:2342 merge-ort.c:2366 +#: merge-ort.c:2683 merge-ort.c:2707 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "ÇAKIŞMA (yeniden adlandır/sil): %s->%s olarak adlandırıldı (%s içinde); " "ancak %s içinde silindi." -#: merge-ort.c:2819 merge-recursive.c:3013 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "%s nesnesi okunamıyor" -#: merge-ort.c:2822 merge-recursive.c:3016 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "%s nesnesi ikili bir nesne değil" -#: merge-ort.c:3250 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4908,7 +4912,7 @@ msgstr "" "ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s " "konumuna taşınıyor." -#: merge-ort.c:3326 +#: merge-ort.c:3689 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -4918,7 +4922,7 @@ msgstr "" "ikisi de yeniden adlandırıldı; böylelikle başka bir yerde kayıtları " "yazılabilir." -#: merge-ort.c:3333 +#: merge-ort.c:3696 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -4928,24 +4932,24 @@ msgstr "" "bir tanesi yeniden adlandırıldı; böylelikle her birinin başka bir yerde " "kayıtları yazılabilir." -#: merge-ort.c:3433 merge-recursive.c:3092 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "içerik" -#: merge-ort.c:3435 merge-recursive.c:3096 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "ekle/ekle" -#: merge-ort.c:3437 merge-recursive.c:3141 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "altmodül" -#: merge-ort.c:3439 merge-recursive.c:3142 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması" -#: merge-ort.c:3470 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4954,7 +4958,7 @@ msgstr "" "ÇAKIŞMA (değiştir/sil): %s silindi (%s içinde) ve %s içinde değiştirildi. %s " "sürümü (şunun: %s) ağaçta bırakıldı." -#: merge-ort.c:3757 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4966,12 +4970,12 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4116 +#: merge-ort.c:4487 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "şu ağaçlar için birleştirme bilgisi toplama başarısız: %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3707 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4981,107 +4985,107 @@ msgstr "" "yazılacak:\n" "\t%s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "Tümü güncel." -#: merge-recursive.c:357 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "(hatalı işleme)\n" -#: merge-recursive.c:380 +#: merge-recursive.c:375 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "add_cacheinfo '%s' yolu için başarısız oldu; birleştirme iptal ediliyor." -#: merge-recursive.c:389 +#: merge-recursive.c:384 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo '%s' yolu için yenilenemedi; birleştirme iptal ediliyor." -#: merge-recursive.c:877 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "'%s'%s yolu oluşturulamadı" -#: merge-recursive.c:888 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Altdizine yer açmak için %s kaldırılıyor\n" -#: merge-recursive.c:902 merge-recursive.c:921 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr ": bir D/F çakışması olabilir mi?" -#: merge-recursive.c:911 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor" -#: merge-recursive.c:952 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "%s '%s' nesnesi okunamıyor" -#: merge-recursive.c:957 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' için ikili nesne bekleniyordu" -#: merge-recursive.c:982 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "'%s' açılamadı: %s" -#: merge-recursive.c:993 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "'%s' için sembolik bağ oluşturulamadı: %s" -#: merge-recursive.c:998 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "şununla ne yapılacağı bilinmiyor: %06o %s '%s'" -#: merge-recursive.c:1228 merge-recursive.c:1240 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "%s altmodülü şu işlemeye ileri sarılıyor:" -#: merge-recursive.c:1231 merge-recursive.c:1243 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "%s altmodülü ileri sarılıyor" -#: merge-recursive.c:1266 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "%s altmodülü birleştirilemedi (işlemeleri takip eden birleştirme bulunamadı)" -#: merge-recursive.c:1270 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "%s altmodülü birleştirilemedi (ileri sarım değil)" -#: merge-recursive.c:1271 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n" -#: merge-recursive.c:1283 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)" -#: merge-recursive.c:1425 +#: merge-recursive.c:1420 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Hata: %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine " "%s konumuna yazılacak." -#: merge-recursive.c:1497 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5090,7 +5094,7 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü " "ağaçta bırakıldı." -#: merge-recursive.c:1502 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5099,7 +5103,7 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s " "(%s) sürümü ağaçta bırakıldı." -#: merge-recursive.c:1509 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5108,7 +5112,7 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü " "ağaçta %s konumunda bırakıldı." -#: merge-recursive.c:1514 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5117,45 +5121,45 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s " "(%s) sürümü ağaçta %s konumunda bırakıldı." -#: merge-recursive.c:1549 +#: merge-recursive.c:1544 msgid "rename" msgstr "yeniden adlandır" -#: merge-recursive.c:1549 +#: merge-recursive.c:1544 msgid "renamed" msgstr "yeniden adlandırıldı" -#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor" -#: merge-recursive.c:1610 +#: merge-recursive.c:1605 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Engel olduğu halde %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor." -#: merge-recursive.c:1668 +#: merge-recursive.c:1663 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "ÇAKIŞMA (yeniden adlandır/ekle): %s->%s olarak adlandırıldı (%s içinde). %s " "eklendi (%s içinde)." -#: merge-recursive.c:1699 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s bir dizin (%s içinde), bunun yerine %s olarak ekleniyor" -#: merge-recursive.c:1704 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "%s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine %s " "olarak ekleniyor" -#: merge-recursive.c:1731 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5164,18 +5168,18 @@ msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): \"%s\"->\"%s\" olarak adlandır (\"%s\" " "dalında), \"%s\"->\"%s\" olarak adlandır (\"%s\"%s içinde)" -#: merge-recursive.c:1736 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " (çözülmeden bırakıldı)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1823 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandır (%s içinde). %s->" "%s olarak adlandır (%s içinde)" -#: merge-recursive.c:2091 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5186,7 +5190,7 @@ msgstr "" "yerleştirileceği belirsiz; çünkü %s dizini birden çok başka dizine yeniden " "adlandırılırken hiçbir hedef dosyaların büyük çoğunluğunu almadı." -#: merge-recursive.c:2225 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5195,79 +5199,79 @@ msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): Dizini %s->%s olarak adlandır (%s " "içinde). Dizini %s->%s olarak adlandır (%s içinde)." -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modify" msgstr "değiştir" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modified" msgstr "değiştirilmiş" -#: merge-recursive.c:3119 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)" -#: merge-recursive.c:3172 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "Bunun yerine %s olarak ekleniyor" -#: merge-recursive.c:3376 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "%s kaldırılıyor" -#: merge-recursive.c:3399 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "dosya/dizin" -#: merge-recursive.c:3404 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "dizin/dosya" -#: merge-recursive.c:3411 +#: merge-recursive.c:3406 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "ÇAKIŞMA (%s): %s adıyla bir dizin var (%s içinde). %s, %s olarak ekleniyor." -#: merge-recursive.c:3420 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "%s ekleniyor" -#: merge-recursive.c:3429 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "ÇAKIŞMA (ekle/ekle): %s içinde birleştirme çakışması" -#: merge-recursive.c:3482 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "%s ve %s ağaçlarının birleştirilmesi başarısız" -#: merge-recursive.c:3576 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "Birleştiriliyor:" -#: merge-recursive.c:3589 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ortak ata bulundu:" msgstr[1] "%u ortak ata bulundu:" -#: merge-recursive.c:3639 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "birleştirme herhangi bir işleme döndürmedi" -#: merge-recursive.c:3804 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "'%s' nesnesi ayrıştırılamadı" -#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "İndeks yazılamıyor." @@ -5277,7 +5281,7 @@ msgid "failed to read the cache" msgstr "önbellek okunamadı" #: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "yeni indeks dosyası yazılamıyor" @@ -6284,7 +6288,7 @@ msgstr "diff oluşturulamadı" #: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" -msgstr "-p ve --overlay birlikte kullanılmaz" +msgstr "--left-only ve --right-only birlikte kullanılmaz" #: range-diff.c:562 range-diff.c:564 #, c-format @@ -6403,10 +6407,10 @@ msgstr "'%s' için sırasız hazırlama alanı girdileri" #: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 #: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:331 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "indeks dosyası hasar görmüş" @@ -6460,36 +6464,36 @@ msgstr "paylaşılan indeks '%s' tazelenemedi" msgid "broken index, expect %s in %s, got %s" msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı" -#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "'%s' kapatılamadı" -#: read-cache.c:3074 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "bir sparse-index'e dönüştürülemedi" -#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "'%s' bilgileri alınamadı" -#: read-cache.c:3158 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "git dizini açılamıyor: %s" -#: read-cache.c:3170 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "bağlantı kesilemiyor: %s" -#: read-cache.c:3199 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "'%s' üzerindeki izin bitleri onarılamıyor" -#: read-cache.c:3348 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor" @@ -6903,17 +6907,17 @@ msgstr "bozuk ada iye %s başvurusu yok sayılıyor" msgid "ignoring broken ref %s" msgstr "bozuk başvuru %s yok sayılıyor" -#: ref-filter.c:2498 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "biçim: %%(end) ögeciği eksik" -#: ref-filter.c:2592 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "hatalı oluşturulmuş nesne adı %s" -#: ref-filter.c:2597 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "'%s' bir işlemeye işaret etmeli" @@ -7370,7 +7374,7 @@ msgid "Recorded preimage for '%s'" msgstr "'%s' için öngörüntü kaydedildi" #: rerere.c:865 submodule.c:2076 builtin/log.c:2002 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "'%s' dizini oluşturulamadı" @@ -7408,7 +7412,7 @@ msgstr "rr-cache dizini açılamıyor" msgid "could not determine HEAD revision" msgstr "HEAD revizyonu saptanamadı" -#: reset.c:70 reset.c:76 sequencer.c:3689 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "%s ögesinin ağacı bulunamadı" @@ -7616,7 +7620,7 @@ msgid "unable to dequote value of '%s'" msgstr "'%s' ögesinin tırnakları kaldırılamıyor" #: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 -#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "'%s' okuma için açılamadı" @@ -7763,7 +7767,7 @@ msgstr "HEAD ayrıştırılamadı" msgid "HEAD %s is not a commit!" msgstr "HEAD %s bir işleme değil" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "HEAD işlemesi ayrıştırılamadı" @@ -7771,7 +7775,7 @@ msgstr "HEAD işlemesi ayrıştırılamadı" msgid "unable to parse commit author" msgstr "işleme yazarı ayrıştırılamıyor" -#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "git write-tree bir ağaca yazamadı" @@ -7789,8 +7793,8 @@ msgstr "geçersiz yazar kimliği '%s'" msgid "corrupt author: missing date information" msgstr "hasar görmüş yazar: tarih bilgisi eksik" -#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "işleme nesnesi yazılamadı" @@ -8578,11 +8582,11 @@ msgstr "setsid başarısız" msgid "attempting to use sparse-index without cone mode" msgstr "koni kipi olmadan sparse-index kullanılmaya çalışılıyor" -#: sparse-index.c:174 +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" msgstr "önbellek ağacı güncellenemiyor, dolu kalınıyor" -#: sparse-index.c:261 +#: sparse-index.c:263 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)" @@ -8738,7 +8742,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "'%s' altmodülü için işlem başarısız oldu" -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "HEAD geçerli bir başvuru olarak çözülemedi." @@ -9480,7 +9484,7 @@ msgstr "" msgid "Updating index flags" msgstr "İndeks bayrakları güncelleniyor" -#: unpack-trees.c:2707 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "çalışma ağacı ve izlenmeyen işlemenin yinelenmiş girdileri var: %s" @@ -10268,7 +10272,7 @@ msgstr "sınama turu" msgid "interactive picking" msgstr "etkileşimli seçim" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "parçaları etkileşimli olarak seç" @@ -10403,12 +10407,12 @@ msgstr "" msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod param '%s' ya -x ya da +x olmalıdır" -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 #: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file yol belirteci argümanları ile uyumsuz" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 #: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor" @@ -11089,7 +11093,7 @@ msgstr "Bunu sizin yerinize benim yapmamı ister misiniz [Y/n]? " #: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" -msgstr "Lütfen '--bisec-state'i en az bir argümanla çalıştırın" +msgstr "Lütfen '--bisect-state'i en az bir argümanla çağırın" #: builtin/bisect--helper.c:857 #, c-format @@ -11231,7 +11235,7 @@ msgstr "kök işlemelerini sınır olarak değerlendirme (Öntanımlı: Kapalı) msgid "show work cost statistics" msgstr "iş maliyet istatistiklerini göster" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 #: builtin/push.c:566 builtin/send-pack.c:198 @@ -12025,7 +12029,7 @@ msgstr "dosya adlarını stdin'den oku" msgid "terminate input and output records by a NUL character" msgstr "girdi ve çıktı kayıtlarını bir NUL karakteri ile sonlandır" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 #: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "ilerleme bildirimini gizle" @@ -12084,9 +12088,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<seçenekler>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1824 -#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 -#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 #: builtin/worktree.c:728 msgid "string" msgstr "dizi" @@ -12181,68 +12186,68 @@ msgstr "'%s' yolu: Birleştirilemiyor" msgid "Unable to add merge result for '%s'" msgstr "'%s' için birleştirme sonuçları eklenemiyor" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d birleştirme çakışması yeniden oluşturuldu" msgstr[1] "%d birleştirme çakışması yeniden oluşturuldu" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d yol şuradan güncellendi: %s" msgstr[1] "%d yol şuradan güncellendi: %s" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d yol indeksten güncellendi" msgstr[1] "%d yol indeksten güncellendi" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' güncellenmekte olan yollarla kullanılamaz" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s', %s ile birlikte kullanılamaz" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Aynı anda hem yolları güncelleyip hem de '%s' dalına geçilemiyor." -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ne '%s' ne de '%s' belirtilmiş" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s', '%s' ögesinin belirtilmediği durumlarda kullanılmalıdır" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' veya '%s', %s ile birlikte kullanılamaz" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "'%s' yolu birleştirilmemiş" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "önce geçerli indeksinizi çözmelisiniz" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12251,50 +12256,50 @@ msgstr "" "aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "'%s' için başvuru günlüğü yapılamıyor: %s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD konumu:" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "HEAD güncellenemiyor" -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "'%s' dalı sıfırlandı.\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "Halihazırda '%s' üzerinde\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "'%s' dalına geçildi ve sıfırlandı.\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Yeni '%s' dalına geçildi.\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "'%s' dalına geçildi.\n" -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr "... ve %d daha.\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12317,7 +12322,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12344,19 +12349,19 @@ msgstr[1] "" "\tgit branch <yeni-dal-adı> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "revizyonlarda gezinirken iç hata" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "Önceki HEAD konumu şuydu:" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "Henüz doğmamış bir dal üzerindesiniz" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12365,7 +12370,7 @@ msgstr "" "'%s' hem bir yerel dosya hem de bir izleme dalı olabilir.\n" "Lütfen -- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin." -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12385,51 +12390,51 @@ msgstr "" "isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n" "ayarını yapmayı düşünün." -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' birden çok (%d) uzak izleme dalıyla eşleşti" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "yalnızca bir başvuru bekleniyordu" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "yalnızca bir başvuru bekleniyordu, %d verildi" -#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "geçersiz başvuru: %s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "başvuru bir ağaca değil: %s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "bir dal bekleniyordu, '%s' etiketi alındı" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "bir dal bekleniyordu, '%s' uzak dalı alındı" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "bir dal bekleniyordu, '%s' alındı" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "bir dal bekleniyordu, '%s' işlemesi alındı" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12437,7 +12442,7 @@ msgstr "" "Birleştirme yaparken dal değiştirilemiyor.\n" "\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12445,7 +12450,7 @@ msgstr "" "Bir \"am\" oturumunun ortasında dal değiştirilemiyor.\n" "\"git am --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12453,7 +12458,7 @@ msgstr "" "Yeniden temellendirme yaparken dal değiştirilemiyor.\n" "\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12461,7 +12466,7 @@ msgstr "" "Seç-al yaparken dal değiştirilemiyor.\n" "\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12469,138 +12474,138 @@ msgstr "" "Geriye al yaparken dal değiştirilemiyor.\n" "\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "ikili arama yaparken dal değiştiriyorsunuz" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "dal değiştirilirken yollar kullanılamaz" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "dal değiştirilirken '%s' kullanılamaz" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s', '%s' ile birlikte kullanılamaz" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s', <başlama-noktası> alamaz" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Dal, işleme olmayan '%s' ögesine değiştirilemez" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "dal veya işleme argümanı eksik" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 msgid "perform a 3-way merge with the new branch" msgstr "yeni dal ile bir 3 yönlü birleştirme gerçekleştir" -#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "stil" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "çakışma stili (birleştirme veya diff3)" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "adı verilen işlemede HEAD'i ayır" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "yeni dal için üstkaynak bilgisi ayarla" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "yeni dal" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "yeni üst ögesi olmayan dal" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "yok sayılan dosyaları güncelle (öntanımlı)" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "" "verilen başvuruyu başka bir çalışma ağacının tutup tutmadığını denetleme" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" msgstr "birleştirilmeyen dosyalar için bizdeki sürümü çıkış yap" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" msgstr "birleştirilmeyen dosyalar için onlardaki sürümünü çıkış yap" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c ve --orphan birlikte kullanılmaz" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p ve --overlay birlikte kullanılmaz" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track için bir dal adı gerekli" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "eksik dal adı; -%c deneyin" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "%s çözülemedi" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "geçersiz yol belirtimi" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' bir işleme değil ve ondan bir '%s' dalı oluşturulamaz" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach bir '%s' yol argümanı almıyor" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file, --detach ile uyumsuz" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file, --patch ile uyumsuz" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12608,70 +12613,71 @@ msgstr "" "git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n" "birlikte kullanılamaz" -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "eski durumuna getirilecek yolları belirtmelisiniz" -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "dal" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" msgstr "yeni bir dal oluştur ve çıkış yap" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" msgstr "bir dal oluştur/sıfırla ve çıkış yap" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "yeni dal için başvuru günlüğü oluştur" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "'git checkout <böyle-bir-dal-yok>'a temkinli yaklaş (öntanımlı)" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "yerpaylaşım kipini kullan (öntanımlı)" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "yeni bir dal oluştur ve ona geç" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "bir dal oluştur/sıfırla ve ona geç" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "yerel değişiklikleri çöpe at" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" msgstr "çıkış yapılacak ağacımsı" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "indeksi eski durumuna getir" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "çalışma ağacını eski durumuna getir" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "birleştirilmemiş girdileri yok say" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "yerpaylaşım kipini kullan" @@ -12900,13 +12906,13 @@ msgstr "şablon dizini" msgid "directory from which templates will be used" msgstr "şablonların kullanılacağı dizin" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "başvuru deposu" -#: builtin/clone.c:123 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "--reference'ı yalnızca klonlarken kullan" @@ -12955,8 +12961,8 @@ msgstr "revizyon" msgid "deepen history of shallow clone, excluding rev" msgstr "revizyonu hariç tutarak sığ klonun geçmişini derinleştir" -#: builtin/clone.c:137 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "yalnızca bir dal klonla, HEAD veya --branch" @@ -13481,7 +13487,7 @@ msgstr "" "kullanın.\n" "Bu işlemeyi atlamak isterseniz şunu kullanın:\n" "\n" -"\tgit cherry-pick --continue\n" +"\tgit cherry-pick --skip\n" "\n" #: builtin/commit.c:324 @@ -14016,36 +14022,36 @@ msgstr "boş bir değişikliğin kaydı yazılabilir" msgid "ok to record a change with an empty message" msgstr "boş iletili bir değişikliğin kaydı yazılabilir" -#: builtin/commit.c:1747 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)" -#: builtin/commit.c:1754 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "MERGE_MODE okunamadı" -#: builtin/commit.c:1775 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "işleme iletisi okunamadı: %s" -#: builtin/commit.c:1782 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "İşleme iletisinin boş olmasından dolayı iptal ediliyor.\n" -#: builtin/commit.c:1787 +#: builtin/commit.c:1790 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "İşleme iptal ediliyor; iletiyi düzenlenmedi.\n" -#: builtin/commit.c:1798 +#: builtin/commit.c:1801 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "İşleme iletisi gövdesinin boş olmasından dolayı iptal ediliyor.\n" -#: builtin/commit.c:1834 +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14138,7 +14144,7 @@ msgstr "tüm eşleşmeleri kaldır: ad [değer-dizgisi]" #: builtin/config.c:146 msgid "rename section: old-name new-name" -msgstr "bölümü yeniden adlandır: eski_ad yeni_ad" +msgstr "bölümü yeniden adlandır: eski-ad yeni-ad" #: builtin/config.c:147 msgid "remove a section: name" @@ -14708,7 +14714,7 @@ msgstr "belirtilen diff aracını kullan" #: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" -msgstr "'-tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar" +msgstr "'--tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar" #: builtin/difftool.c:715 msgid "" @@ -14732,7 +14738,7 @@ msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor" #: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" -msgstr "-dir-diff, --no-index ile uyumsuz" +msgstr "--dir-diff, --no-index ile uyumsuz" #: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" @@ -15230,7 +15236,7 @@ msgid "" "you need to specify exactly one branch with the --set-upstream option." msgstr "" "Kaynak dal bulunamadı.\n" -"--set-upstream-option ile tam olarak bir dal belirtmeniz gerekiyor." +"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor." #: builtin/fetch.c:1768 builtin/fetch.c:1831 #, c-format @@ -15261,8 +15267,8 @@ msgstr "Bir etiket adı belirtmeniz gerekiyor." #: builtin/fetch.c:1994 msgid "--negotiate-only needs one or more --negotiate-tip=*" -msgstr "--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi " -"var" +msgstr "" +"--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi var" #: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" @@ -15413,15 +15419,15 @@ msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır" msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<yapılandırma> <komut-argümanları>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "yapılandırma" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "bir depo yolları listesi tutan yapılandırma anahtarı" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "--config=<yapılandırma> eksik" @@ -15791,11 +15797,11 @@ msgstr "uzak konumlar önden getirilemedi" #: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" -msgstr "'git-pack-objects' işlemi başlatılamadı" +msgstr "'git pack-objects' işlemi başlatılamadı" #: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" -msgstr "'git-pack-objects' işlemi bitirilemedi" +msgstr "'git pack-objects' işlemi bitirilemedi" #: builtin/gc.c:1091 msgid "failed to write multi-pack-index" @@ -17779,36 +17785,36 @@ msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n" msgid "'%s' does not point to a commit" msgstr "'%s' bir işlemeye işaret etmiyor" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Hatalı branch.%s.mergeoptions dizisi: %s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "İki uç işlemenin birleştirilmesi dışında bir şey yapılmıyor." -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive için geçersiz seçenek: -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "%s yazılamıyor" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "Şu konumdan okunamadı: '%s'" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "Birleştirme işlenmiyor, tamamlamak için 'git commit' kullanın.\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 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" @@ -17818,11 +17824,11 @@ msgstr "" "girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "Boş bir ileti işlemeyi iptal eder.\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17831,72 +17837,72 @@ msgstr "" "'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti işlemeyi\n" "iptal eder.\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "Boş işleme iletisi." -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "Harika.\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Otomatik birleştirme başarısız; çakışmaları çözün ve sonucu işleyin.\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "Geçerli dal yok." -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "Geçerli dal için uzak konum yok." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış." -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "%s için %s konumundan uzak izleme dalı yok" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Hatalı değer '%s', '%s' ortamında" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "%s içinde birleştirebileceğimiz bir şey değil: %s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "birleştirebileceğimiz bir şey değil" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort bir argüman beklemez" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)." -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit bir argüman beklemez" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue bir argüman beklemez" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)." -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17904,7 +17910,7 @@ msgstr "" "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n" "Lütfen birleştirmeden önce değişikliklerinizi işleyin." -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17912,89 +17918,89 @@ msgstr "" "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut).\n" "Lütfen birleştirmeden önce değişikliklerinizi işleyin." -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut)." -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "--squash ile --no-ff birlikte kullanılamaz." -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "--squash ile --commit birlikte kullanılamaz." -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış." -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "İşlemeyi boş dal ucuna tıkıştırma henüz desteklenmiyor" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "İleri sarım olmayan işlemeyi boş dal ucuna yapmak bir anlam ifade etmiyor" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - birleştirebileceğimiz bir şey değil" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "Boş dal ucuna tam olarak yalnızca bir işleme birleştirilebilir" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "Güncelleniyor: %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "Yok.\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "İleri sarma olanaklı değil, iptal ediliyor." -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "%s birleştirme stratejisi deneniyor...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "%s stratejisi ile birleştirme başarısız oldu.\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "El ile çözümü hazırlamak için %s kullanılıyor.\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "El ile çözümü hazırlamak için %s stratejisi kullanılıyor.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -19253,7 +19259,7 @@ msgstr "%s işlemesine erişilemedi" #: builtin/pull.c:902 msgid "ignoring --verify-signatures for rebase" -msgstr "yeniden temellendirme için --verify-signature yok sayılıyor" +msgstr "yeniden temellendirme için --verify-signatures yok sayılıyor" #: builtin/pull.c:930 msgid "" @@ -20329,7 +20335,7 @@ msgid "fatal: no such branch/commit '%s'" msgstr "onulmaz: böyle bir dal/işleme yok: '%s'" #: builtin/rebase.c:1929 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2414 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "Böyle bir başvuru yok: %s" @@ -20609,7 +20615,7 @@ msgid "" "\t use --mirror=fetch or --mirror=push instead" msgstr "" "--mirror tehlikeli ve artık kullanılmamalı; lütfen\n" -"\t yerine --mirror-fetch veya --mirror=push kullanın." +"\t yerine --mirror=fetch veya --mirror=push kullanın." #: builtin/remote.c:148 #, c-format @@ -21081,7 +21087,7 @@ msgstr "-a ile aynı ve ulaşılamayan nesneleri serbest bırakır" #: builtin/repack.c:465 msgid "remove redundant packs, and run git-prune-packed" -msgstr "gereksiz paketleri kaldır ve 'git prune-packed' çalıştır" +msgstr "gereksiz paketleri kaldır ve 'git-prune-packed' çalıştır" #: builtin/repack.c:467 msgid "pass --no-reuse-delta to git-pack-objects" @@ -22187,37 +22193,37 @@ msgstr "sparse-index yapılandırması değiştirilemedi" msgid "failed to open '%s'" msgstr "'%s' açılamadı" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "'%s' yolu olağanlaştırılamadı" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "C biçemli '%s' dizisinin tırnakları kaldırılamıyor" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "dizgileri stdin'den oku" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "çalışma dizini yenilenirken hata" @@ -22501,7 +22507,7 @@ msgstr "yorum karakteri ile başlayan tüm satırları atla ve kaldır" msgid "prepend comment character and space to each line" msgstr "her satırın başına yorum karakteri ve boşluk koy" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Tam bir başvuru adı bekleniyordu, %s alındı" @@ -22515,26 +22521,27 @@ msgstr "submodule--helper print-default-remote argümanı almaz" msgid "cannot strip one component off url '%s'" msgstr "'%s' url'sinden bir bileşen çıkarılamıyor" -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "göreceli yollar için alternatif tutturucu" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "Giriliyor: '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22543,7 +22550,7 @@ msgstr "" "run_command, %s için sıfır olmayan durum döndürdü\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22553,20 +22560,20 @@ msgstr "" "run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken " "sıfır olmayan durum döndürdü" -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "her bir altmodül komutu girişinin çıktısını gizle" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "iç içe geçmiş altmodüle özyinele" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22575,54 +22582,54 @@ msgstr "" "'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu " "varsayılıyor." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Altmodül yolu url'si '%s' kaydı yapılamadı" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapıldı\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "uyarı: '%s' altmodülü için komut güncellemesi önerilmiyor\n" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "'%s' altmodülü yolu için güncelleme kipi kaydı yapılamadı" -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "bir altmodül ilklendirmesi çıktısını gizle" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<seçenekler>] [<yol>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "'%s' yolu için .gitmodules içinde altmodül eşlemi bulunmadı" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "'%s' altmodülü içinde HEAD başvurusu çözülemedi" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "'%s' altmodülüne özyinelenemedi" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "altmodül durum çıktısını gizle" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22630,96 +22637,96 @@ msgstr "" "altmodül HEAD'i içinde depolanan işleme yerine indekste depolanan işlemeyi " "kullan" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <yol>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(ikili nesne)->%s(altmodül)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(altmodül)->%s(ikili nesne)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "'%s' üzerinden nesne sağlaması yapılamadı" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "beklenmedik kip %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "altmodül HEAD'i içindeki işleme ile indekstekini karşılaştırmak için" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1304 msgid "compare the commit in the index with that in the submodule HEAD" msgstr "indeksteki işlemeyi altmodül HEAD'inde olan ile karşılaştır" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "'ignore_config' değeri 'all' olan altmodülleri atla" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "özet boyutunu sınırla" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "HEAD için bir revizyon getirilemedi" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached ve --files birlikte kullanılamaz" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "'%s' için altmodül url'si eşitleniyor\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "'%s' altmodülü yolu için url kaydı yapılamadı" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "'%s' altmodülü için öntanımlı uzak konum alınamadı" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "'%s' altmodülü için uzak konum güncellenemedi" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "altmodül url'si eşitleme çıktısını gizle" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22728,7 +22735,7 @@ msgstr "" "Altmodül çalışma ağacı '%s' bir .git dizini içeriyor (tüm geçmişi dahil " "olacak biçimde kaldırmak istiyorsanız 'rm -rf' kullanın)" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22737,47 +22744,47 @@ msgstr "" "Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için " "'-f' kullanın" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "'%s' dizini temizlendi\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "'%s' altmodül çalışma ağacı kaldırılamadı\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "boş altmodül dizini %s oluşturulamadı" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1597 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapılmamış\n" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "altmodül çalışma ağaçlarını yerel değişiklikler içerseler bile kaldır" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "tüm altmodüllerin kaydını kaldır" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -"Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '-all' " +"Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '--all' " "kullanın" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1690 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22789,46 +22796,68 @@ msgstr "" "submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n" "--reference yerine --reference-if-able kullanarak klonlayın." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "'%s' altmodülü alternatif ekleyemiyor: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı" -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1800 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" +"başka bir altmodülün git dizininde '%s' oluşturma/kullanma reddediliyor" + +#: builtin/submodule--helper.c:1841 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması başarısız" + +#: builtin/submodule--helper.c:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "dizin boş değil: '%s'" + +#: builtin/submodule--helper.c:1858 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "'%s' için altmodül dizini alınamadı" + +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "yeni altmodülün nereye klonlanacağı" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "yeni altmodülün adı" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "altmodülün klonlanacağı url konumu" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "sığ klonların derinliği" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "zorla klonla" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "boş olmayan dizine klonlamaya izin verme" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22837,103 +22866,82 @@ msgstr "" "git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] " "[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>" -#: builtin/submodule--helper.c:1873 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" -"başka bir altmodülün git dizininde '%s' oluşturma/kullanma reddediliyor" - -#: builtin/submodule--helper.c:1884 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması başarısız" - -#: builtin/submodule--helper.c:1888 -#, c-format -msgid "directory not empty: '%s'" -msgstr "dizin boş değil: '%s'" - -#: builtin/submodule--helper.c:1900 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "'%s' için altmodül dizini alınamadı" - -#: builtin/submodule--helper.c:1936 +#: builtin/submodule--helper.c:1953 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için" -#: builtin/submodule--helper.c:1940 +#: builtin/submodule--helper.c:1957 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için yapılandırılmış" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Altmodül yolu '%s' ilklendirilmedi" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "'update --init' mi kullanmak istersiniz?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Birleştirilmemiş altmodül %s atlanıyor" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "'%s' altmodülü atlanıyor" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı." -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor" -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "çalışma ağacına giden yol" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout veya none" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "belirli bir revizyon sayısına kısaltılmış sığ klon oluştur" -#: builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" msgstr "paralel işler" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "klonlama işlemini yazdırma" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "güncelleme parametresi için hatalı değer" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22942,84 +22950,142 @@ msgstr "" "Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı; ancak " "süperproje herhangi bir dalda değil" -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "'%s' altmodülü için depo tutacağı alınamadı" -#: builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "altmodüllere özyinele" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle" -#: builtin/submodule--helper.c:2639 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <ad> [<değer>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <ad>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol" -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "bir altmodül url ayarlanması çıktısını gizle" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "öntanımlı izleme dalını master olarak ayarla" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "öntanımlı izleme dalını ayarla" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2741 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <yol>" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <dal> <yol>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "--branch veya --default gerekli" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch ve --default birlikte kullanılamaz" -#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "'%s' konumundaki mevcut repo indekse ekleniyor\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "'%s' halihazırda mevcut ve geçerli bir git deposu değil" + +#: builtin/submodule--helper.c:2828 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "'%s' için bir git deposu yerelde şu uzak konumlarla bulundu:" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"Eğer bu yerel git dizinini\n" +" %s\n" +"konumundan yeniden klonlama yerine kullanmak isterseniz '--force'\n" +"seçeneğini kullanın. Eğer bu yerel git dizini doğru depo değilse veya bunun\n" +"ne anlama geldiğinden emin değilseniz '--name' seçeneği ile başka bir ad\n" +"seçin.\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "'%s' altmodülü için yerel git dizini yeniden etkinleştiriliyor\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "'%s' altmodülü çıkış yapılamıyor" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "klonlamada çıkış yapılacak depo dalı" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "başka bir durumda yok sayılan altmodül yolunun eklenmesine izin ver" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "" +"git submodule--helper add-clone [<seçenekler>...] --url <url> --path <yol> --" +"name <ad>" + +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s, --super-prefix desteklemiyor" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' geçerli bir submodule--helper altkomutu değil" @@ -25226,69 +25292,27 @@ msgstr "'$sm_path' indekste halihazırda var ve bir altmodül değil" msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' çıkış yapılan bir işlemeye iye değil" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "'$sm_path' konumundaki mevcut depo indekse ekleniyor" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' halihazırda mevcut ve geçerli bir git deposu değil" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "'$sm_name' için bir git deposu yerelde şu uzak konumlarla bulundu:" - -#: git-submodule.sh:261 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"Bu yerel git dizinini\n" -" $realrepo\n" -"konumundan bir kez daha klonlamak yerine yeniden kullanmak istiyorsanız\n" -"--force seçeneğini kullanın. Eğer bu git dizini doğru depo değilse veya \n" -"bunun ne anlama geldiğinden emin değilseniz --name seçeneği ile başka bir\n" -"ad seçin." - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "'$sm_name' altmodülü için yerel git dizini yeniden etkinleştiriliyor." - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "'$sm_path' altmodülü çıkış yapılamıyor" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "'$sm_path' altmodülü eklenemedi" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "'$sm_path' altmodülü kaydı yapılamadı" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "'$displaypath' altmodül yolunda geçerli revizyon bulunamadı" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "'$sm_path' altmodül yolunda getirme yapılamadı" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -25297,7 +25321,7 @@ msgstr "" "'$sm_path' altmodül yolunda geçerli ${remote_name}/${branch} revizyonu " "bulunamadı" -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -25306,7 +25330,7 @@ msgstr "" "'$displaypath' altmodül yolunda getirme yapılamadı; $sha1 doğrudan " "getirilmeye çalışılıyor" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -25315,47 +25339,47 @@ msgstr "" "'$displaypath' altmodül yolunda getirme tamamlandı; ancak $sha1 içermiyor. " "Bu işlemenin doğrudan getirilmesi başarısız oldu." -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "'$displaypath' altmodül yolunda '$sha1' çıkışı yapılamadı" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Altmodül yolu '$displaypath': '$sha1' çıkışı yaptı" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "'$sha1', '$displaypath' altmodül yolunda yeniden temellendirilemedi" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Altmodül yolu '$displaypath': '$sha1' içine yeniden temellendirildi" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "'$sha1', '$displaypath' altmodül yolunda birleştirilemedi" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Altmodül yolu '$displaypath': '$sha1' içinde birleştirildi" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "'$displaypath' altmodül yolunda '$command $sha1' çalıştırılamadı" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Altmodül yolu '$displaypath': '$command $sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "'$displaypath' altmodül yoluna özyinelenemedi" diff --git a/po/zh_CN.po b/po/zh_CN.po index 668bbacf9d..abbf74cda7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -141,8 +141,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-07-01 16:01+0800\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" +"PO-Revision-Date: 2021-08-14 17:27+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -156,8 +156,8 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" msgstr "不能读取索引" @@ -186,7 +186,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "不能写入索引" @@ -244,12 +244,12 @@ msgstr[1] "增加了 %d 个路径\n" msgid "ignoring unmerged: %s" msgstr "忽略未合入的：%s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "没有修改。\n" @@ -326,11 +326,11 @@ msgstr "选择一个编号条目" msgid "(empty) select nothing" msgstr "（空）不选择任何内容" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "请选择" @@ -342,12 +342,13 @@ msgstr "缓存" msgid "unstaged" msgstr "未缓存" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "路径" @@ -356,7 +357,7 @@ msgstr "路径" msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "再见。\n" @@ -647,40 +648,40 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "无法解析彩色数据块头信息 '%.*s'" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "不能解析差异信息" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "运行 '%s' 失败" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -689,7 +690,7 @@ msgstr "" "预期上下文行 #%d 于\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -702,11 +703,11 @@ msgstr "" "\t不是结尾于：\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -720,7 +721,7 @@ msgstr "" "以 %c 开始的行将被删除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -729,11 +730,11 @@ msgstr "" "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" "此次编辑被终止，该块不会被修改。\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" @@ -749,24 +750,24 @@ msgstr "'git apply --cached' 失败" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引！" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -788,69 +789,69 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "没有前一个块" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "没有下一个块" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "跳转到哪个块？" -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "无效数字：'%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起，只有 %d 个可用块。" msgstr[1] "对不起，只有 %d 个可用块。" -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "没有其它可供查找的块" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "使用正则表达式搜索？" -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s：%s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "对不起，不能拆分这个块" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "对不起，不能编辑这个块" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "'git apply' 失败" @@ -905,7 +906,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" @@ -923,7 +924,8 @@ msgid "" "The following pathspecs didn't match any eligible path, but they do match " "index\n" "entries outside the current sparse checkout:\n" -msgstr "以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n" +msgstr "" +"以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n" #: advice.c:303 msgid "" @@ -1278,8 +1280,8 @@ msgstr "%s：错误类型" msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" @@ -1369,7 +1371,7 @@ msgstr "不能为新建文件 %s 创建后端存储" msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" @@ -1459,7 +1461,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后，应用了 %d 行。" msgstr[1] "修复空白错误后，应用了 %d 行。" -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -1471,7 +1473,7 @@ msgstr "不要应用与给出路径向匹配的变更" msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "数字" @@ -1521,7 +1523,7 @@ msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" #: apply.c:5027 msgid "attempt three-way merge, fall back on normal patch if that fails" -msgstr "尝试三路合并，如果失败则尝试正常补丁模式" +msgstr "尝试三路合并，如果失败则回落至正常补丁模式" #: apply.c:5029 msgid "build a temporary index based on embedded index information" @@ -1535,9 +1537,9 @@ msgstr "路径以 NUL 字符分隔" msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 #: builtin/rebase.c:1347 msgid "action" msgstr "动作" @@ -1567,8 +1569,8 @@ msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" @@ -1580,7 +1582,7 @@ msgstr "允许不正确的文件末尾换行符" msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "根目录" @@ -1622,7 +1624,7 @@ msgstr "路径不是有效的 UTF-8：%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" @@ -1656,13 +1658,13 @@ msgid "cannot read %s" msgstr "不能读取 %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 -#: builtin/merge.c:1143 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" @@ -1704,7 +1706,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "前缀" @@ -1715,7 +1717,7 @@ msgstr "为归档中每个路径名加上前缀" #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" @@ -1746,7 +1748,8 @@ msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "仓库" @@ -1754,7 +1757,7 @@ msgstr "仓库" msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "命令" @@ -1938,11 +1941,11 @@ msgstr "不能将 --contents 和最终的提交对象名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -2094,118 +2097,118 @@ msgstr "'%s' 已经检出到 '%s'" msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "未能识别的归档包哈希算法：%s" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "未知能力 '%s'" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 #: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交：" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "需要一个仓库来校验一个归档包" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个归档包中含有这个引用：" msgstr[1] "这个归档包中含有 %d 个引用：" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "这个归档包记录一个完整历史。" -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个归档包需要这个引用：" msgstr[1] "这个归档包需要 %d 个引用：" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "无法复制归档包描述符" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "不支持的归档包版本 %d" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "不能写入，归档包版本 %d 不支持算法 %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "不能创建空的归档包。" -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack 终止" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "终止块 ID 比预期更早出现" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "发现重复的块ID %<PRIx32>" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "最终块有非零 ID %<PRIx32>" @@ -2273,12 +2276,12 @@ msgstr "无法找到提交 %s" msgid "commit-graph requires overflow generation data but has none" msgstr "提交图需要溢出世代数据，但是没有" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" @@ -2340,7 +2343,7 @@ msgstr "正在查找提交图中额外的边" msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" @@ -2389,78 +2392,78 @@ msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用" msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" -#: commit-graph.c:2517 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" -#: commit-graph.c:2527 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" -#: commit-graph.c:2536 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" -#: commit-graph.c:2550 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" -#: commit-graph.c:2555 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" -#: commit-graph.c:2559 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" -#: commit-graph.c:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2582 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -2742,7 +2745,7 @@ msgstr "%s 的取值格式错误：%s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" @@ -2762,110 +2765,110 @@ msgstr "引用 '%s' 没有指向一个数据对象" msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" -#: config.c:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2560 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:3054 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "不能 mmap '%s'" +msgid "unable to mmap '%s'%s" +msgstr "不能 mmap '%s'%s" -#: config.c:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -3041,7 +3044,7 @@ msgstr "已阻止奇怪的路径名 '%s'" msgid "unable to fork" msgstr "无法 fork" -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在检查连通性" @@ -3160,23 +3163,23 @@ msgstr "意外的过滤类型" msgid "path name too long for external filter" msgstr "外部过滤器的路径名太长" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作区编码" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 过滤器 '%s' 失败" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 过滤器 %s 失败" @@ -3301,36 +3304,36 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛，结束。\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "未知的 --diff-merges 取值：%s" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "--merge-base 不适用于范围" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base 仅适用于提交" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "不能解析 HEAD" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "未找到合并基线" -#: diff-lib.c:566 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "找到了多条合并基线" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<选项>] <路径> <路径>" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3353,7 +3356,7 @@ msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " +"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 " "'plain'" #: diff.c:325 @@ -3385,35 +3388,46 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4712 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S" + +#: diff.c:4643 +msgid "" +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "---pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" -#: diff.c:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3422,200 +3436,200 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符，得到 '%s'" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数：%s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " -#: diff.c:5068 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "选项 -I 的正则表达式无效：'%s'" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数：%s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "差异输出格式化选项" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "生成补丁" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "不显示差异输出" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差异" -#: diff.c:5385 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" -#: diff.c:5388 +#: diff.c:5398 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" -#: diff.c:5392 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" -#: diff.c:5396 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "机器友好的 --stat" -#: diff.c:5399 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" -#: diff.c:5401 diff.c:5409 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<参数1,参数2>..." -#: diff.c:5402 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" -#: diff.c:5406 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" -#: diff.c:5410 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" -#: diff.c:5414 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误，给出警告" -#: diff.c:5417 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要，例如创建、重命名和模式变更" -#: diff.c:5420 +#: diff.c:5430 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" -#: diff.c:5423 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" -#: diff.c:5425 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" -#: diff.c:5426 +#: diff.c:5436 msgid "generate diffstat" msgstr "生成差异统计（diffstat）" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<宽度>" -#: diff.c:5429 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" -#: diff.c:5432 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" -#: diff.c:5435 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" -#: diff.c:5437 +#: diff.c:5447 msgid "<count>" msgstr "<次数>" -#: diff.c:5438 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" -#: diff.c:5441 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" -#: diff.c:5444 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" -#: diff.c:5447 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" -#: diff.c:5449 +#: diff.c:5459 msgid "show colored diff" msgstr "显示带颜色的差异" -#: diff.c:5450 +#: diff.c:5460 msgid "<kind>" msgstr "<类型>" -#: diff.c:5451 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" -#: diff.c:5454 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3623,311 +3637,311 @@ msgstr "" "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<前缀>" -#: diff.c:5458 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" -#: diff.c:5461 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" -#: diff.c:5464 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" -#: diff.c:5467 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" -#: diff.c:5470 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<字符>" -#: diff.c:5475 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" -#: diff.c:5480 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" -#: diff.c:5485 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" -#: diff.c:5488 +#: diff.c:5498 msgid "Diff rename options" msgstr "差异重命名选项" -#: diff.c:5489 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" -#: diff.c:5494 +#: diff.c:5504 msgid "detect renames" msgstr "检测重命名" -#: diff.c:5498 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" -#: diff.c:5501 +#: diff.c:5511 msgid "detect copies" msgstr "检测拷贝" -#: diff.c:5505 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" -#: diff.c:5507 +#: diff.c:5517 msgid "disable rename detection" msgstr "禁用重命名探测" -#: diff.c:5510 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" -#: diff.c:5512 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" -#: diff.c:5515 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" -#: diff.c:5517 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "差异算法选项" -#: diff.c:5519 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" -#: diff.c:5522 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" -#: diff.c:5525 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" -#: diff.c:5528 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" -#: diff.c:5531 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符（CR）" -#: diff.c:5534 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<正则>" -#: diff.c:5537 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "忽略所有行都和正则表达式匹配的变更" -#: diff.c:5540 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" -#: diff.c:5543 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" -#: diff.c:5547 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" -#: diff.c:5549 +#: diff.c:5559 msgid "<algorithm>" msgstr "<算法>" -#: diff.c:5550 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "选择一个差异算法" -#: diff.c:5552 +#: diff.c:5562 msgid "<text>" msgstr "<文本>" -#: diff.c:5553 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<模式>" -#: diff.c:5556 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "显示单词差异，使用 <模式> 分隔变更的单词" -#: diff.c:5559 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" -#: diff.c:5562 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" -#: diff.c:5565 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" -#: diff.c:5568 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" -#: diff.c:5571 +#: diff.c:5581 msgid "Other diff options" msgstr "其它差异选项" -#: diff.c:5573 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" -#: diff.c:5577 +#: diff.c:5587 msgid "treat all files as text" msgstr "把所有文件当做文本处理" -#: diff.c:5579 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入，反转差异" -#: diff.c:5581 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1，否则为 0" -#: diff.c:5583 +#: diff.c:5593 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" -#: diff.c:5585 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" -#: diff.c:5587 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时，运行外部的文本转换过滤器" -#: diff.c:5589 +#: diff.c:5599 msgid "<when>" msgstr "<何时>" -#: diff.c:5590 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时，忽略子模组的更改" -#: diff.c:5593 +#: diff.c:5603 msgid "<format>" msgstr "<格式>" -#: diff.c:5594 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" -#: diff.c:5598 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" -#: diff.c:5601 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" -#: diff.c:5603 +#: diff.c:5613 msgid "<string>" msgstr "<字符串>" -#: diff.c:5604 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" -#: diff.c:5607 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" -#: diff.c:5610 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" -#: diff.c:5613 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" -#: diff.c:5616 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" -#: diff.c:5617 diff.c:5620 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<路径>" -#: diff.c:5618 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "先显示指定路径的变更" -#: diff.c:5621 +#: diff.c:5631 msgid "skip the output to the specified path" msgstr "跳过指定路径的输出" -#: diff.c:5623 +#: diff.c:5633 msgid "<object-id>" msgstr "<对象 ID>" -#: diff.c:5624 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" -#: diff.c:5626 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5627 +#: diff.c:5637 msgid "select files by diff type" msgstr "通过差异类型选择文件" -#: diff.c:5629 +#: diff.c:5639 msgid "<file>" msgstr "<文件>" -#: diff.c:5630 +#: diff.c:5640 msgid "Output to a specific file" msgstr "输出到一个指定的文件" -#: diff.c:6287 -msgid "inexact rename detection was skipped due to too many files." -msgstr "因为文件太多，略过不严格的重命名检查。" +#: diff.c:6298 +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "由于文件太多，跳过详尽的重命名检查。" -#: diff.c:6290 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." -msgstr "因为文件太多，只在修改的路径中查找拷贝。" +msgstr "由于文件太多，只在修改的路径中找到了拷贝。" -#: diff.c:6293 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3938,7 +3952,7 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令 msgid "failed to read orderfile '%s'" msgstr "读取排序文件 '%s' 失败" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" @@ -3947,59 +3961,59 @@ msgstr "正在进行非精确的重命名探测" msgid "No such path '%s' in the diff" msgstr "在差异中无此路径 '%s'" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路径规格 '%s' 未匹配任何 git 已知文件" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "未识别的模式：'%s'" -#: dir.c:777 dir.c:791 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "未识别的反向模式：'%s'" -#: dir.c:809 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'" -#: dir.c:819 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "禁止 cone 模式匹配" -#: dir.c:1206 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" -#: dir.c:2314 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" -#: dir.c:2614 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2738 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3543 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3590 dir.c:3595 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3624 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" @@ -4009,11 +4023,11 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的编辑器关闭文件...%c" -#: entry.c:179 +#: entry.c:176 msgid "Filtering content" msgstr "过滤内容" -#: entry.c:500 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" @@ -4023,7 +4037,7 @@ msgstr "不能对文件 '%s' 调用 stat" msgid "bad git namespace path \"%s\"" msgstr "错误的 git 名字空间路径 \"%s\"" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能设置 GIT_DIR 为 '%s'" @@ -4188,7 +4202,7 @@ msgstr "没有共同的提交" msgid "source repository is shallow, reject to clone." msgstr "源仓库是浅克隆，拒绝克隆。" -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" @@ -4210,7 +4224,7 @@ msgstr "服务器不支持浅克隆请求" msgid "Server supports filter" msgstr "服务器支持 filter" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "无法将请求写到远程" @@ -4266,24 +4280,24 @@ msgstr "处理要获取的引用出错：%d" msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack：预期响应结束包" -#: fetch-pack.c:1930 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:2056 +#: fetch-pack.c:2065 msgid "unexpected 'ready' from remote" msgstr "来自远程的意外的 'ready'" -#: fetch-pack.c:2079 +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:2082 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" @@ -4303,7 +4317,7 @@ msgstr "gpg 数据签名失败" #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" +msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" #: grep.c:531 @@ -4314,18 +4328,18 @@ msgstr "" "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此" "功能" -#: grep.c:1893 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" -#: grep.c:1921 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" @@ -4562,7 +4576,7 @@ msgstr "sparse:path 过滤器支持已被删除" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型" #: list-objects-filter-options.c:124 @@ -4607,7 +4621,7 @@ msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对 msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象" -#: list-objects.c:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "无法为提交 %s 加载根树" @@ -4653,32 +4667,32 @@ msgstr "检测到被引用的 CRLF" msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: merge-ort.c:1569 merge-recursive.c:1201 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s （没有检出）" -#: merge-ort.c:1125 merge-recursive.c:1212 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "无法合并子模组 %s（提交不存在）" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: merge-ort.c:1587 merge-recursive.c:1215 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "无法合并子模组 %s （提交未跟随合并基线）" -#: merge-ort.c:1144 merge-ort.c:1151 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "注意：快进子模组 %s 到 %s" -#: merge-ort.c:1172 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "无法合并子模组 %s" -#: merge-ort.c:1179 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4687,7 +4701,7 @@ msgstr "" "无法合并子模组 %s，但是存在一个可能的合并方案：\n" "%s\n" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4703,7 +4717,7 @@ msgstr "" "\n" "以接受此建议。\n" -#: merge-ort.c:1196 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4712,21 +4726,21 @@ msgstr "" "无法合并子模组 %s，但是存在多个可能的合并：\n" "%s" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4735,7 +4749,7 @@ msgstr "" "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" "在：%s。" -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4744,7 +4758,7 @@ msgstr "" "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" "径放置于此：%s" -#: merge-ort.c:1634 +#: merge-ort.c:2087 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4754,14 +4768,14 @@ msgstr "" "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目" "录中，没有一个目标目录中包含多数文件。" -#: merge-ort.c:1788 merge-recursive.c:2468 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。" -#: merge-ort.c:1932 merge-recursive.c:3244 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4769,7 +4783,7 @@ msgid "" msgstr "" "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" -#: merge-ort.c:1939 merge-recursive.c:3251 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4778,7 +4792,7 @@ msgstr "" "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" "动到 %5$s。" -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4787,7 +4801,7 @@ msgstr "" "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" "到 %s。" -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4796,13 +4810,13 @@ msgstr "" "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" "建议将其移动到 %5$s。" -#: merge-ort.c:2103 +#: merge-ort.c:2569 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。" -#: merge-ort.c:2198 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4812,60 +4826,64 @@ msgstr "" "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这" "可能导致嵌套的冲突标签。" -#: merge-ort.c:2217 merge-ort.c:2241 +#: merge-ort.c:2683 merge-ort.c:2707 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。" -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" -#: merge-ort.c:2981 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。" -#: merge-ort.c:3055 +#: merge-ort.c:3689 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." -msgstr "冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位置。" +msgstr "" +"冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位" +"置。" -#: merge-ort.c:3062 +#: merge-ort.c:3696 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " "of them so each can be recorded somewhere." -msgstr "冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同位置。" +msgstr "" +"冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同" +"位置。" -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "内容" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "添加/添加" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "子模组" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-ort.c:3198 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4874,7 +4892,7 @@ msgstr "" "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本" "在树中被保留。" -#: merge-ort.c:3433 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4884,12 +4902,12 @@ msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3730 +#: merge-ort.c:4487 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "无法收集树 %s、%s、%s 的合并信息" -#: merge-ort-wrappers.c:13 merge-recursive.c:3699 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4898,103 +4916,103 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "已经是最新的。" -#: merge-recursive.c:356 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "（坏提交）\n" -#: merge-recursive.c:379 +#: merge-recursive.c:375 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。" -#: merge-recursive.c:388 +#: merge-recursive.c:384 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。" -#: merge-recursive.c:876 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "创建路径 '%s'%s 失败" -#: merge-recursive.c:887 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:901 merge-recursive.c:920 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:910 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:951 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:956 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:981 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "打开 '%s' 失败：%s" -#: merge-recursive.c:992 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "创建符号链接 '%s' 失败：%s" -#: merge-recursive.c:997 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模组 %s 快进到如下提交：" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快进子模组 %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "无法合并子模组 %s （没发现合并跟随的提交）" -#: merge-recursive.c:1269 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "无法合并子模组 %s（非快进）" -#: merge-recursive.c:1270 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模组的一个可能的合并方案：\n" -#: merge-recursive.c:1282 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s （发现多个合并）" -#: merge-recursive.c:1424 +#: merge-recursive.c:1420 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。" -#: merge-recursive.c:1496 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5003,7 +5021,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1501 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5012,7 +5030,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1508 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5021,7 +5039,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1513 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5030,40 +5048,40 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本保留在 %9$s 中。" -#: merge-recursive.c:1548 +#: merge-recursive.c:1544 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1548 +#: merge-recursive.c:1544 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒绝丢失脏文件 '%s'" -#: merge-recursive.c:1609 +#: merge-recursive.c:1605 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。" -#: merge-recursive.c:1667 +#: merge-recursive.c:1663 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" -#: merge-recursive.c:1698 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1703 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s" -#: merge-recursive.c:1730 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5072,18 +5090,18 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1735 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1827 +#: merge-recursive.c:1823 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->" "%5$s" -#: merge-recursive.c:2090 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5093,7 +5111,7 @@ msgstr "" "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" "其它目录，没有目录包含大部分文件。" -#: merge-recursive.c:2224 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5102,78 +5120,78 @@ msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 " "%4$s->%5$s" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modify" msgstr "修改" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modified" msgstr "修改" -#: merge-recursive.c:3108 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:3161 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:3368 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:3391 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:3396 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:3403 +#: merge-recursive.c:3406 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" -#: merge-recursive.c:3412 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:3421 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "冲突（add/add）：合并冲突于 %s" -#: merge-recursive.c:3474 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:3568 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:3581 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:3631 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:3796 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "不能写入索引。" @@ -5182,8 +5200,8 @@ msgstr "不能写入索引。" msgid "failed to read the cache" msgstr "读取缓存失败" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "无法写新的索引文件" @@ -5257,106 +5275,114 @@ msgstr "打开包索引 '%s' 失败" msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:880 builtin/index-pack.c:1533 msgid "cannot store reverse index file" msgstr "无法存储反向索引文件" -#: midx.c:933 +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "忽略已存在的多包索引，校验码不匹配" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "添加包文件到多包索引" -#: midx.c:979 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "没有看到要丢弃的包文件 %s" -#: midx.c:1024 +#: midx.c:1034 #, c-format msgid "unknown preferred pack: '%s'" msgstr "未知的首选包：'%s'" -#: midx.c:1029 +#: midx.c:1039 #, c-format msgid "preferred pack '%s' is expired" msgstr "首选包 '%s' 已过期" -#: midx.c:1045 +#: midx.c:1055 msgid "no pack files to index." msgstr "没有要索引的包文件。" -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1135 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "删除 %s 失败" -#: midx.c:1156 +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" -#: midx.c:1214 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "多包索引文件存在，但无法解析" -#: midx.c:1222 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "不正确的校验码" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" -#: midx.c:1237 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1242 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "midx 不包含 oid" -#: midx.c:1251 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "校验多包索引中的 OID 顺序" -#: midx.c:1260 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1280 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" -#: midx.c:1287 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1303 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" -#: midx.c:1309 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" -#: midx.c:1318 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>" -#: midx.c:1343 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "正在对引用对象计数" -#: midx.c:1353 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "正在查找和删除未引用的包文件" -#: midx.c:1544 +#: midx.c:1558 msgid "could not start pack-objects" msgstr "不能开始 pack-objects" -#: midx.c:1564 +#: midx.c:1578 msgid "could not finish pack-objects" msgstr "不能结束 pack-objects" @@ -5419,265 +5445,266 @@ msgstr "坏的 %s 值：'%s'" msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" -#: object-file.c:577 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "无法规范化备用对象路径：%s" -#: object-file.c:649 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" -#: object-file.c:656 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" msgstr "无法规范化对象目录: %s" -#: object-file.c:699 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" -#: object-file.c:717 +#: object-file.c:726 msgid "unable to read alternates file" msgstr "无法读取替代文件" -#: object-file.c:724 +#: object-file.c:733 msgid "unable to move new alternates file into place" msgstr "无法将新的替代文件移动到位" -#: object-file.c:759 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" -#: object-file.c:780 +#: object-file.c:789 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: object-file.c:786 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: object-file.c:792 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: object-file.c:800 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被移植" -#: object-file.c:860 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析备用引用时无效的行：%s" -#: object-file.c:1010 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>" -#: object-file.c:1031 -msgid "mmap failed" -msgstr "mmap 失败" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" +msgstr "mmap 失败%s" -#: object-file.c:1195 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" -#: object-file.c:1374 +#: object-file.c:1397 msgid "invalid object type" msgstr "无效的对象类型" -#: object-file.c:1458 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" -#: object-file.c:1461 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "无法解开 %s 头部" -#: object-file.c:1467 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" -#: object-file.c:1470 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" -#: object-file.c:1697 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "读取对象 %s 失败" -#: object-file.c:1701 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: object-file.c:1705 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s（保存在 %s）已损坏" -#: object-file.c:1709 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" -#: object-file.c:1814 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" -#: object-file.c:1821 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" -#: object-file.c:1828 +#: object-file.c:1848 msgid "file write error" msgstr "文件写错误" -#: object-file.c:1848 +#: object-file.c:1868 msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" -#: object-file.c:1913 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足，无法在仓库对象库 %s 中添加对象" -#: object-file.c:1915 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "无法创建临时文件" -#: object-file.c:1939 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "不能写松散对象文件" -#: object-file.c:1945 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s（%d）" -#: object-file.c:1949 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" -#: object-file.c:1953 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: object-file.c:1963 builtin/pack-objects.c:1097 +#: object-file.c:1983 builtin/pack-objects.c:1237 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: object-file.c:2040 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" -#: object-file.c:2091 +#: object-file.c:2111 msgid "corrupt commit" msgstr "损坏的提交" -#: object-file.c:2099 +#: object-file.c:2119 msgid "corrupt tag" msgstr "损坏的标签" -#: object-file.c:2199 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" -#: object-file.c:2202 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入数据库失败" -#: object-file.c:2291 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支持的文件类型" -#: object-file.c:2315 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: object-file.c:2317 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: object-file.c:2344 builtin/index-pack.c:192 +#: object-file.c:2364 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: object-file.c:2535 object-file.c:2588 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的哈希值不匹配（预期 %s）" -#: object-file.c:2559 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: object-file.c:2564 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" -#: object-file.c:2570 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" -#: object-file.c:2581 +#: object-file.c:2605 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "短对象ID %s 存在歧义" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "候选者有：" -#: object-name.c:796 +#: object-name.c:790 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" @@ -5698,22 +5725,22 @@ msgstr "" "引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n" "false\" 命令关闭本消息通知。" -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "'%.*s' 的日志仅能回到 %s" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "'%.*s' 的日志仅有 %d 个条目" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5722,12 +5749,12 @@ msgstr "" "路径 '%s' 存在，而 '%s' 不存在\n" "提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "路径 '%s' 不在 '%.*s' 中" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -5736,7 +5763,7 @@ msgstr "" "路径 '%s' 在索引中，但不在暂存区 %d 中\n" "提示：您的意思是 ':%d:%s'？" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -5745,21 +5772,21 @@ msgstr "" "路径 '%s' 在索引中，但 '%s' 不在\n" "提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "路径 '%s' 在磁盘上，但不在索引里" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "不能在工作区之外使用相对路径语法" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "无效的对象名 '%.*s'。" @@ -5774,27 +5801,27 @@ msgstr "无效的对象类型 \"%s\"" msgid "object %s is a %s, not a %s" msgstr "对象 %s 是一个 %s，不是一个 %s" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "对象 %s 有未知的类型 id %d" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, c-format msgid "unable to get size of %s" msgstr "无法得到 %s 的大小" -#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "无法得到 %s 的磁盘使用量" @@ -5847,12 +5874,17 @@ msgstr "无法写入 '%s' 承诺者文件" msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: packfile.c:1937 +#: packfile.c:655 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "包文件 %s 不能被映射%s" + +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: packfile.c:1941 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" @@ -6054,8 +6086,8 @@ msgid "unable to write delim packet" msgstr "无法写 delim 包" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "无法写入无状态分隔符数据包" +msgid "unable to write response end packet" +msgstr "无法写入响应结束数据包" #: pkt-line.c:113 msgid "flush packet write failed" @@ -6114,19 +6146,19 @@ msgstr "无法创建线程 lstat：%s" msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote：无法派生 fetch 子进程" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "promisor-remote：无法向 fetch 子进程写入" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 远程名称不能以 '/' 开始：%s" @@ -6147,7 +6179,7 @@ msgstr "不能启动 `log`" msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -6164,63 +6196,63 @@ msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'" msgid "could not parse git header '%.*s'" msgstr "无法解析 git 头 '%.*s'" -#: range-diff.c:306 +#: range-diff.c:307 msgid "failed to generate diff" msgstr "生成 diff 失败" -#: range-diff.c:558 +#: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "--left-only 和 --right-only 互斥" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" -#: read-cache.c:708 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）" -#: read-cache.c:724 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "不能在对象数据库中创建空的数据对象" -#: read-cache.c:746 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能添加常规文件、符号链接或 git 目录" -#: read-cache.c:751 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 没有检出一个提交" -#: read-cache.c:803 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "无法索引文件 '%s'" -#: read-cache.c:822 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "无法在索引中添加 '%s'" -#: read-cache.c:833 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" -#: read-cache.c:1356 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" -#: read-cache.c:1571 +#: read-cache.c:1573 msgid "Refresh index" msgstr "刷新索引" -#: read-cache.c:1700 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6229,7 +6261,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1710 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6238,144 +6270,144 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1766 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "坏的签名 0x%08x" -#: read-cache.c:1769 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" msgstr "坏的索引版本 %d" -#: read-cache.c:1778 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "坏的索引文件 sha1 签名" -#: read-cache.c:1812 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支持的 %.4s 扩展" # -#: read-cache.c:1814 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 扩展" -#: read-cache.c:1851 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引条目格式 0x%08x" -#: read-cache.c:1867 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" -#: read-cache.c:1924 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "索引中有未排序的暂存条目" -#: read-cache.c:1927 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合并文件 '%s' 有多个暂存条目" -#: read-cache.c:1930 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暂存条目" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:332 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "索引文件损坏" -#: read-cache.c:2180 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程：%s" -#: read-cache.c:2193 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程：%s" -#: read-cache.c:2226 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "%s：打开索引文件失败" -#: read-cache.c:2230 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能对打开的索引执行 stat 操作" -#: read-cache.c:2234 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引文件比预期的小" -#: read-cache.c:2238 +#: read-cache.c:2243 #, c-format -msgid "%s: unable to map index file" -msgstr "%s：无法对索引文件执行 map 操作" +msgid "%s: unable to map index file%s" +msgstr "%s：无法映射索引文件%s" -#: read-cache.c:2280 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程：%s" -#: read-cache.c:2307 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程：%s" -#: read-cache.c:2345 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" msgstr "无法刷新共享索引 '%s'" -#: read-cache.c:2392 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: read-cache.c:3138 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "无法转换为稀疏索引" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: read-cache.c:3222 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" -#: read-cache.c:3234 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" -#: read-cache.c:3263 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修复 '%s' 的权限位" -#: read-cache.c:3412 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暂存区 #0" @@ -6488,8 +6520,8 @@ msgstr "" "然而，如果您删除全部内容，变基操作将会终止。\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "不能写入 '%s'" @@ -6532,7 +6564,7 @@ msgstr "" msgid "could not read '%s'." msgstr "不能读取 '%s'。" -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "丢失" @@ -6551,247 +6583,247 @@ msgstr "落后 %d" msgid "ahead %d, behind %d" msgstr "领先 %d，落后 %d" -#: ref-filter.c:175 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "期望的格式：%%(color:<颜色>)" -#: ref-filter.c:177 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "未能识别的颜色：%%(color:%s)" -#: ref-filter.c:199 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整数值 refname:lstrip=%s" -#: ref-filter.c:203 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整数值 refname:rstrip=%s" -#: ref-filter.c:205 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "未能识别的 %%(%s) 参数：%s" -#: ref-filter.c:260 +#: ref-filter.c:315 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不带参数" -#: ref-filter.c:282 +#: ref-filter.c:339 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "未能识别的 %%(objectsize) 参数：%s" -#: ref-filter.c:290 +#: ref-filter.c:347 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) 不带参数" -#: ref-filter.c:302 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不带参数" -#: ref-filter.c:315 +#: ref-filter.c:372 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "未能识别的 %%(subject) 参数：%s" -#: ref-filter.c:334 +#: ref-filter.c:391 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "预期 %%(trailers:key=<值>)" -#: ref-filter.c:336 +#: ref-filter.c:393 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) 参数：%s" -#: ref-filter.c:367 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一个正数 contents:lines=%s" -#: ref-filter.c:369 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "未能识别的 %%(contents) 参数：%s" -#: ref-filter.c:384 +#: ref-filter.c:441 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数" -#: ref-filter.c:388 +#: ref-filter.c:445 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'" -#: ref-filter.c:402 +#: ref-filter.c:459 #, c-format msgid "unrecognized email option: %s" msgstr "未识别的邮件选项：%s" -#: ref-filter.c:432 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "期望的格式：%%(align:<宽度>,<位置>)" -#: ref-filter.c:444 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "未能识别的位置：%s" -#: ref-filter.c:451 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "未能识别的宽度：%s" -#: ref-filter.c:460 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "未能识别的 %%(align) 参数：%s" -#: ref-filter.c:468 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一个正数的宽度" -#: ref-filter.c:486 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "未能识别的 %%(if) 参数：%s" -#: ref-filter.c:588 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "格式错误的字段名：%.*s" -#: ref-filter.c:615 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "未知的字段名：%.*s" -#: ref-filter.c:619 +#: ref-filter.c:676 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据" -#: ref-filter.c:743 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素" -#: ref-filter.c:807 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素" -#: ref-filter.c:809 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" -#: ref-filter.c:811 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之后" -#: ref-filter.c:839 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素" -#: ref-filter.c:841 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素" -#: ref-filter.c:843 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" -#: ref-filter.c:858 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素却没有它的对应元素" -#: ref-filter.c:915 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "错误的格式化字符串 %s" -#: ref-filter.c:1556 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" -#: ref-filter.c:1559 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "（非分支，正变基分离头指针 %s）" -#: ref-filter.c:1562 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（非分支，二分查找开始于 %s）" -#: ref-filter.c:1566 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "（头指针在 %s 分离）" -#: ref-filter.c:1569 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "（头指针自 %s 分离）" -#: ref-filter.c:1572 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "（非分支）" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" -#: ref-filter.c:1614 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" -#: ref-filter.c:1997 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "格式错误的对象 '%s'" -#: ref-filter.c:2086 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" -#: ref-filter.c:2431 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2525 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "格式错误的对象名 %s" -#: ref-filter.c:2530 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "选项 `%s' 必须指向一个提交" @@ -7241,8 +7273,8 @@ msgstr "不能删除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "为 '%s' 记录 preimage" -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" @@ -7280,38 +7312,38 @@ msgstr "不能打开 rr-cache 目录" msgid "could not determine HEAD revision" msgstr "不能确定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树。" -#: revision.c:2343 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "不再支持 --unpacked=<packfile>" -#: revision.c:2683 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2686 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2892 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:1275 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "不能创建 async 线程：%s" -#: run-command.c:1345 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7346,25 +7378,25 @@ msgstr "send-pack：无法派生 fetch 子进程" msgid "push negotiation failed; proceeding anyway with push" msgstr "推送协商失败，但还是继续推送" -#: send-pack.c:520 +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "接收端不支持这个仓库的哈希算法" -#: send-pack.c:529 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" -msgstr "接收端不支持签名推送" +msgstr "接收端不支持签名推送（--signed）" -#: send-pack.c:531 +#: send-pack.c:537 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" -msgstr "未发送推送证书，因为接收端不支持签名推送" +msgstr "未发送推送证书，因为接收端不支持签名推送（--signed）" -#: send-pack.c:543 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" -msgstr "接收端不支持原子推送" +msgstr "接收端不支持原子推送（--atomic）" -#: send-pack.c:548 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "接收端不支持推送选项" @@ -7423,7 +7455,7 @@ msgid "could not lock '%s'" msgstr "不能锁定 '%s'" #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "不能写入 '%s'" @@ -7434,7 +7466,7 @@ msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3554 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" @@ -7484,8 +7516,8 @@ msgstr "在 '%.*s' 中没有 key" msgid "unable to dequote value of '%s'" msgstr "无法为 '%s' 的值去引号" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" @@ -7629,7 +7661,7 @@ msgstr "不能解析 HEAD" msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交！" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" @@ -7637,7 +7669,7 @@ msgstr "不能解析 HEAD 提交" msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" @@ -7655,12 +7687,13 @@ msgstr "无效的作者身份 '%s'" msgid "corrupt author: missing date information" msgstr "损坏的作者：缺失日期信息" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "写提交对象失败" -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "不能更新 %s" @@ -7712,7 +7745,7 @@ msgstr "不能写 '%s'" msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "不能读取 HEAD" @@ -7853,7 +7886,7 @@ msgstr "不可用的 squash-onto" msgid "malformed options sheet: '%s'" msgstr "格式错误的选项清单：'%s'" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "提供了空的提交集" @@ -7884,7 +7917,7 @@ msgstr "不能创建序列目录 '%s'" msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" @@ -7896,7 +7929,7 @@ msgstr "不能解析 HEAD" msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:3159 builtin/grep.c:759 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" @@ -7944,7 +7977,7 @@ msgstr "" "您已经提交了么？\n" "试试 \"git %s --continue\"" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "不能读取 HEAD" @@ -8028,90 +8061,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3571 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的标签名称：'%.*s'" -#: sequencer.c:3625 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "写伪根提交" -#: sequencer.c:3630 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "写入 squash-onto" -#: sequencer.c:3714 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:3747 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" -#: sequencer.c:3769 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "无法解析 '%.*s'" -#: sequencer.c:3778 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "无可用合并：'%.*s'" -#: sequencer.c:3790 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章鱼合并不能在一个新的根提交上执行" -#: sequencer.c:3806 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "不能获取 '%s' 的提交说明" -#: sequencer.c:3989 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能尝试合并 '%.*s'" -#: sequencer.c:4005 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "合并：无法写入新索引文件" -#: sequencer.c:4079 +#: sequencer.c:4099 msgid "Cannot autostash" -msgstr "无法 autostash" +msgstr "无法自动贮藏" -#: sequencer.c:4082 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" -msgstr "意外的 stash 响应：'%s'" +msgstr "意外的贮藏响应：'%s'" -#: sequencer.c:4088 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "不能为 '%s' 创建目录" -#: sequencer.c:4091 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" -msgstr "创建了 autostash：%s\n" +msgstr "创建了自动贮藏：%s\n" -#: sequencer.c:4095 +#: sequencer.c:4115 msgid "could not reset --hard" -msgstr "无法 reset --hard" +msgstr "无法硬性重置（reset --hard）" -#: sequencer.c:4120 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" -msgstr "已应用 autostash。\n" +msgstr "已应用自动贮藏。\n" -#: sequencer.c:4132 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:4135 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -8122,29 +8155,29 @@ msgstr "" "您的修改在贮藏区中很安全。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:4140 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." msgstr "应用自动贮藏导致冲突。" -#: sequencer.c:4141 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。" -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "不能分离头指针" -#: sequencer.c:4249 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:4251 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:4259 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -8164,58 +8197,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4305 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在变基（%d/%d）%s" -#: sequencer.c:4351 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4422 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:4481 +#: sequencer.c:4480 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:4486 +#: sequencer.c:4485 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:4500 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:4560 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功变基并更新 %s。\n" -#: sequencer.c:4612 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: sequencer.c:4621 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:4623 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" -#: sequencer.c:4625 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" -#: sequencer.c:4628 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8224,50 +8257,50 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "不能写入文件：'%s'" -#: sequencer.c:4719 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:4726 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:4846 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:4850 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:4885 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: sequencer.c:5362 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "make_script：有未能处理的选项" -#: sequencer.c:5365 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "make_script：准备版本时错误" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "无事可做" -#: sequencer.c:5651 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" msgstr "无法跳过不必要的拣选" -#: sequencer.c:5751 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" @@ -8316,92 +8349,96 @@ msgstr "" msgid "unable to set up work tree using invalid config" msgstr "无法使用无效配置来创建工作区" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "发现未知的仓库扩展：" +#: setup.c:666 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "发现未知的仓库扩展：" +msgstr[1] "发现未知的仓库扩展：" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "仓库的版本是 0，但是发现仅用于 v1 的扩展：" +#: setup.c:680 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "仓库的版本是 0，但是发现仅用于 v1 的扩展：" +msgstr[1] "仓库的版本是 0，但是发现仅用于 v1 的扩展：" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "打开 '%s' 出错" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "文件太大，无法作为 .git 文件：'%s'" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "读取 %s 出错" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "无效的 gitfile 格式：%s" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中没有路径：%s" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "不是 git 仓库：%s" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "不是 git 仓库：'%s'" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切换目录到 '%s'" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "无法返回当前工作目录" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "获取 '%*s%s%s' 状态（stat）失败" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "不能切换到 '%s'" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是 git 仓库（或者任何父目录）：%s" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8410,7 +8447,7 @@ msgstr "" "不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1370 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8419,27 +8456,27 @@ msgstr "" "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n" "文件属主必须始终拥有读写权限。" -#: setup.c:1417 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "不能打开或者复制 /dev/null" -#: setup.c:1432 +#: setup.c:1445 msgid "fork failed" msgstr "fork 失败" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "setsid 失败" -#: sparse-index.c:151 +#: sparse-index.c:162 msgid "attempting to use sparse-index without cone mode" msgstr "尝试在没有 cone 模式下使用稀疏索引" -#: sparse-index.c:156 +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" msgstr "不能更新缓存树，保持完整" -#: sparse-index.c:239 +#: sparse-index.c:263 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "索引条目是一个目录，但不是稀疏的 (%08x)" @@ -8496,7 +8533,7 @@ msgid_plural "%u bytes/s" msgstr[0] "%u 字节/秒" msgstr[1] "%u 字节/秒" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" @@ -8564,55 +8601,55 @@ msgstr "路径规格 '%s' 在子模组 '%.*s' 中" msgid "bad --ignore-submodules argument: %s" msgstr "坏的 --ignore-submodules 参数：%s" -#: submodule.c:818 +#: submodule.c:805 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。" -#: submodule.c:921 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交" -#: submodule.c:1006 +#: submodule.c:993 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'" -#: submodule.c:1129 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "处理子模组 '%s' 失败" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: submodule.c:1169 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "正在推送子模组 '%s'\n" -#: submodule.c:1172 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "无法推送子模组 '%s'\n" -#: submodule.c:1464 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "正在获取子模组 %s%s\n" -#: submodule.c:1498 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" msgstr "无法访问子模组 '%s'\n" -#: submodule.c:1653 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8621,77 +8658,77 @@ msgstr "" "获取子模组时的错误：\n" "%s" -#: submodule.c:1678 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "无法将 '%s' 识别为 git 仓库" -#: submodule.c:1695 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'" -#: submodule.c:1736 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败" -#: submodule.c:1811 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中启动 'git status'" -#: submodule.c:1824 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中执行 'git status'" -#: submodule.c:1839 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" -#: submodule.c:1866 submodule.c:2176 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" msgstr "无法递归进子模组路径 '%s'" -#: submodule.c:1887 +#: submodule.c:1874 msgid "could not reset submodule index" msgstr "无法重置子模组索引" -#: submodule.c:1929 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模组 '%s' 中有脏索引" -#: submodule.c:1981 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模组 '%s' 无法被更新。" -#: submodule.c:2049 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中" -#: submodule.c:2070 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查询子模组 '%s' 的名称" -#: submodule.c:2086 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "禁止移动 '%s' 到现存 git 目录中" -#: submodule.c:2093 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8702,11 +8739,11 @@ msgstr "" "'%s' 迁移至\n" "'%s'\n" -#: submodule.c:2221 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "无法在 .. 中启动 ls-files" -#: submodule.c:2261 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" @@ -8743,7 +8780,7 @@ msgstr "尾注 '%.*s' 的键为空" msgid "could not read input file '%s'" msgstr "不能读取输入文件 '%s'" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "不能自标准输入读取" @@ -8831,7 +8868,7 @@ msgstr "协议不支持设置远程服务路径" msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "协议不支持该操作" @@ -8840,7 +8877,7 @@ msgstr "协议不支持该操作" msgid "can't connect to subservice %s" msgstr "不能连接到子服务 %s" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:400 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only 需要协议 v2" @@ -8973,53 +9010,53 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" msgid "could not read bundle '%s'" msgstr "无法读取归档包 '%s'" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" msgstr "传输：无效的深度选项 '%s'" -#: transport.c:272 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" -#: transport.c:273 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "服务端选项需要版本 2 协议或更高" -#: transport.c:400 +#: transport.c:403 msgid "server does not support wait-for-done" msgstr "服务器不支持 wait-for-done" -#: transport.c:751 +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 配置" -#: transport.c:826 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "协议 v2 的支持尚未实现" -#: transport.c:960 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "配置 '%s' 的取值未知：%s" -#: transport.c:1026 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "传输 '%s' 不允许" -#: transport.c:1079 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "不再支持 git-over-rsync" -#: transport.c:1181 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" -#: transport.c:1185 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -9046,11 +9083,11 @@ msgstr "" "以推送至远程。\n" "\n" -#: transport.c:1193 +#: transport.c:1199 msgid "Aborting." msgstr "正在终止。" -#: transport.c:1340 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模组" @@ -9311,11 +9348,11 @@ msgstr "" "以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n" "并且碰撞组中只有一个文件存在工作区中：\n" -#: unpack-trees.c:1519 +#: unpack-trees.c:1618 msgid "Updating index flags" msgstr "正在更新索引标志" -#: unpack-trees.c:2608 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "工作树和未跟踪提交具有重复条目：%s" @@ -9357,99 +9394,99 @@ msgstr "无效的 '..' 路径片段" msgid "Fetching objects" msgstr "正在获取对象" -#: worktree.c:238 builtin/am.c:2151 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "读取 '%s' 失败" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' 不是仓库目录" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' 不包含工作区的绝对路径" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一个 .git 文件，错误码 %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" -#: worktree.c:608 +#: worktree.c:603 msgid "not a directory" msgstr "不是一个目录" -#: worktree.c:617 +#: worktree.c:612 msgid ".git is not a file" msgstr ".git 不是一个文件" -#: worktree.c:619 +#: worktree.c:614 msgid ".git file broken" msgstr ".git 文件损坏" -#: worktree.c:621 +#: worktree.c:616 msgid ".git file incorrect" msgstr ".git 文件不正确" -#: worktree.c:727 +#: worktree.c:722 msgid "not a valid path" msgstr "不是一个有效的路径" -#: worktree.c:733 +#: worktree.c:728 msgid "unable to locate repository; .git is not a file" msgstr "无法定位仓库，.git 不是一个文件" -#: worktree.c:737 +#: worktree.c:732 msgid "unable to locate repository; .git file does not reference a repository" msgstr "无法定位仓库，.git 文件没有指向一个仓库" -#: worktree.c:741 +#: worktree.c:736 msgid "unable to locate repository; .git file broken" msgstr "无法定位仓库，.git 文件损坏" -#: worktree.c:747 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "gitdir 不可读" -#: worktree.c:751 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "gitdir 不正确" -#: worktree.c:776 +#: worktree.c:771 msgid "not a valid directory" msgstr "不是一个有效的目录" -#: worktree.c:782 +#: worktree.c:777 msgid "gitdir file does not exist" msgstr "gitdir 文件不存在" -#: worktree.c:787 worktree.c:796 +#: worktree.c:782 worktree.c:791 #, c-format msgid "unable to read gitdir file (%s)" msgstr "无法读取 gitdir 文件（%s）" -#: worktree.c:806 +#: worktree.c:801 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）" -#: worktree.c:814 +#: worktree.c:809 msgid "invalid gitdir file" msgstr "无效的 gitdir 文件" -#: worktree.c:822 +#: worktree.c:817 msgid "gitdir file points to non-existent location" msgstr "gitdir 文件指向一个不存在的位置" @@ -9502,11 +9539,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:211 wt-status.c:1075 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" @@ -9612,22 +9649,22 @@ msgstr "修改的内容, " msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:908 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的贮藏区当前有 %d 条记录" msgstr[1] "您的贮藏区当前有 %d 条记录" -#: wt-status.c:939 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:941 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:1023 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9635,7 +9672,7 @@ msgstr "" "不要改动或删除上面的一行。\n" "其下所有内容都将被忽略。" -#: wt-status.c:1115 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9646,77 +9683,77 @@ msgstr "" "花了 %.2f 秒才计算出分支的领先/落后范围。\n" "为避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1145 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:1148 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 -#: wt-status.c:1150 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终止合并）" -#: wt-status.c:1154 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:1157 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:1166 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:1169 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:1173 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1175 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1177 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1310 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" -#: wt-status.c:1312 +#: wt-status.c:1362 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1315 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最后一条命令已完成（%d 条命令被执行）：" msgstr[1] "最后的命令已完成（%d 条命令被执行）：" -#: wt-status.c:1326 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " （更多参见文件 %s）" -#: wt-status.c:1331 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1334 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -9724,202 +9761,206 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" # 译者：注意保持前导空格 -#: wt-status.c:1342 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" -#: wt-status.c:1354 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1359 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1372 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1374 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1376 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1383 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1387 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1392 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1395 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1399 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1404 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1407 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1409 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1420 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "拣选操作正在进行中。" -#: wt-status.c:1423 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1430 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1433 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （执行 \"git cherry-pick --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1436 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1438 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1440 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1450 +#: wt-status.c:1500 msgid "Revert currently in progress." msgstr "还原操作正在行中。" -#: wt-status.c:1453 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1459 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1462 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " （执行 \"git revert --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1465 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1467 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " （使用 \"git revert --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1469 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1479 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1483 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1486 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1497 +#: wt-status.c:1547 +msgid "You are in a sparse checkout." +msgstr "您处于一个稀疏检出中。" + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." -msgstr "您处于稀疏签出状态，包含 %d%% 的跟踪文件" +msgstr "您处于稀疏检出状态，包含 %d%% 的跟踪文件" -#: wt-status.c:1736 +#: wt-status.c:1794 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1743 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1745 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1750 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1752 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1755 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1772 +#: wt-status.c:1830 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1773 +#: wt-status.c:1831 msgid "No commits yet" msgstr "尚无提交" -#: wt-status.c:1787 +#: wt-status.c:1845 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1789 +#: wt-status.c:1847 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1793 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9929,112 +9970,112 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1799 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1801 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1807 +#: wt-status.c:1865 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1812 +#: wt-status.c:1870 #, 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:1816 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1820 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1824 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" -#: wt-status.c:1828 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1832 wt-status.c:1838 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" -#: wt-status.c:1835 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" -#: wt-status.c:1840 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1945 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "尚无提交在 " -#: wt-status.c:1949 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1980 +#: wt-status.c:2038 msgid "different" msgstr "不同" # 译者：注意保持句尾空格 -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "落后 " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暂存的变更。" -#: wt-status.c:2517 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的变更。" -#: wt-status.c:2519 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:182 msgid "could not send IPC command" msgstr "无法发送 IPC 命令" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:189 msgid "could not read IPC response" msgstr "无法读取 IPC 响应" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: compat/simple-ipc/ipc-unix-socket.c:866 #, c-format msgid "could not start accept_thread '%s'" msgstr "无法启动 accept_thread '%s'" -#: compat/simple-ipc/ipc-unix-socket.c:874 +#: compat/simple-ipc/ipc-unix-socket.c:878 #, c-format msgid "could not start worker[0] for '%s'" msgstr "无法启动 '%s' 的 worker[0]" @@ -10071,7 +10112,7 @@ msgstr "删除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "不能读取索引" @@ -10106,8 +10147,8 @@ msgstr "不能应用 '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 #: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "演习" @@ -10116,7 +10157,7 @@ msgstr "演习" msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "交互式挑选数据块" @@ -10244,13 +10285,13 @@ msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file 与路径表达式参数不兼容" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul 需要 --pathspec-from-file" @@ -10269,105 +10310,105 @@ msgstr "" "运行下面的命令来关闭本消息\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:364 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c:454 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:496 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c:534 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:560 +#: builtin/am.c:561 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:748 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:813 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:861 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:873 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:966 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "创建目录 '%s' 失败" -#: builtin/am.c:976 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "拆分补丁失败。" -#: builtin/am.c:1125 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1222 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。" -#: builtin/am.c:1250 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "补丁为空。" -#: builtin/am.c:1315 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺失作者行" -#: builtin/am.c:1318 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" msgstr "无效的身份标识：%.*s" -#: builtin/am.c:1537 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1539 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1558 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10375,24 +10416,24 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1564 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1590 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1622 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1696 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "提交内容为：" @@ -10400,39 +10441,39 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: builtin/am.c:1752 builtin/commit.c:408 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1756 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1813 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1819 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1823 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" -#: builtin/am.c:1867 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10442,7 +10483,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1874 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10453,106 +10494,106 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:2033 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "清空索引失败" -#: builtin/am.c:2077 +#: builtin/am.c:2078 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c:2184 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2226 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "无效的 --show-current-patch 值：%s" -#: builtin/am.c:2230 +#: builtin/am.c:2231 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容" -#: builtin/am.c:2261 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2262 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2268 +#: builtin/am.c:2269 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2270 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2272 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:948 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交说明中添加 Signed-off-by 尾注" -#: builtin/am.c:2278 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2282 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2284 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2289 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2294 +#: builtin/am.c:2295 msgid "pass it through git-mailinfo" msgstr "传递给 git-mailinfo" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 -#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 #: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 #: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 @@ -10561,67 +10602,67 @@ msgstr "传递给 git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 #: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2321 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2327 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2329 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2332 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2335 +#: builtin/am.c:2336 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2338 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "恢复原始分支并终止打补丁操作" -#: builtin/am.c:2341 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" msgstr "终止补丁操作但保持 HEAD 不变" -#: builtin/am.c:2345 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "显示正在应用的补丁" -#: builtin/am.c:2350 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2352 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 #: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 #: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2358 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2376 +#: builtin/am.c:2377 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." @@ -10629,16 +10670,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2383 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "读取索引失败" -#: builtin/am.c:2398 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2422 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10647,11 +10688,11 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2428 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: builtin/am.c:2438 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "交互式模式需要命令行上提供补丁" @@ -10744,62 +10785,62 @@ msgstr "不能以 '%2$s' 模式打开文件 '%1$s'" msgid "could not write to file '%s'" msgstr "不能写入文件 '%s'" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:155 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一个有效的术语" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:159 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用内置命令 '%s' 作为术语" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:169 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改术语 '%s' 的含义" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" msgstr "请使用两个不同的术语" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:195 #, c-format msgid "We are not bisecting.\n" msgstr "我们没有在二分查找。\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:203 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一个有效的提交" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:212 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:256 #, c-format msgid "Bad bisect_write argument: %s" msgstr "坏的 bisect_write 参数：%s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:261 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "无法获取版本 '%s' 的对象 ID" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't open the file '%s'" msgstr "无法打开文件 '%s'" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:299 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:326 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10808,7 +10849,7 @@ msgstr "" "您需要给我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:330 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10819,7 +10860,7 @@ msgstr "" "然后需要提供我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:350 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一个 %s 提交的情况下二分查找" @@ -10828,22 +10869,22 @@ msgstr "在只有一个 %s 提交的情况下二分查找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:419 msgid "no terms defined" msgstr "未定义术语" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:432 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10852,52 +10893,52 @@ msgstr "" "命令 'git bisect terms' 的参数 %s 无效。\n" "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 msgid "revision walk setup failed\n" msgstr "版本遍历设置失败\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:521 #, c-format msgid "could not open '%s' for appending" msgstr "无法打开 '%s' 进行追加" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 msgid "'' is not a valid term" msgstr "'' 不是一个有效的术语" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:663 #, c-format msgid "unrecognized option: '%s'" msgstr "未识别的选项：'%s'" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:667 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起来不是一个有效的版本" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:698 msgid "bad HEAD - I need a HEAD" msgstr "坏的 HEAD - 我需要一个 HEAD" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:713 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" msgstr "不会在做了 cg-seek 的树上做二分查找" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:737 msgid "bad HEAD - strange symbolic ref" msgstr "坏的 HEAD - 奇怪的符号引用" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:757 #, c-format msgid "invalid ref: '%s'" msgstr "无效的引用：'%s'" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:815 msgid "You need to start by \"git bisect start\"\n" msgstr "您需要执行 \"git bisect start\" 来开始\n" @@ -10905,104 +10946,104 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " msgstr "您想让我为您这样做么[Y/n]？ " -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" msgstr "请使用至少一个参数调用 `--bisect-state`" -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:857 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' 只能带一个参数。" -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" msgstr "坏的版本输入：%s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:889 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "坏的版本输入（不是提交）：%s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." msgstr "我们没有在二分查找。" -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? 您在说什么?" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" msgstr "不能读取文件 '%s' 来重放" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" msgstr "清除二分查找状态" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "检查坏的或好的术语是否存在" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" msgstr "打印二分查找术语" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "启动二分查找过程" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" msgstr "查询下一个二分查找提交" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "标记引用的状态" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" msgstr "列出到目前为止的二分查找步骤" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" msgstr "从给定文件重放二分查找进程" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" msgstr "跳过要检出的一些提交" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 无日志" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 无需参数或者需要一个提交" -#: builtin/bisect--helper.c:1092 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 个参数" -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 个参数" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next 需要 0 个参数" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log 需要 0 个参数" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" msgstr "未提供日志文件" @@ -11053,10 +11094,10 @@ msgstr "不把根提交作为边界（默认：关闭）" msgid "show work cost statistics" msgstr "显示工作消耗统计" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "强制显示进度报告" @@ -11104,7 +11145,7 @@ msgstr "显示作者的邮箱而不是名字（默认：关闭）" msgid "ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" msgstr "版本" @@ -11158,7 +11199,7 @@ msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数 #: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" +msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -11688,19 +11729,19 @@ msgstr "git bundle list-heads <文件> [<引用名>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <文件> [<引用名>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3747 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "显示进度表" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/bundle.c:74 builtin/pack-objects.c:3754 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" @@ -11712,29 +11753,29 @@ msgstr "指定归档包的格式版本" msgid "Need a repository to create a bundle." msgstr "需要一个仓库来创建归档包。" -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 msgid "do not show bundle details" msgstr "不显示归档包的细节" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "需要一个仓库来解开归档包。" -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:596 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11742,7 +11783,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:597 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11750,71 +11791,71 @@ msgstr "" "git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] " "[--textconv | --filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 msgid "only one batch option may be specified" msgstr "只能指定一个批处理选项" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "对于数据对象，对其内容做文本转换" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "对于数据对象，对其内容做过滤" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "数据对象" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "对于 --textconv/--filters 使用一个特定的路径" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 参数显示所有对象" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" msgstr "不要对 --batch-all-objects 的输出排序" @@ -11842,8 +11883,8 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 -#: builtin/worktree.c:491 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -11901,9 +11942,11 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<选项>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1825 -#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 -#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 +#: builtin/worktree.c:728 msgid "string" msgstr "字符串" @@ -11997,68 +12040,68 @@ msgstr "path '%s'：无法合并" msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新创建了 %d 个合并冲突" msgstr[1] "重新创建了 %d 个合并冲突" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "从 %2$s 更新了 %1$d 个路径" msgstr[1] "从 %2$s 更新了 %1$d 个路径" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "从索引区更新了 %d 个路径" msgstr[1] "从索引区更新了 %d 个路径" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都没有指定" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12067,51 +12110,51 @@ msgstr "" "不能继续，下列文件有暂存的修改：\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12132,7 +12175,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12159,19 +12202,19 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12180,7 +12223,7 @@ msgstr "" "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" "请使用 --（和可选的 --no-guess）来消除歧义" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12199,51 +12242,51 @@ msgstr "" "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" "名称，可以在配置中设置 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 匹配多个（%d 个）远程跟踪分支" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "只期望一个引用" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" -#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一个分支，得到标签 '%s'" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一个分支，得到远程分支 '%s'" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一个分支，得到 '%s'" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一个分支，得到提交 '%s'" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12251,7 +12294,7 @@ msgstr "" "不能在合并时切换分支\n" "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12259,7 +12302,7 @@ msgstr "" "不能在一个 am 会话期间切换分支\n" "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12267,7 +12310,7 @@ msgstr "" "不能在变基时切换分支\n" "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12275,7 +12318,7 @@ msgstr "" "不能在拣选时切换分支\n" "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12283,207 +12326,208 @@ msgstr "" "不能在还原时切换分支\n" "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "您在执行二分查找时切换分支" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不带 <起始点>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "缺少分支或提交参数" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "风格" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c、-%c 和 --orphan 是互斥的" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名，尝试 -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "无法解析 %s" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file 与 --detach 不兼容" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file 与 --patch 不兼容" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "您必须指定一个要恢复的路径" -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜测 'git checkout <无此分支>'（默认）" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "使用叠加模式（默认）" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "创建并切换一个新分支" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "创建/重置并切换一个分支" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜测 'git switch <无此分支>'" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "丢弃本地修改" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" msgstr "要检出哪一个树" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "恢复索引" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "恢复工作区（默认）" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "忽略未合并条目" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "使用叠加模式" @@ -12518,7 +12562,7 @@ msgstr "将忽略仓库 %s\n" msgid "could not lstat %s\n" msgstr "不能对 %s 调用 lstat\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12531,7 +12575,7 @@ msgstr "" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12552,33 +12596,33 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12596,66 +12640,66 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "强制" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 #: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" msgstr "添加 <模式> 到忽略规则" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:929 +#: builtin/clean.c:925 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:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" @@ -12671,7 +12715,7 @@ msgstr "不克隆浅仓库" msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "创建一个纯仓库" @@ -12703,26 +12747,26 @@ msgstr "在克隆时初始化子模组" msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 -#: builtin/submodule--helper.c:2337 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c:123 builtin/submodule--helper.c:1834 -#: builtin/submodule--helper.c:2339 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 #: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "名称" @@ -12739,7 +12783,7 @@ msgstr "检出 <分支> 而不是远程 HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "深度" @@ -12748,7 +12792,7 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "时间" @@ -12766,8 +12810,8 @@ msgstr "版本" msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" -#: builtin/clone.c:137 builtin/submodule--helper.c:1844 -#: builtin/submodule--helper.c:2353 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" @@ -12779,11 +12823,11 @@ msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" @@ -12796,22 +12840,22 @@ msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "server-specific" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "传输选项" #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" @@ -12910,7 +12954,7 @@ msgstr "无法执行 repack 来清理" msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." msgstr "太多参数。" @@ -12932,7 +12976,7 @@ msgstr "--bare 和 --separate-git-dir 选项不兼容。" msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" @@ -12953,7 +12997,7 @@ msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" #: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" @@ -13008,12 +13052,16 @@ msgstr "源仓库是浅克隆，忽略 --local" msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "远程传输报告错误" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1348 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -13072,7 +13120,7 @@ msgid "could not find object directory matching %s" msgstr "无法找到和 %s 匹配的对象目录" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "目录" @@ -13166,7 +13214,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重复的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "不是一个有效的对象名 %s" @@ -13194,13 +13242,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交对象 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 #: builtin/tag.c:456 msgid "message" msgstr "说明" -#: builtin/commit-tree.c:115 builtin/commit.c:1614 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "提交说明" @@ -13208,7 +13256,7 @@ msgstr "提交说明" msgid "read commit log message from file" msgstr "从文件中读取提交说明" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交签名" @@ -13353,7 +13401,7 @@ msgid "" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" @@ -13389,7 +13437,42 @@ msgstr "不能读取 MERGE_MSG" msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:900 +#: builtin/commit.c:893 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n" + +#: builtin/commit.c:895 +#, 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 "" +"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" +"说明将会终止提交。\n" + +#: builtin/commit.c:899 +#, 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" +msgstr "" +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" +"也可以删除它们。\n" + +#: builtin/commit.c:903 +#, 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 "" +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" +"也可以删除它们。一个空的提交说明将会终止提交。\n" + +#: builtin/commit.c:915 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13402,7 +13485,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "然后重试。\n" -#: builtin/commit.c:905 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13415,393 +13498,375 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "然后重试。\n" -#: builtin/commit.c:915 -#, 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 "" -"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" -"说明将会终止提交。\n" - -#: builtin/commit.c:923 -#, 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 "" -"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n" -"也可以删除它们。一个空的提交说明将会终止提交。\n" - # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:940 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:948 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:955 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:1018 +#: builtin/commit.c:1025 msgid "unable to pass trailers to --trailers" msgstr "无法将尾注传递给 --trailers" -#: builtin/commit.c:1058 +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1116 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1130 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1219 +#: builtin/commit.c:1226 msgid "You are in the middle of a merge -- cannot reword." msgstr "您正处于一个合并过程中 -- 无法改写说明。" -#: builtin/commit.c:1221 +#: builtin/commit.c:1228 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "您正处于一个拣选过程中 -- 无法改写说明。" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" -msgstr "不能将 --fixup 的 reword 选项和路径 '%s' 组合使用" +msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用" -#: builtin/commit.c:1226 +#: builtin/commit.c:1233 msgid "" "reword option of --fixup is mutually exclusive with --patch/--interactive/--" "all/--include/--only" -msgstr "--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥" +msgstr "" +"--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥" -#: builtin/commit.c:1245 +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1259 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正处于一个变基过程中 -- 无法修补提交。" -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" -#: builtin/commit.c:1285 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1303 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知选项：--fixup=%s:%s" -#: builtin/commit.c:1345 +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1480 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "显示贮藏区信息" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" -#: builtin/commit.c:1484 +#: builtin/commit.c:1491 msgid "version" msgstr "版本" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 -#: builtin/worktree.c:681 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 #: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "模式" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1497 +#: builtin/commit.c:1504 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "何时" -#: builtin/commit.c:1500 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1502 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1503 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "不检测重命名" -#: builtin/commit.c:1505 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" msgstr "检测重命名，可以设置索引相似度" -#: builtin/commit.c:1525 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" -#: builtin/commit.c:1607 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1608 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1610 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "author" msgstr "作者" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "日期" -#: builtin/commit.c:1613 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 #: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "提交" -#: builtin/commit.c:1615 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1616 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]提交" -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明" -#: builtin/commit.c:1622 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交" -#: builtin/commit.c:1623 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "尾注" -#: builtin/commit.c:1624 +#: builtin/commit.c:1634 msgid "add custom trailer(s)" msgstr "添加自定义尾注" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "添加 Signed-off-by 尾注" -#: builtin/commit.c:1626 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1627 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "强制编辑提交" -#: builtin/commit.c:1629 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1634 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1635 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1636 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1637 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1638 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1639 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1640 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1641 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1655 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1662 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1664 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1737 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1744 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1765 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1790 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1801 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "因提交说明的正文为空而终止提交。\n" -#: builtin/commit.c:1824 +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14429,65 +14494,65 @@ msgstr "临时文件存在于 '%s'。" msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:702 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" -#: builtin/difftool.c:704 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "tool" msgstr "工具" -#: builtin/difftool.c:711 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出" -#: builtin/difftool.c:719 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" -#: builtin/difftool.c:720 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "传递给 `diff`" -#: builtin/difftool.c:735 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作区或者 --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff 和 --no-index 不兼容" -#: builtin/difftool.c:745 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui、--tool 和 --extcmd 互斥" -#: builtin/difftool.c:753 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "没有为 --tool=<工具> 参数提供 <工具>" -#: builtin/difftool.c:760 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" @@ -14510,14 +14575,14 @@ msgstr "安静模式，只使用 git_env_*() 的值作为退出码" #: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值，不是 `%s`" +msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值，不是 `%s`" #: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" "%s`" -msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型，不是 `%s`" +msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型，不是 `%s`" #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" @@ -14575,7 +14640,7 @@ msgstr "使用 done 功能来终止流" msgid "skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "引用规格" @@ -14888,8 +14953,8 @@ msgstr "%s 未发送所有必需的对象\n" #: builtin/fetch.c:1129 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "拒绝 %s 因为浅克隆不允许被更新" +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "拒绝 %s 因为浅克隆的根不允许被更新" #: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format @@ -14989,58 +15054,62 @@ msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定， msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1995 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:2002 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" -#: builtin/fetch.c:2055 +#: builtin/fetch.c:2058 msgid "must supply remote when using --negotiate-only" msgstr "在使用 --negotiate-only 时必须提供远程仓库" -#: builtin/fetch.c:2060 +#: builtin/fetch.c:2063 msgid "Protocol does not support --negotiate-only, exiting." msgstr "协议不支持 --negotiate-only，退出。" -#: builtin/fetch.c:2079 +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic 仅在从一个远程仓库获取的时候可用" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 仅在从一个远程仓库获取的时候可用" @@ -15133,19 +15202,19 @@ msgstr "只打印不包含该提交的引用" msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<配置> <命令参数>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "配置" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "存储着仓库路径列表的配置项键名" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "缺少 --config=<配置>" -#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "未知" @@ -15161,16 +15230,16 @@ msgstr "%s %s 错误：%s" msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "来自 %7s %s 的损坏的链接" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "链接中错误的对象类型" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -15179,211 +15248,211 @@ msgstr "" "损坏的链接来自于 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "缺失 %s %s" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "不可达 %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "悬空 %s %s" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "不能创建 lost-found" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "正在检查 %s" -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在检查连通性（%d 个对象）" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "正在检查 %s %s" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "损坏的链接" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "标记 %s %s (%s) 于 %s" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：对象损坏或丢失" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：无效的引用日志条目 %s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "正在检查引用日志 %s->%s" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：无效的 sha1 指针 %s" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "%s：不是一个提交" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "注意：无默认引用" -#: builtin/fsck.c:605 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：对象损坏或丢失：%s" -#: builtin/fsck.c:618 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析对象：%s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "坏的 sha1 文件：%s" -#: builtin/fsck.c:653 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "正在检查对象目录" -#: builtin/fsck.c:656 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "正在检查对象目录" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "正在检查 %s 链接" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/fsck.c:683 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的东西（%s）" -#: builtin/fsck.c:689 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分离头指针的指向不存在" -#: builtin/fsck.c:693 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一个尚未诞生的分支（%s）" -#: builtin/fsck.c:705 +#: builtin/fsck.c:706 msgid "Checking cache tree" msgstr "正在检查缓存树" -#: builtin/fsck.c:710 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中无效的 sha1 指针" -#: builtin/fsck.c:719 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" -#: builtin/fsck.c:750 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:756 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:757 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "显示悬空的对象" -#: builtin/fsck.c:758 +#: builtin/fsck.c:759 msgid "report tags" msgstr "报告标签" -#: builtin/fsck.c:759 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:760 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:761 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:762 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:763 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "仅检查连通性" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:766 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found 中" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:768 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "正在检查对象" -#: builtin/fsck.c:855 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "%s：对象缺失" -#: builtin/fsck.c:866 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数：期望 sha1，得到 '%s'" @@ -15661,8 +15730,8 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 -#: builtin/pack-objects.c:2969 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" @@ -15677,242 +15746,242 @@ msgstr "无法读取树（%s）" msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:739 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:838 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:840 +#: builtin/grep.c:839 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" -#: builtin/grep.c:842 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:844 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:846 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" -#: builtin/grep.c:849 +#: builtin/grep.c:848 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:851 +#: builtin/grep.c:850 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:853 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:855 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:857 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:860 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:862 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" -#: builtin/grep.c:864 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:868 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:871 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:874 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:877 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:880 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:881 +#: builtin/grep.c:880 msgid "show column number of first match" msgstr "显示第一个匹配的列号" -#: builtin/grep.c:882 +#: builtin/grep.c:881 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:883 +#: builtin/grep.c:882 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:885 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:887 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:892 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "show only matching parts of a line" msgstr "只显示行中的匹配的部分" -#: builtin/grep.c:899 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:900 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:902 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:904 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:907 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:910 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:912 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:914 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" -#: builtin/grep.c:915 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:918 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:920 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:923 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:925 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:927 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:939 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:941 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" msgstr "分页" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 msgid "no pattern given" msgstr "未提供匹配模式" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同时使用" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支持和 --recurse-submodules 共用" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "无效的选项组合，忽略 --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" msgstr "没有线程支持，忽略 --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" -#: builtin/grep.c:1161 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" msgstr "--untracked 不能与 --cached 同时使用" -#: builtin/grep.c:1167 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用于已跟踪内容" -#: builtin/grep.c:1175 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" msgstr "同时给出了 --cached 和树对象" @@ -16035,30 +16104,30 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:520 builtin/help.c:531 git.c:348 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" -#: builtin/help.c:534 git.c:380 +#: builtin/help.c:531 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "坏的 alias.%s 字符串：%s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" @@ -16096,7 +16165,7 @@ msgstr "输入上的读错误" msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:325 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" @@ -16123,238 +16192,238 @@ msgstr "包签名不匹配" msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:587 +#: builtin/index-pack.c:585 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节" msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节" -#: builtin/index-pack.c:613 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 -#: builtin/index-pack.c:827 builtin/index-pack.c:836 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:761 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "不能读取现存对象信息 %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "应用 delta 失败" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "不能对包文件调用 fstat" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1289 +#: builtin/index-pack.c:1287 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 个本地对象" msgstr[1] "完成 %d 个本地对象" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1303 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1329 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "包文件名 '%s' 没有以 '.%s' 结尾" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1526 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1701 +#: builtin/index-pack.c:1699 #, 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:1708 +#: builtin/index-pack.c:1706 #, 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:1750 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 -#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的哈希算法 '%s'" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin 需要 git 仓库" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" @@ -16398,56 +16467,56 @@ msgstr "没有在 %s 中找到模版" msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版：%s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "无效的初始分支名：'%s'" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "尝试用不同的哈希算法重新初始化仓库" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init：已忽略 --initial-branch=%s" -#: builtin/init-db.c:462 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:463 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" +msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:467 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:517 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16455,53 +16524,53 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "覆盖初始分支名称" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "指定要使用的哈希算法" -#: builtin/init-db.c:559 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir 和 --bare 是互斥的" -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:626 +#: builtin/init-db.c:627 #, 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:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir 不能用于纯仓库" @@ -16608,85 +16677,85 @@ msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<范围>:<文件> 不能和路径表达式共用" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:568 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:698 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:843 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：从描述生成附函的模式无效" -#: builtin/log.c:850 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:979 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:996 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "只需要一个范围" -#: builtin/log.c:1006 +#: builtin/log.c:1009 msgid "not a range" msgstr "不是一个范围" -#: builtin/log.c:1170 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" -#: builtin/log.c:1176 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "无法创建附函文件" -#: builtin/log.c:1263 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1290 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1348 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "无法将 '%s' 解析为一个有效引用" -#: builtin/log.c:1519 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "不能找到准确的合并基线" -#: builtin/log.c:1529 +#: builtin/log.c:1532 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16696,288 +16765,288 @@ msgstr "" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" "参数 --base=<基线提交> 手动指定一个基线提交" -#: builtin/log.c:1552 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c:1569 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c:1579 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c:1637 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c:1700 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" msgstr "无法推断当前系列的 range-diff 起始" -#: builtin/log.c:1702 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "使用 '%s' 作为当前系列的 range-diff 源" -#: builtin/log.c:1746 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1755 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1757 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1758 +#: builtin/log.c:1761 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1759 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1761 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1762 +#: builtin/log.c:1765 msgid "reroll-count" msgstr "重制-计数" -#: builtin/log.c:1763 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1765 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "输出文件名的最大长度" -#: builtin/log.c:1767 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "从分支描述获取附函的模式" -#: builtin/log.c:1771 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "基于一个分支描述生成部分附函" -#: builtin/log.c:1773 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1776 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1779 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1782 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1784 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1786 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1788 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1790 +#: builtin/log.c:1793 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1791 +#: builtin/log.c:1794 msgid "header" msgstr "header" -#: builtin/log.c:1792 +#: builtin/log.c:1795 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1793 +#: builtin/log.c:1796 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1794 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1795 +#: builtin/log.c:1798 msgid "ident" msgstr "标识" -#: builtin/log.c:1796 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1798 +#: builtin/log.c:1801 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1799 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "边界" -#: builtin/log.c:1801 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1804 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1808 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1810 +#: builtin/log.c:1813 msgid "signature" msgstr "签名" -#: builtin/log.c:1811 +#: builtin/log.c:1814 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1812 +#: builtin/log.c:1815 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c:1813 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c:1816 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1817 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1819 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" -#: builtin/log.c:1821 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" -msgstr "在附函或单个补丁中显示和 <rev> 的差异" +msgstr "在附函或单个补丁中显示和 <版本> 的差异" -#: builtin/log.c:1824 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" -msgstr "在附函或单个补丁中显示和 <refspec> 的差异" +msgstr "在附函或单个补丁中显示和 <引用规格> 的差异" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/log.c:1913 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/log.c:1928 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1930 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1938 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1940 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1942 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1964 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout、--output 和 --output-directory 是互斥的" -#: builtin/log.c:2087 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:2091 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "版本间差异：" -#: builtin/log.c:2092 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异：" -#: builtin/log.c:2098 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:2102 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:2110 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "范围差异：" -#: builtin/log.c:2111 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异：" -#: builtin/log.c:2122 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:2158 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "生成补丁" -#: builtin/log.c:2202 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:2261 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17216,7 +17285,7 @@ msgstr "<动作>" #: builtin/mailinfo.c:74 msgid "action when quoted CR is found" -msgstr "找到引用的 CR 时的操作" +msgstr "找到引号中的 CR 时的操作" #: builtin/mailinfo.c:77 msgid "use headers in message's body" @@ -17342,14 +17411,6 @@ msgstr "合并 %s 和 %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<提交>...]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - #: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" @@ -17492,36 +17553,36 @@ msgstr "无合并信息 -- 未更新 HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 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" @@ -17531,83 +17592,83 @@ msgstr "" "合并到主题分支。\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "空的提交说明会终止提交。\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "不能合并" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit 不带参数" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17615,7 +17676,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17623,88 +17684,88 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 和 --no-ff 组合使用。" -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "您不能将 --squash 和 --commit 组合使用。" -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "使用 %s 以准备手工解决。\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "使用 %s 策略以准备手工解决。\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -17800,7 +17861,7 @@ msgid "" "larger than this size" msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中" -#: builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "未识别的子命令：%s" @@ -18329,7 +18390,7 @@ msgstr "尝试删除不存在的注解不是一个错误" msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "不删除，只显示" @@ -18345,22 +18406,22 @@ msgstr "注解引用" msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18368,106 +18429,106 @@ msgid "" msgstr "" "write_reuse_object：无法定位 %1$s，预期在包 %3$s 中的偏移量 %2$<PRIuMAX> 上" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 错的包对象 CRC" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "%s 损坏的包对象" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "发现对象 %s 递归 delta" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 个对象，预期 %<PRIu32> 个" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1168 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "对 %s 调用 stat 失败" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" -#: builtin/pack-objects.c:1383 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:1831 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 压缩中 delta 基准偏移越界" -#: builtin/pack-objects.c:1840 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基准偏移越界" -#: builtin/pack-objects.c:2121 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "对象计数中" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "无法解析对象 %s 头信息" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 -#: builtin/pack-objects.c:2362 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, c-format msgid "object %s cannot be read" msgstr "对象 %s 无法读取" -#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2376 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "次优（suboptimal）打包 - 内存不足" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 个线程进行压缩" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "无法为标签 %s 压缩对象" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "不一致的差异计数" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18476,23 +18537,23 @@ msgstr "" "uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格" "式（得到 '%s'）" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3164 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3199 #, c-format msgid "could not get type of object %s in pack %s" msgstr "无法获得包 %2$s 中对象 %1$s 的类型" -#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 #, c-format msgid "could not find pack '%s'" msgstr "不能找到包 '%s'" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18501,7 +18562,7 @@ msgstr "" "预期边界对象（edge object）ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18510,246 +18571,246 @@ msgstr "" "预期对象 ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "选项 --missing 的值无效" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "无法打开包文件索引" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "无法检查 %s 处的松散对象" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" msgstr "无法强制松散对象" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "坏的版本 '%s'" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "无法添加最近的对象" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "<版本>[,<偏移>]" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:3769 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:3771 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:3779 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:3786 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3955 msgid "read packs from stdin" msgstr "从标准输入读取包" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可达性算法" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆仓库获取的包" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "忽略该 pack" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "显示被移植隐藏的提交" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "如果可能，写 bitmap 索引" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "处理丢失的对象" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor 包文件中的对象" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "在增量压缩时参考数据岛" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "协议" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量链深度 %d 太深了，强制为 %d" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 来构建传输用的包文件" -#: builtin/pack-objects.c:3936 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包文件大小是 1 MiB" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用于创建一个可索引包" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" msgstr "不能在没有 --stdout 的情况下使用 --filter" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4112 msgid "cannot use --filter with --stdin-packs" msgstr "不能同时使用 --filter 和 --stdin-packs" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4116 msgid "cannot use internal rev list with --stdin-packs" msgstr "不能同时使用内部版本列表和 --stdin-packs" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "枚举对象中" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18959,19 +19020,19 @@ msgstr "" "缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n" "或者 --ff-only 参数覆盖缺省设置。\n" -#: builtin/pull.c:991 +#: builtin/pull.c:990 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，变更添加至索引。" -#: builtin/pull.c:995 +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c:996 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "请提交或贮藏它们。" -#: builtin/pull.c:1021 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18981,7 +19042,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:1027 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18998,15 +19059,15 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:1042 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:1046 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" -#: builtin/pull.c:1067 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本地子模组中有修改，无法变基" @@ -19068,7 +19129,7 @@ msgstr "" "\n" " git push %s HEAD:<远程分支名字>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -19081,12 +19142,17 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。" + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -19096,12 +19162,7 @@ msgstr "" "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n" "而没有告诉我要推送什么、更新哪个远程分支。" -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。" - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -19112,7 +19173,7 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:273 +#: builtin/push.c:264 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" @@ -19123,7 +19184,7 @@ msgstr "" "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:279 +#: builtin/push.c:270 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" @@ -19136,11 +19197,11 @@ msgstr "" "（如 'git pull ...'）。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒绝，因为该标签在远程已经存在。" -#: builtin/push.c:289 +#: builtin/push.c:280 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" @@ -19149,7 +19210,7 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -19159,103 +19220,103 @@ msgstr "" "更新被拒绝，因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n" "在强制更新前，您可能想将这些变更整合到本地（如 'git pull ...'）。\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失败" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "仓库" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送标签（不能使用 --all or --mirror）" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "要求远程更新在本地被整合" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 #: builtin/send-pack.c:187 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "推送缺失但有关的标签" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "用 GPG 为推送签名" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "需要远端支持原子事务" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "坏的仓库 '%s'" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19276,27 +19337,27 @@ msgstr "" "\n" " git push <名称>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用规格同时使用" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规格同时使用" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "推送选项不能有换行符" @@ -19841,7 +19902,7 @@ msgstr "应用所有更改，甚至那些已在上游存在的" #: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "看起来 'git-am' 正在执行中。无法变基。" +msgstr "看起来 'git am' 正在执行中。无法变基。" #: builtin/rebase.c:1483 msgid "" @@ -19868,7 +19929,7 @@ msgstr "没有正在进行的变基？" msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" @@ -19973,8 +20034,8 @@ msgstr "没有指向一个有效的提交 '%s'" msgid "fatal: no such branch/commit '%s'" msgstr "致命错误：无此分支/提交 '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "没有这样的引用：%s" @@ -20042,7 +20103,7 @@ msgstr "快进 %s 到 %s。\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <仓库目录>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20068,7 +20129,7 @@ msgstr "" "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n" "配置变量为 'refuse'。" -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20087,11 +20148,11 @@ msgstr "" "\n" "若要屏蔽此信息，您可以设置它为 'refuse'。" -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "静默模式" -#: builtin/receive-pack.c:2493 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "您必须指定一个目录。" @@ -21060,15 +21121,15 @@ msgstr "只能为 -l 提供一个模式" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "在索引中注册干净的解决方案" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "没有路径的 'git rerere forget' 已经过时" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "无法为 '%s' 生成差异" @@ -21219,19 +21280,19 @@ msgstr "不能重置索引文件至版本 '%s'。" msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c:538 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "对象过滤需要 --objects" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "标记计数和 --objects 不兼容" @@ -21251,6 +21312,18 @@ msgstr "遇到第一个非选项参数后停止解析" msgid "output in stuck long form" msgstr "以固定长格式输出" +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "输入过早结束" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "在 `--' 分隔符之前没有给出使用方法字符串" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "需要一个单独的版本" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -21265,6 +21338,50 @@ msgstr "" "\n" "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir 需要一个参数" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "不是一个git目录 '%s'" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "--git-path 需要一个参数" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "-n 需要一个参数" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "--path-format 需要一个参数" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "未知的 --path-format 参数：%s" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "--default 需要一个参数" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "--prefix 需要一个参数" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "未知的 --abbrev-ref 模式：%s" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "未知的 --show-object-format 模式：%s" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<选项>] <提交号>..." @@ -21746,37 +21863,37 @@ msgstr "无法修改 sparse-index 配置" msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "无法规范化路径 %s" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <模式>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "无法为 C 语言风格的字符串 '%s' 去引号" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" msgstr "无法加载现存的稀疏检出模式" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "从标准输入读取模式" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "刷新工作目录时出错" @@ -21800,10 +21917,6 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" - #: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" @@ -21953,93 +22066,93 @@ msgstr "在贮藏中包含未跟踪文件" msgid "only show untracked files in the stash" msgstr "仅显示贮藏中的未跟踪文件" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "无法用 %2$s 更新 %1$s" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "贮藏说明" -#: builtin/stash.c:960 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一个 <提交> 参数" -#: builtin/stash.c:1175 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "没有选择变更" -#: builtin/stash.c:1275 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1302 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "无法保存当前索引状态" -#: builtin/stash.c:1311 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "无法保存未跟踪文件" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "无法保存当前工作区状态" -#: builtin/stash.c:1359 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "不能记录工作区状态" -#: builtin/stash.c:1408 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1426 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "您是否忘了执行 'git add'？" -#: builtin/stash.c:1441 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "没有要保存的本地修改" -#: builtin/stash.c:1448 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "无法初始化贮藏" -#: builtin/stash.c:1463 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "无法保存当前状态" -#: builtin/stash.c:1468 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" msgstr "保存工作目录和索引状态 %s" -#: builtin/stash.c:1558 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "以补丁模式贮藏" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "静默模式" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "贮藏中包含未跟踪文件" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "包含忽略的文件" -#: builtin/stash.c:1704 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22063,40 +22176,41 @@ msgstr "跳过和移除所有的注释行" msgid "prepend comment character and space to each line" msgstr "为每一行的行首添加注释符和空格" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用名称，却得到 %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote 不带参数" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "无法从 url '%s' 剥离一个组件" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "相对路径的替代锚记（anchor）" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "进入 '%s'\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22105,7 +22219,7 @@ msgstr "" "对 %s 执行 run_command 返回非零值。\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22115,169 +22229,169 @@ msgstr "" "在递归 %s 的子模组执行 run_command 时返回非零值。\n" "." -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "抑制进入每一个子模组命令的输出" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 -#: builtin/submodule--helper.c:1488 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "递归进入嵌套子模组中" -#: builtin/submodule--helper.c:573 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" -#: builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "无法为子模组 '%s' 注册 url" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建议子模组 '%s' 使用命令更新模式\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "无法为子模组 '%s' 注册更新模式" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "抑制子模组初始化的输出" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<选项>] [<路径>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "无法解析子模组 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "递归子模组 '%s' 失败" -#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "抑制子模组状态输出" -#: builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交" -#: builtin/submodule--helper.c:894 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路径>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s（数据对象）->%s（子模组）" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s（子模组）->%s（数据对象）" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "不能从 '%s' 创建哈希对象" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "意外的模式 %o\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交" -#: builtin/submodule--helper.c:1303 -msgid "to compare the commit in the index with that in the submodule HEAD" +#: builtin/submodule--helper.c:1304 +msgid "compare the commit in the index with that in the submodule HEAD" msgstr "比较存储在索引和子模组 HEAD 中的提交" -#: builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "限制总结的大小" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "不能为 HEAD 获取一个版本" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached 和 --files 是互斥的" -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "为 '%s' 同步子模组 url\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "无法为子模组路径 '%s' 注册 url" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "无法得到子模组 '%s' 的默认远程关联" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "无法为子模组 '%s' 更新远程关联" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "抑制子模组 URL 同步的输出" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22286,52 +22400,52 @@ msgstr "" "子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm " "-rf' 命令）" -#: builtin/submodule--helper.c:1559 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目录 '%s'\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "无法移除子模组工作区 '%s'\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能创建空的子模组目录 %s" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1597 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "删除子模组工作区，即使包含本地修改" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "将所有子模组取消注册" -#: builtin/submodule--helper.c:1631 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" -#: builtin/submodule--helper.c:1645 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'" -#: builtin/submodule--helper.c:1714 +#: builtin/submodule--helper.c:1690 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22343,46 +22457,67 @@ msgstr "" "Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n" "'--reference' 来克隆。" -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模组 '%s' 不能添加仓库备选：%s" -#: builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能识别 submodule.alternateLocation 的取值 '%s'" -#: builtin/submodule--helper.c:1823 +#: builtin/submodule--helper.c:1800 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'" + +#: builtin/submodule--helper.c:1841 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "无法克隆 '%s' 到子模组路径 '%s'" + +#: builtin/submodule--helper.c:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "目录非空：'%s'" + +#: builtin/submodule--helper.c:1858 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "无法得到 '%s' 的子模组目录" + +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "新子模组的名称" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "克隆子模组的 url 地址" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "浅克隆的深度" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "强制显示克隆进度" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "不允许克隆到一个非空目录" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22391,186 +22526,220 @@ msgstr "" "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " "[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>" -#: builtin/submodule--helper.c:1874 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'" - -#: builtin/submodule--helper.c:1885 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "无法克隆 '%s' 到子模组路径 '%s'" - -#: builtin/submodule--helper.c:1889 -#, c-format -msgid "directory not empty: '%s'" -msgstr "目录非空：'%s'" - -#: builtin/submodule--helper.c:1901 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "无法得到 '%s' 的子模组目录" - -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1953 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:1941 +#: builtin/submodule--helper.c:1957 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:2042 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模组 '%s' 尚未初始化" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "也许您想要执行 'update --init'？" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略过未合并的子模组 %s" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "略过子模组 '%s'" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划重试" -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次尝试克隆 '%s' 失败，退出" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "到工作区的路径" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作区中的路径，递归嵌套子模组" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "创建一个指定深度的浅克隆" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" msgstr "并发任务" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始克隆是否应该遵守推荐的浅克隆选项" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "不要输出克隆进度" -#: builtin/submodule--helper.c:2358 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "update 参数取值错误" -#: builtin/submodule--helper.c:2419 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上" -#: builtin/submodule--helper.c:2542 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "无法获得子模组 '%s' 的仓库句柄" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "在子模组中递归" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" -#: builtin/submodule--helper.c:2637 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" msgstr "检查写入 .gitmodules 文件是否安全" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 文件中的设置" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名称> [<值>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名称>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "请确认 .gitmodules 文件在工作区里" -#: builtin/submodule--helper.c:2682 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "抑制设置子模组 URL 的输出" -#: builtin/submodule--helper.c:2686 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>" -#: builtin/submodule--helper.c:2719 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "设置默认跟踪分支为 master" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "设置默认跟踪分支" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2741 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>" -#: builtin/submodule--helper.c:2726 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>" -#: builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch 和 --default 是互斥的" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "向索引中添加位于 '%s' 的已存在的仓库\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "'%s' 已存在并且不是一个有效的 git 仓库" + +#: builtin/submodule--helper.c:2828 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "发现一个本地 git 目录 '%s' 及其远程仓库：" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"如果您想要重用这个本地 git 目录而非重新克隆自\n" +" %s\n" +"使用 '--force' 选项。如果本地 git 目录不是正确的仓库，或者如果您不确定这里\n" +"的含义，使用 '--name' 选项指定另外的名称。\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "为子模组 '%s' 重新激活本地 git 目录\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "无法检出子模组 '%s'" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "克隆仓库时要检出的分支" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "允许添加一个被忽略的子模组路径" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --name <名称>" + +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支持 --super-prefix" -#: builtin/submodule--helper.c:2799 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一个有效的 submodule--helper 子命令" @@ -23185,7 +23354,7 @@ msgstr "git worktree remove [<选项>] <工作区>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" -#: builtin/worktree.c:61 builtin/worktree.c:935 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "删除 '%s' 失败" @@ -23195,25 +23364,25 @@ msgstr "删除 '%s' 失败" msgid "Removing %s/%s: %s" msgstr "删除 %s/%s: %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "报告清除的工作区" -#: builtin/worktree.c:151 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "将早于 <时间> 的工作区过期" -#: builtin/worktree.c:221 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "'%s' 已经存在" -#: builtin/worktree.c:230 +#: builtin/worktree.c:228 #, c-format msgid "unusable worktree destination '%s'" msgstr "无法使用的工作区目标 '%s'" -#: builtin/worktree.c:235 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23222,7 +23391,7 @@ msgstr "" "'%s' 是一个丢失但锁定的工作区，\n" "使用 '%s -f -f' 覆盖，或用 'unlock' 和 'prune' 或 'remove' 清除" -#: builtin/worktree.c:237 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23231,27 +23400,31 @@ msgstr "" "'%s' 是一个丢失但已经注册的工作区，\n" "使用 '%s -f' 覆盖，或用 'prune' 或 'remove' 清除" -#: builtin/worktree.c:288 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" msgstr "不能创建目录 '%s'" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "初始化" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区（新分支 '%s'）" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "准备工作区（重置分支 '%s'，之前为 %s）" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "准备工作区（检出 '%s'）" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区（分离头指针 %s）" @@ -23276,82 +23449,90 @@ msgstr "生成新的工作区" msgid "keep the new working tree locked" msgstr "锁定新工作区" -#: builtin/worktree.c:493 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "锁定原因" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "设置跟踪模式（参见 git-branch(1)）" -#: builtin/worktree.c:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "尝试为新分支名匹配一个远程跟踪分支" -#: builtin/worktree.c:504 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:565 +#: builtin/worktree.c:508 +msgid "--reason requires --lock" +msgstr "--reason 需要 --lock" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "由 --lock 添加" + +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在创建新分支时使用选项 --[no-]track " -#: builtin/worktree.c:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "显示扩展的注释和原因（如果有）" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "向早于 <时间> 的工作区添添加“可修剪”注释" -#: builtin/worktree.c:693 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose 和 --porcelain 互斥" -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "锁定原因" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 -#: builtin/worktree.c:963 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一个工作区" -#: builtin/worktree.c:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作区无法被加锁或解锁" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被锁定，原因：%s" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被锁定" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被锁定" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移动或删除包含子模组的工作区" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "强制移动，即使工作区是脏的或已锁定" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一个主工作区" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "无法从 '%s' 算出目标名称" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23360,7 +23541,7 @@ msgstr "" "无法移动一个锁定的工作区，锁定原因：%s\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23368,36 +23549,36 @@ msgstr "" "无法移动一个锁定的工作区，\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "验证失败，无法移动工作区：%s" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移动 '%s' 到 '%s' 失败" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中执行 'git status' 失败" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "强制删除，即使工作区是脏的或已锁定" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23406,7 +23587,7 @@ msgstr "" "无法删除一个锁定的工作区，锁定原因：%s\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23414,17 +23595,17 @@ msgstr "" "无法删除一个锁定的工作区，\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "验证失败，无法删除工作区：%s" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "修理：%s：%s" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "错误：%s：%s" @@ -23684,7 +23865,9 @@ msgstr "test-helper simple-ipc sendbytes [<名字>] [<字节数>] [<字节>]" msgid "" "test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " "[<batchsize>]" -msgstr "test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大小>]" +msgstr "" +"test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大" +"小>]" #: t/helper/test-simple-ipc.c:696 msgid "name or pathname of unix domain socket" @@ -23762,7 +23945,7 @@ msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构 msgid "Could not set SSL backend to '%s': already set" msgstr "无法将 SSL 后端设置为 '%s'：已经设置" -#: http.c:2035 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23812,95 +23995,95 @@ msgstr "无法访问 '%s'：%s" msgid "redirecting to %s" msgstr "重定向到 %s" -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "远程服务器发送了无状态分隔符" +#: remote-curl.c:656 +msgid "remote server sent unexpected response end packet" +msgstr "远程服务器发送意外的响应结束数据包" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl：错误的行宽字符：%.4s" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl：意外响应结束包" -#: remote-curl.c:832 +#: remote-curl.c:834 #, c-format msgid "RPC failed; %s" msgstr "RPC 失败。%s" -#: remote-curl.c:872 +#: remote-curl.c:874 msgid "cannot handle pushes this big" msgstr "不能处理这么大的推送" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "不能压缩请求，zlib 压缩错误 %d" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "不能压缩请求，zlib 结束错误 %d" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "收到了 %d 字节长度的头信息" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "预期仍然需要 %d 个字节的正文" -#: remote-curl.c:1132 +#: remote-curl.c:1134 msgid "dumb http transport does not support shallow capabilities" msgstr "哑 http 传输不支持浅克隆能力" -#: remote-curl.c:1147 +#: remote-curl.c:1149 msgid "fetch failed." msgstr "获取失败。" -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "无法通过智能 HTTP 获取 sha1" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "协议错误：期望 sha/ref，却得到 '%s'" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, c-format msgid "http transport does not support %s" msgstr "http 传输协议不支持 %s" -#: remote-curl.c:1291 +#: remote-curl.c:1293 msgid "git-http-push failed" msgstr "git-http-push 失败" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl：用法：git remote-curl <远程> [<url>]" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl：错误读取来自 git 的命令流" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl：尝试没有本地仓库下获取" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的来自 git 的命令 '%s'" @@ -24740,81 +24923,41 @@ msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' 没有检出的提交" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "添加位于 '$sm_path' 的现存仓库到索引" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" - -#: git-submodule.sh:261 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"如果您想要重用这个本地 git 目录而非重新克隆自\n" -" $realrepo\n" -"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" -"或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。" - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "激活本地 git 目录到子模组 '$sm_name'。" - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "不能检出子模组 '$sm_path'" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1：" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -24822,47 +24965,47 @@ msgid "" msgstr "" "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。" -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" @@ -25561,39 +25704,39 @@ msgstr "未知的 --patch 模式：%s" msgid "invalid argument %s, expecting --" msgstr "无效的参数 %s，期望是 --" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本地时间和 GMT 有不到一分钟间隔\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "本地时间偏移量大于等于 24 小时\n" -#: git-send-email.perl:222 +#: git-send-email.perl:214 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "致命错误：命令 '%s' 已终止，退出代码为 %d" -#: git-send-email.perl:235 +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "编辑器非正常退出，终止所有操作" -#: git-send-email.perl:321 +#: git-send-email.perl:316 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" -#: git-send-email.perl:326 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含编辑的邮件。\n" -#: git-send-email.perl:419 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它选项不兼容\n" -#: git-send-email.perl:493 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25603,47 +25746,47 @@ msgstr "" "git-send-email 通过 sendemail.* 选项进行设置，注意字母 'e'。\n" "设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n" -#: git-send-email.perl:498 git-send-email.perl:700 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在仓库之外运行 git format-patch\n" -#: git-send-email.perl:501 +#: git-send-email.perl:533 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n" -#: git-send-email.perl:514 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 字段：'%s'\n" -#: git-send-email.perl:545 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 设置：'%s'\n" -#: git-send-email.perl:573 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支持带引号的 sendmail 别名：%s\n" -#: git-send-email.perl:575 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支持 `:include:`：%s\n" -#: git-send-email.perl:577 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:582 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能识别的 sendmail 行：%s\n" -#: git-send-email.perl:666 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25658,12 +25801,12 @@ msgstr "" " * 如果含义为一个文件，使用 \"./%s\"，或者\n" " * 如果含义为一个范围，使用 --format-patch 选项。\n" -#: git-send-email.perl:687 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "无法打开目录 %s: %s" -#: git-send-email.perl:720 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -25673,17 +25816,17 @@ msgstr "" "未指定补丁文件！\n" "\n" -#: git-send-email.perl:733 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中没有标题行？" -#: git-send-email.perl:743 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "为写入打开 %s 失败: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25696,37 +25839,37 @@ msgstr "" "\n" "如果您不想发送摘要，清除内容。\n" -#: git-send-email.perl:778 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "无法打开 %s: %s" -#: git-send-email.perl:795 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "无法打开 %s.final: %s" -#: git-send-email.perl:838 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "摘要邮件为空，跳过\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您确认要使用 <%s> [y/N]？" -#: git-send-email.perl:928 +#: git-send-email.perl:990 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n" -#: git-send-email.perl:933 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？" -#: git-send-email.perl:941 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25738,20 +25881,20 @@ msgstr "" "\t%s\n" "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n" -#: git-send-email.perl:960 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "邮件将要发送给谁？" -#: git-send-email.perl:978 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命错误：别名 '%s' 扩展为它自己\n" -#: git-send-email.perl:990 +#: git-send-email.perl:1052 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？" -#: git-send-email.perl:1048 git-send-email.perl:1056 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n" @@ -25759,16 +25902,16 @@ msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1060 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)：" -#: git-send-email.perl:1377 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路径 \"%s\" 不存在" -#: git-send-email.perl:1460 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25793,112 +25936,112 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1475 +#: git-send-email.perl:1544 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -#: git-send-email.perl:1478 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "发送要求的邮件回复" -#: git-send-email.perl:1506 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 服务器未被正确定义。" -#: git-send-email.perl:1553 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "服务器不支持 STARTTLS！%s" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失败！%s" -#: git-send-email.perl:1571 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" -#: git-send-email.perl:1589 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "无法发送 %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "演习发送 %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "正发送 %s\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "演习成功。日志说：\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "OK。日志说：\n" -#: git-send-email.perl:1606 +#: git-send-email.perl:1688 msgid "Result: " msgstr "结果：" -#: git-send-email.perl:1609 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "结果：OK\n" -#: git-send-email.perl:1627 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "无法打开文件 %s" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1680 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 添加 to：%s 自行 '%s'\n" -#: git-send-email.perl:1737 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1772 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 添加 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1883 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能执行 '%s'" -#: git-send-email.perl:1890 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 添加 %s: %s 自：'%s'\n" -#: git-send-email.perl:1894 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 无法关闭管道至 '%s'" -#: git-send-email.perl:1924 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式发送信息" -#: git-send-email.perl:1932 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "无效的传送编码" -#: git-send-email.perl:1966 +#: git-send-email.perl:2051 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -25909,12 +26052,12 @@ msgstr "" "%s\n" "警告：补丁未能发送\n" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能打开 %s：%s\n" -#: git-send-email.perl:1979 +#: git-send-email.perl:2064 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -25923,13 +26066,13 @@ msgstr "" "致命错误：%s:%d 超过 998 字符\n" "警告：补丁未能发送\n" -#: git-send-email.perl:1997 +#: git-send-email.perl:2082 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略过 %s 含备份后缀 '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2001 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要发送 %s？[y|N]：" diff --git a/po/zh_TW.po b/po/zh_TW.po index 521292e390..5d5718abb1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,307 +1,37 @@ # Chinese (traditional) translations for Git package # Git 套裝軟體的繁體中文翻譯。 -# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> -# Copyright (C) 2019,2020 Yi-Jyun Pan <pan93412@gmail.com> +# Copyright (C) 2012-2021 Jiang Xin <worldhello.net AT gmail.com> +# Copyright (C) 2019-2021 Yi-Jyun Pan <pan93412@gmail.com> # This file is distributed under the same license as the Git package. -# Contributors (CN): -# - Fangyi Zhou <me AT fangyi.io> -# - Jiang Xin <worldhello.net AT gmail.com> -# - Lian Cheng <rhythm.mail AT gmail.com> -# - Ray Chen <oldsharp AT gmail.com> -# - Riku <lu.riku AT gmail.com> -# - Thynson <lanxingcan AT gmail.com> -# - ws3389 <willsmith3389 AT gmail.com> -# - Wang Sheng <wangsheng2008love AT 163.com> -# - 依云 <lilydjwg AT gmail.com> -# - Yichao Yu <yyc1992 AT gmail.com> -# - Zhuang Ya <zhuangya AT me.com> -# -# Git glossary for Chinese translators -# updated on 5/23/2020 # -# 原文 翻譯 -# 3 way merge 三方合併 -# ? ？ -# abbreviate 縮寫 -# abort 中止 -# Add 加入 -# all 所有 -# allow 允許 -# alternative 替代 -# Amend 修訂 -# annotate 附註 -# annotated tag 附註標籤 -# Apply 套用 -# argument 引數 -# argument 引數 -# Assume 假設 -# author 作者 -# bad 不良 -# Bare 祼 -# bare repo 祼版本庫 -# Bisect 二分法 -# Blame 究責 -# blob blob -# bloom filter 布隆過濾器 -# Branch 分支 -# branch （動詞）建立分支 -# Branches 分支 -# browse 瀏覽 -# browser 瀏覽器 -# bug 臭蟲 -# Bug-ID Bug-ID -# cache 快取 -# certificate 憑證 -# Change 變更 -# change 變更 -# changed 已變更 -# changes 變更 -# Check help file 查看說明檔案 -# checkbox 核取方塊 -# Checkout 檢出 -# checksum 總和檢查碼 -# Cherry Pick 摘取 -# clean 清除 -# cleanup 清理 -# clear 清空 -# click 按一下 -# client 用戶端 -# clipboard 剪貼簿 -# Clone 複製 -# Close 關閉 -# Collapse 收合 -# Color 色彩 -# Combine 結合 -# comment 評註 -# Commit 提交 -# committer 提交者 -# compare 比對 -# comparing 比對 -# Configure 設定 -# confirm 確認 -# Conflict 衝突 -# Context lines 情境列 -# context menu 快顯功能表 -# continue 繼續 -# continuous 持續性 -# copy 複製 -# Corrections 更正 -# Could not start 無法啟動 -# Create 建立 -# Creates 建立 -# Creating 建立中 -# Credential 憑證 -# Credential helper 憑證協助程式 -# Credentials 憑證 -# credentials 憑證 -# current 目前 -# custom 自訂 -# Customize 自訂 -# Daemon 守護程序 -# Date 日期 -# Default 預設 -# Delete 刪除 -# describe describe -# description 描述 -# Destination 目的地 -# detach 分離 -# detect 偵測 -# Dialogs 對話框 -# Diff 差異 -# differences 差異 -# different 差異 -# dir 目錄 -# directory 目錄 -# Discard 丟棄 -# Display 顯示 -# double click 按兩下 -# edit 編輯 -# editor 編輯器 -# email email -# Enable 啟用 -# Error code 錯誤碼 -# explicitly 顯式 -# Export 匯出 -# expression 表示式 -# extension 擴充套件 -# external 外部 -# fast forward 快進 -# fast-forward 快進 -# fetch 獲取 -# FETCH_HEAD FETCH_HEAD -# file 檔案 -# files 檔案 -# filter 篩選 -# find 搜尋 -# Finish 完成 -# folder 資料夾 -# folders 資料夾 -# follow 跟隨 -# Force 強制 -# from 自 -# Git Git -# Git for Windows Git for Windows -# hash 雜湊 -# HEAD HEAD -# highlight 標示 -# Hook 掛鉤 -# hunk 區塊 -# hunks 區塊 -# Ignore 忽略 -# Index 索引 -# Info 資訊 -# information 資訊 -# Init 初始化 -# initial checkout 初始簽出 -# Inline Diff 行內差異 -# inline diff 列內差異 -# is up to date 已最新 -# issue 議題 -# item 項目 -# items 項目 -# Keywords 關鍵字 -# label 標記 -# labels 標記 -# Last 最後 -# later 稍後 -# limitation 限制 -# line 列 -# lines 列 -# local 本地端 -# Local 本地端 -# Log 記錄 -# Merge 合併 -# merge 合併 -# message 訊息 -# Message 訊息 -# modify 修改 -# Name 名稱 -# Note 註 -# note 註 -# Notes 註解 -# Open 開啟 -# Options 選項 -# Ordering 順序 -# ORIG_HEAD ORIG_HEAD -# Overlay 圖示覆蓋 -# pack 包裝 -# Parent 父 -# patch 補綴 -# patched 補綴 -# paths 路徑 -# pick 取 -# position 位置 -# preview 預覽 -# process 處理 -# program 程式 -# Project 專案 -# Prune 剪除 -# Pull 拉取 -# Pull Request 拉取請求 -# Push 推送 -# rebase 重定基底 -# rebase 重定基底 -# recover 還原 -# recovered 還原 -# recursively 遞迴 -# recycle bin 回收桶 -# redo 重做 -# Ref 參照 -# ref 參照 -# reference 參照 -# RefLog 參照日誌 -# refmap 參照映射 -# refs 參照 -# refspec 參照規格 -# Remote 遠端 -# remote branches 遠端分支 -# Remote-tracking branches 遠端跟蹤分支 -# remote-treacking branches 遠端追蹤分支 -# remove 移除 -# removed 已移除 -# repo 版本庫 -# repositories 版本庫 -# Repository 版本庫 -# request 要求 -# Reset 重設 -# resolve 解決 -# rest 其餘的 -# Restore 還原 -# Revert 復原 -# reverted 已復原 -# review 檢閱 -# revision 修訂版 -# revisions 版本 -# script 指令稿 -# Scripts 指令稿 -# sections 部分 -# Show 顯示 -# sign 簽署 -# signed 已簽署 -# skip 略過 -# special 特殊 -# Squash 壓合 -# stage 暫存 -# stage 暫存 -# staged 已暫存 -# staging area 暫存區 -# Stash 收藏 -# Status 狀態 -# subject 主旨 -# Submodule 子模組 -# Superproject 上層專案 -# Switch 切換 -# tag （動詞）貼標籤 -# Tag 標籤 -# tagger 貼標籤者 -# tags 標籤 -# task 工作 -# thesaurus 同義字 -# three way 三方 -# Track 跟蹤 -# Tracked 跟蹤中 -# tracking 跟蹤 -# tree 樹 -# two 2 -# type 類型 -# unchanged 未變更 -# Undo 復原 -# Unified diff 單一差異 -# unified diff 統合式差異 -# Unknown 未知 -# unstash 取消收藏 -# Untracked 未跟蹤的 -# Unversioned 無版控 -# Update 更新 -# UpStream 上游 -# user 使用者 -# username 使用者名稱 -# vanilla 原 -# verify 核驗 -# view 檢視 -# viewer 檢視器 -# Warning 警告 -# whitespace 空白字元 -# whitespaces 空白字元 -# working 工作 -# working copy 工作複本 -# Working tree 工作目錄 -# You might need 您可能需要 +# Contributors (CN): +# - Fangyi Zhou <me AT fangyi.io> +# - Jiang Xin <worldhello.net AT gmail.com> +# - Lian Cheng <rhythm.mail AT gmail.com> +# - Ray Chen <oldsharp AT gmail.com> +# - Riku <lu.riku AT gmail.com> +# - Thynson <lanxingcan AT gmail.com> +# - ws3389 <willsmith3389 AT gmail.com> +# - Wang Sheng <wangsheng2008love AT 163.com> +# - 依云 <lilydjwg AT gmail.com> +# - Yichao Yu <yyc1992 AT gmail.com> +# - Zhuang Ya <zhuangya AT me.com> # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-05-23 15:30+0800\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" +"PO-Revision-Date: 2021-08-14 13:55+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" -"Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n" +"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" +"po/git-cli/zh_Hant/>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.4.3\n" +"X-Generator: Poedit 3.0\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -310,8 +40,8 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" msgstr "無法讀取索引" @@ -340,7 +70,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "無法暫存「%s」" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "無法寫入索引" @@ -395,12 +125,12 @@ msgstr[0] "增加了 %d 個路徑\n" msgid "ignoring unmerged: %s" msgstr "忽略未合併：%s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "只有二進位檔案被修改。\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "沒有修改。\n" @@ -477,11 +207,11 @@ msgstr "選擇編號過的項目" msgid "(empty) select nothing" msgstr "（空）全不選取" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** 指令 ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "請選擇" @@ -493,12 +223,13 @@ msgstr "快取" msgid "unstaged" msgstr "未快取" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "路徑" @@ -507,7 +238,7 @@ msgstr "路徑" msgid "could not refresh index" msgstr "無法重新整理索引" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "再見。\n" @@ -798,40 +529,42 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "無法解析區塊標頭 '%.*s'" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "無法解析上色過的區塊標頭 '%.*s'" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "無法解析差異 (diff)" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "無法解析上色過的差異 (diff)" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "無法執行 '%s'" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的輸出不符" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." -msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。" +msgstr "" +"您的過濾器必須在其輸入及輸出行\n" +"維持一對一的對應關係。" -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -840,7 +573,7 @@ msgstr "" "應有上下文行 #%d 於\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -853,11 +586,11 @@ msgstr "" "\t不以下述結尾：\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -871,20 +604,21 @@ msgstr "" "以 %c 開始的行將被刪除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -"如果未乾淨套用，您就有機會重新編輯。若刪掉此區塊的全部內容，則會中止\n" +"如果未乾淨套用，您就有機會重新編輯。\n" +"若刪掉此區塊的全部內容，則會中止\n" "本次編輯，區塊則不會被修改。\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "無法解析區塊標頭" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "「git apply --cached」失敗" @@ -900,24 +634,24 @@ msgstr "「git apply --cached」失敗" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "選取的區塊不會套用進索引！" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "無論如何都要套用到工作區嗎？" -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "未套用。\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -939,68 +673,68 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "沒有上一個區塊" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "沒有下一個區塊" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "沒有其它可供跳轉的區塊" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "跳轉到哪個區塊？" -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "無效數字：'%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "對不起，只有 %d 個可用區塊。" -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "沒有其它可供尋找的區塊" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "使用正規表示式搜尋？" -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "錯誤的正規表示式 %s：%s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "沒有和提供模式相符合的區塊" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "對不起，不能分割這個區塊" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "分割為 %d 個區塊。" -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "對不起，不能編輯這個區塊" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "'git apply' 失敗" @@ -1055,7 +789,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "因為存在未解決的衝突而離開。" -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" @@ -1068,12 +802,14 @@ msgid "Exiting because of unfinished merge." msgstr "因為存在未完成的合併而離開。" #: advice.c:296 -#, fuzzy, c-format +#, c-format msgid "" "The following pathspecs didn't match any eligible path, but they do match " "index\n" "entries outside the current sparse checkout:\n" -msgstr "沒有符合下列路徑規格的合規路徑，但有符合目前稀疏簽出之外的索引項目：\n" +msgstr "" +"下列路徑規格不符合任何適合路徑，\n" +"但符合目前稀疏簽出外的索引項目：\n" #: advice.c:303 msgid "" @@ -1351,7 +1087,7 @@ msgstr "打修補檔失敗：%s:%ld" #: apply.c:3352 #, c-format msgid "cannot checkout %s" -msgstr "不能檢出 %s" +msgstr "不能簽出 %s" #: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 @@ -1411,7 +1147,7 @@ msgstr "成功套用修補檔到 '%s'。\n" #: apply.c:3642 #, c-format msgid "Falling back to direct application...\n" -msgstr "" +msgstr "回復至直接套用模式⋯⋯\n" #: apply.c:3654 msgid "removal patch leaves file contents" @@ -1427,8 +1163,8 @@ msgstr "%s：錯誤類型" msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，應為 %o" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "無效路徑 '%s'" @@ -1518,7 +1254,7 @@ msgstr "不能為建立檔案 %s 建立後端儲存" msgid "unable to add cache entry for %s" msgstr "無法為 %s 新增快取條目" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "寫入 '%s' 失敗" @@ -1604,7 +1340,7 @@ msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修復空白錯誤後，套用了 %d 行。" -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" @@ -1616,7 +1352,7 @@ msgstr "不要套用符合提供路徑的變更" msgid "apply changes matching the given path" msgstr "套用符合提供路徑的變更" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "數字" @@ -1680,9 +1416,9 @@ msgstr "路徑以 NUL 字元分隔" msgid "ensure at least <n> lines of context match" msgstr "確保至少符合 <n> 行上下文" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 #: builtin/rebase.c:1347 msgid "action" msgstr "動作" @@ -1712,8 +1448,8 @@ msgid "allow overlapping hunks" msgstr "允許重疊的修補檔區塊" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "詳細輸出" @@ -1725,7 +1461,7 @@ msgstr "允許不正確的檔案末尾換行符號" msgid "do not trust the line counts in the hunk headers" msgstr "不信任修補檔區塊的標頭訊息中的行號" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "根目錄" @@ -1767,7 +1503,7 @@ msgstr "路徑不是有效的 UTF-8：%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路徑太長（%d 字元，SHA1：%s）：%s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" @@ -1801,13 +1537,13 @@ msgid "cannot read %s" msgstr "不能讀取 %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 -#: builtin/merge.c:1143 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "不能讀取 '%s'" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格 '%s' 未符合任何檔案" @@ -1849,7 +1585,7 @@ msgstr "格式" msgid "archive format" msgstr "歸檔格式" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "前綴" @@ -1860,7 +1596,7 @@ msgstr "為歸檔中每個路徑名加上前綴" #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" @@ -1891,7 +1627,8 @@ msgid "list supported archive formats" msgstr "列出支援的歸檔格式" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "版本庫" @@ -1899,7 +1636,7 @@ msgstr "版本庫" msgid "retrieve the archive from remote repository <repo>" msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "指令" @@ -2081,11 +1818,11 @@ msgstr "不能將 --contents 和最終的提交物件名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "版本遍歷設定失敗" @@ -2230,123 +1967,123 @@ msgstr "無效的分支點：'%s'。" #: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" -msgstr "'%s' 已經檢出到 '%s'" +msgstr "'%s' 已經簽出到 '%s'" #: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作區 %s 的 HEAD 指向沒有被更新" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "無法識別的包雜湊演算法：%s" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "未知功能 '%s'" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "無法識別的包頭：%s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 #: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "不能開啟 '%s'" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "版本庫中缺少這些必備的提交：" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "需要版本庫驗證一個包" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "這個包中含有這 %d 個引用：" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "這個包記錄一個完整歷史。" -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "這個包需要這 %d 個引用：" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "無法複製 bundle 描述符" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 進程" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects 終止" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 選項排除" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "不支援的包版本 %d" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "無法寫入 %2$s 演算法的包版本 %1$d" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "無法識別的參數：%s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "不能建立空包。" -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "不能建立 '%s'" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack 終止" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "終止區塊 id 出現的時間早於預期" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "找到重複的區塊 ID %<PRIx32>" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "最終區塊有非零 ID %<PRIx32>" @@ -2414,12 +2151,12 @@ msgstr "無法找到提交 %s" msgid "commit-graph requires overflow generation data but has none" msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" @@ -2480,7 +2217,7 @@ msgstr "正在尋找提交圖中額外的邊" msgid "failed to write correct number of base graph ids" msgstr "無法寫入正確數量的基礎圖形 ID" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" @@ -2522,84 +2259,84 @@ msgstr "正在合併提交圖形" #: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用。" +msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用" #: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "提交太多不能畫圖" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "無法從提交圖形中解析提交 %s" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "正在驗證提交圖中的提交" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "無法從提交圖形的物件庫中解析提交 %s" -#: commit-graph.c:2517 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s" -#: commit-graph.c:2527 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交圖形父提交列表太長了" -#: commit-graph.c:2536 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交圖形父提交是 %s != %s" -#: commit-graph.c:2550 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交圖形父提交列表過早終止" -#: commit-graph.c:2555 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零" -#: commit-graph.c:2559 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零" -#: commit-graph.c:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代" -#: commit-graph.c:2582 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -2881,7 +2618,7 @@ msgstr "%s 的取值格式錯誤：%s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "錯誤的打包壓縮級別 %d" @@ -2901,110 +2638,110 @@ msgstr "引用 '%s' 沒有指向一個資料物件" msgid "unable to resolve config blob '%s'" msgstr "不能解析設定物件 '%s'" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失敗" -#: config.c:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "無法解析指令列中的設定" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "在讀取設定檔案時遇到未知錯誤" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "無效 %s：'%s'" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "無法解析指令列設定中的 '%s'" -#: config.c:2560 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" -#: config.c:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "無效的小節名稱 '%s'" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s 有多個取值" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "寫入新的設定檔案 %s 失敗" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "不能鎖定設定檔案 %s" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "開啟 %s" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "無效模式：%s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "無效的設定檔案 %s" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "對 %s 呼叫 fstat 失敗" -#: config.c:3054 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "不能 mmap '%s'" +msgid "unable to mmap '%s'%s" +msgstr "無法 mmap '%s'%s" -#: config.c:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "對 %s 呼叫 chmod 失敗" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "不能寫入設定檔案 %s" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能設定 '%s' 為 '%s'" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "不能取消設定 '%s'" -#: config.c:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "無效的小節名稱：%s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺少" @@ -3180,7 +2917,7 @@ msgstr "已阻止奇怪的路徑名 '%s'" msgid "unable to fork" msgstr "無法 fork" -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在檢查連通性" @@ -3298,23 +3035,23 @@ msgstr "意外的過濾類型" msgid "path name too long for external filter" msgstr "外部過濾器的路徑名太長" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作區編碼" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 過濾器 '%s' 失敗" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 過濾器 %s 失敗" @@ -3430,36 +3167,36 @@ msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多 msgid "Marked %d islands, done.\n" msgstr "已標記 %d 個資料島，結束。\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "--diff-merges 的值無效：%s" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" -msgstr "—merge-base 跟範圍無法搭配運作" +msgstr "--merge-base 跟範圍無法搭配運作" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base 只能跟提交搭配才能運作" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "不能取得 HEAD" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "找不到合併基底" -#: diff-lib.c:566 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "找到多個合併基底" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<選項>] <路徑> <路徑>" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3482,8 +3219,8 @@ msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " -"'plain'" +"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-" +"zebra'、'plain'" #: diff.c:325 #, c-format @@ -3514,35 +3251,47 @@ msgstr "" "發現設定變數 'diff.dirstat' 中的錯誤：\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 離開，停止在 %s" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4712 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S" + +#: diff.c:4643 +msgid "" +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "" +"--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow 明確要求只跟一個路徑規格" -#: diff.c:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "無效的 --stat 值：%s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一個數字值" -#: diff.c:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3551,200 +3300,200 @@ msgstr "" "無法解析 --dirstat/-X 選項的參數：\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之後未知的值" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一個字元，得到 '%s'" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "壞的 --color-moved 參數：%s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的無效模式 '%s'" -#: diff.c:5068 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "%s 的參數無效" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "傳入 -I 的正規表示式無效：「%s」" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "無法解析 --submodule 選項的參數：'%s'" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "壞的 --word-diff 參數：%s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "差異輸出格式化選項" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "生成修補檔" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "不顯示差異輸出" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差異" -#: diff.c:5385 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "生成原始格式的差異" -#: diff.c:5388 +#: diff.c:5398 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同義" -#: diff.c:5392 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同義" -#: diff.c:5396 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "機器友好的 --stat" -#: diff.c:5399 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "只輸出 --stat 的最後一行" -#: diff.c:5401 diff.c:5409 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<參數1,參數2>..." -#: diff.c:5402 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "輸出每個子目錄相對變更的分布" -#: diff.c:5406 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同義" -#: diff.c:5410 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同義詞" -#: diff.c:5414 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" -#: diff.c:5417 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "精簡摘要，例如建立、重新命名和模式變更" -#: diff.c:5420 +#: diff.c:5430 msgid "show only names of changed files" msgstr "只顯示變更檔案的檔案名" -#: diff.c:5423 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "只顯示變更檔案的檔案名和狀態" -#: diff.c:5425 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" -#: diff.c:5426 +#: diff.c:5436 msgid "generate diffstat" msgstr "生成差異統計（diffstat）" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<寬度>" -#: diff.c:5429 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "使用提供的長度生成差異統計" -#: diff.c:5432 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "使用提供的檔案名長度生成差異統計" -#: diff.c:5435 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "使用提供的圖形長度生成差異統計" -#: diff.c:5437 +#: diff.c:5447 msgid "<count>" msgstr "<次數>" -#: diff.c:5438 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "生成有限行數的差異統計" -#: diff.c:5441 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "生成差異統計的簡潔摘要" -#: diff.c:5444 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "輸出一個可以套用的二進位差異" -#: diff.c:5447 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行顯示完整的前後物件名稱" -#: diff.c:5449 +#: diff.c:5459 msgid "show colored diff" msgstr "顯示帶顏色的差異" -#: diff.c:5450 +#: diff.c:5460 msgid "<kind>" msgstr "<類型>" -#: diff.c:5451 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" -#: diff.c:5454 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3752,311 +3501,311 @@ msgstr "" "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" "符" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<前綴>" -#: diff.c:5458 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "顯示提供的源前綴取代 \"a/\"" -#: diff.c:5461 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "顯示提供的目標前綴取代 \"b/\"" -#: diff.c:5464 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "輸出的每一行附加前綴" -#: diff.c:5467 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "不顯示任何源和目標前綴" -#: diff.c:5470 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" msgstr "顯示指定行數的差異區塊間的上下文" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<字元>" -#: diff.c:5475 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一個字元取代 '+' 來表示新的一行" -#: diff.c:5480 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一個字元取代 '-' 來表示舊的一行" -#: diff.c:5485 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一個字元取代 ' ' 來表示一行上下文" -#: diff.c:5488 +#: diff.c:5498 msgid "Diff rename options" msgstr "差異重新命名選項" -#: diff.c:5489 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "將完全重寫的變更打破為成對的刪除和建立" -#: diff.c:5494 +#: diff.c:5504 msgid "detect renames" msgstr "檢測重新命名" -#: diff.c:5498 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "省略刪除變更的差異輸出" -#: diff.c:5501 +#: diff.c:5511 msgid "detect copies" msgstr "檢測複製" -#: diff.c:5505 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "使用未修改的檔案做為發現複製的源" -#: diff.c:5507 +#: diff.c:5517 msgid "disable rename detection" msgstr "停用重新命名偵測" -#: diff.c:5510 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "使用空的資料物件做為重新命名的源" -#: diff.c:5512 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "繼續列出檔案重新命名以外的歷史記錄" -#: diff.c:5515 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" -#: diff.c:5517 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "差異演算法選項" -#: diff.c:5519 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "生成儘可能小的差異" -#: diff.c:5522 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "行比較時忽略空白字元" -#: diff.c:5525 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字元的變更" -#: diff.c:5528 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字元變更" -#: diff.c:5531 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的Enter符（CR）" -#: diff.c:5534 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的變更" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<正則>" -#: diff.c:5537 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "忽略整行符合 <regex> 的變更" -#: diff.c:5540 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "啟發式轉換差異邊界以便閱讀" -#: diff.c:5543 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 演算法生成差異" -#: diff.c:5547 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 演算法生成差異" -#: diff.c:5549 +#: diff.c:5559 msgid "<algorithm>" msgstr "<演算法>" -#: diff.c:5550 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "選擇一個差異演算法" -#: diff.c:5552 +#: diff.c:5562 msgid "<text>" msgstr "<文字>" -#: diff.c:5553 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 演算法生成差異" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<模式>" -#: diff.c:5556 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" -#: diff.c:5559 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "使用 <正規表示式> 確定何為一個詞" -#: diff.c:5562 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" -#: diff.c:5565 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "移動的程式碼行用不同方式著色" -#: diff.c:5568 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字元" -#: diff.c:5571 +#: diff.c:5581 msgid "Other diff options" msgstr "其它差異選項" -#: diff.c:5573 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" -#: diff.c:5577 +#: diff.c:5587 msgid "treat all files as text" msgstr "把所有檔案當做文字處理" -#: diff.c:5579 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "交換兩個輸入，反轉差異" -#: diff.c:5581 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差異時離開碼為 1，否則為 0" -#: diff.c:5583 +#: diff.c:5593 msgid "disable all output of the program" msgstr "停用本程式的所有輸出" -#: diff.c:5585 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "允許執行一個外部的差異協助工具" -#: diff.c:5587 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" -#: diff.c:5589 +#: diff.c:5599 msgid "<when>" msgstr "<何時>" -#: diff.c:5590 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差異時，忽略子模組的更改" -#: diff.c:5593 +#: diff.c:5603 msgid "<format>" msgstr "<格式>" -#: diff.c:5594 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "指定子模組的差異如何顯示" -#: diff.c:5598 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" msgstr "隱藏索引中 'git add -N' 條目" -#: diff.c:5601 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "將索引中 'git add -N' 條目當做真實的" -#: diff.c:5603 +#: diff.c:5613 msgid "<string>" msgstr "<字串>" -#: diff.c:5604 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "尋找改變了指定字串出現次數的差異" -#: diff.c:5607 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "尋找改變指定正則符合出現次數的差異" -#: diff.c:5610 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" msgstr "顯示使用 -S 或 -G 的變更集的所有變更" -#: diff.c:5613 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式" -#: diff.c:5616 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "控制輸出中的檔案顯示順序" -#: diff.c:5617 diff.c:5620 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<路徑>" -#: diff.c:5618 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "先顯示指定路徑的變更" -#: diff.c:5621 +#: diff.c:5631 msgid "skip the output to the specified path" msgstr "略過輸出至指定路徑" -#: diff.c:5623 +#: diff.c:5633 msgid "<object-id>" msgstr "<物件 ID>" -#: diff.c:5624 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "尋找改變指定物件出現次數的差異" -#: diff.c:5626 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5627 +#: diff.c:5637 msgid "select files by diff type" msgstr "透過差異類型選擇檔案" -#: diff.c:5629 +#: diff.c:5639 msgid "<file>" msgstr "<檔案>" -#: diff.c:5630 +#: diff.c:5640 msgid "Output to a specific file" msgstr "輸出到一個指定的檔案" -#: diff.c:6287 -msgid "inexact rename detection was skipped due to too many files." -msgstr "因為檔案太多，略過不嚴格的重新命名檢查。" +#: diff.c:6298 +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "因為檔案太多，已略過詳細重新命名偵測。" -#: diff.c:6290 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." msgstr "因為檔案太多，只在修改的路徑中尋找複製。" -#: diff.c:6293 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -4067,7 +3816,7 @@ msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令 msgid "failed to read orderfile '%s'" msgstr "讀取排序檔案 '%s' 失敗" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "正在進行非精確的重新命名偵測" @@ -4076,59 +3825,59 @@ msgstr "正在進行非精確的重新命名偵測" msgid "No such path '%s' in the diff" msgstr "diff 中沒有「%s」路徑" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "無法識別樣式：「%s」" -#: dir.c:777 dir.c:791 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "無法識別反向模式：「%s」" -#: dir.c:809 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複" +msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複" -#: dir.c:819 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "停用 cone 樣式符合模式" -#: dir.c:1206 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能將 %s 用作排除檔案" -#: dir.c:2314 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "不能開啟目錄 '%s'" -#: dir.c:2614 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "無法獲得核心名稱和訊息" -#: dir.c:2738 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "快取未追蹤檔案在本系統或位置中被停用" -#: dir.c:3543 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "版本庫 %s 中的索引檔案損壞" -#: dir.c:3590 dir.c:3595 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "不能為 %s 建立目錄" -#: dir.c:3624 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" @@ -4138,11 +3887,11 @@ msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的編輯器關閉檔案...%c" -#: entry.c:179 +#: entry.c:176 msgid "Filtering content" msgstr "過濾內容" -#: entry.c:500 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" msgstr "不能對檔案 '%s' 呼叫 stat" @@ -4152,7 +3901,7 @@ msgstr "不能對檔案 '%s' 呼叫 stat" msgid "bad git namespace path \"%s\"" msgstr "錯誤的 git 名字空間路徑 \"%s\"" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能設定 GIT_DIR 為 '%s'" @@ -4315,9 +4064,9 @@ msgstr "沒有共同的提交" #: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 msgid "source repository is shallow, reject to clone." -msgstr "來源版本庫是淺版本庫 (shallow)。拒絕 clone。" +msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。" -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：取得失敗。" @@ -4339,7 +4088,7 @@ msgstr "伺服器不支援 shallow 請求" msgid "Server supports filter" msgstr "伺服器支援 filter" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "無法將請求寫到遠端" @@ -4395,24 +4144,24 @@ msgstr "處理要取得的引用發生錯誤：%d" msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: 預期要有回應結束封包" -#: fetch-pack.c:1930 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "沒有符合的遠端分支" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "遠端沒有傳送所有必需的物件" -#: fetch-pack.c:2056 +#: fetch-pack.c:2065 msgid "unexpected 'ready' from remote" msgstr "從遠端收到非預期的 ‘ready’" -#: fetch-pack.c:2079 +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "沒有這樣的遠端引用 %s" -#: fetch-pack.c:2082 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "伺服器不允許請求未公開的物件 %s" @@ -4432,8 +4181,8 @@ msgstr "gpg 無法為資料簽名" #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" -msgstr "忽略 log.graphColors 中無效的顏色 '%.*s'" +msgid "ignored invalid color '%.*s' in log.graphColors" +msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩" #: grep.c:531 msgid "" @@ -4443,18 +4192,18 @@ msgstr "" "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" "功能" -#: grep.c:1893 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：無法讀取 %s" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "對 '%s' 呼叫 stat 失敗" -#: grep.c:1921 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s'：讀取不完整" @@ -4685,7 +4434,7 @@ msgstr "sparse:path 過濾器支援已被刪除" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式" #: list-objects-filter-options.c:124 @@ -4730,7 +4479,7 @@ msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀 msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件" -#: list-objects.c:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "無法為提交 %s 載入根樹" @@ -4776,32 +4525,32 @@ msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" msgid "bad action '%s' for '%s'" msgstr "「%s」動作對「%s」無效" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: merge-ort.c:1569 merge-recursive.c:1201 #, c-format msgid "Failed to merge submodule %s (not checked out)" -msgstr "無法合併子模組 %s （沒有檢出）" +msgstr "無法合併子模組 %s （沒有簽出）" -#: merge-ort.c:1125 merge-recursive.c:1212 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "無法合併子模組 %s（提交不存在）" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: merge-ort.c:1587 merge-recursive.c:1215 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" -#: merge-ort.c:1144 merge-ort.c:1151 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "注意：正在將 %s 子模組快轉到 %s" -#: merge-ort.c:1172 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "無法合併 %s 子模組" -#: merge-ort.c:1179 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4810,7 +4559,7 @@ msgstr "" "無法合併 %s 子模組，但有找到一個可行的合併方案：\n" "%s\n" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4826,7 +4575,7 @@ msgstr "" "\n" "以接受此建議。\n" -#: merge-ort.c:1196 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4835,21 +4584,21 @@ msgstr "" "無法合併 %s 子模組，但有找到幾個可行的合併方案：\n" "%s" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "無法執行內部合併" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "不能新增 %s 至物件庫" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "自動合併 %s" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4858,7 +4607,7 @@ msgstr "" "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" "放在：%s。" -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4867,24 +4616,24 @@ msgstr "" "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這" "些路徑放置於此：%s" -#: merge-ort.c:1634 -#, fuzzy, c-format +#: merge-ort.c:2087 +#, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " "renamed to multiple other directories, with no destination getting a " "majority of the files." msgstr "" -"衝突（分割的目錄重新命名）：未知 %s 應重新命名成什麼。其已重新命名為多個其他" -"目錄，卻沒有目的地取得檔案的主要部分。" +"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目" +"錄，但沒有目的地取得過半檔案。" -#: merge-ort.c:1788 merge-recursive.c:2468 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" -#: merge-ort.c:1932 merge-recursive.c:3244 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4892,7 +4641,7 @@ msgid "" msgstr "" "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。" -#: merge-ort.c:1939 merge-recursive.c:3251 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4901,7 +4650,7 @@ msgstr "" "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" "其移動到 %5$s。" -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4910,7 +4659,7 @@ msgstr "" "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" "動到 %s。" -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4919,14 +4668,14 @@ msgstr "" "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s " "中，建議將其移動到 %5$s。" -#: merge-ort.c:2103 +#: merge-ort.c:2569 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 " "%4$s。" -#: merge-ort.c:2198 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4936,65 +4685,65 @@ msgstr "" "衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可" "能會因此出現巢狀衝突標記。" -#: merge-ort.c:2217 merge-ort.c:2241 +#: merge-ort.c:2683 merge-ort.c:2707 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。" -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "不能讀取物件 %s" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "物件 %s 不是一個資料物件" -#: merge-ort.c:2981 -#, fuzzy, c-format +#: merge-ort.c:3613 +#, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." -msgstr "衝突（檔案/目錄）：目錄擋住來自 %2$s 的 %1$s。改移動到 %3$s。" +msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。" -#: merge-ort.c:3055 -#, fuzzy, c-format +#: merge-ort.c:3689 +#, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" -"衝突（類型有異）：每個來源的 %s 類型不同。已經重新命名這兩個來源，這樣每個來" -"源都可以分別記錄。" +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分" +"別記錄這兩方檔案。" -#: merge-ort.c:3062 -#, fuzzy, c-format +#: merge-ort.c:3696 +#, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " "of them so each can be recorded somewhere." msgstr "" -"衝突（類型有異）：每個來源的 %s 類型不同。已經重新命名其中一個來源，這樣每個" -"來源都可以分別記錄。" +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以" +"分別記錄這兩方檔案。" -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "內容" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "新增/新增" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "子模組" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "衝突（%s）：合併衝突於 %s" -#: merge-ort.c:3198 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -5003,7 +4752,7 @@ msgstr "" "衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹" "上。" -#: merge-ort.c:3433 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -5013,12 +4762,12 @@ msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3730 +#: merge-ort.c:4487 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "%s, %s, %s 樹的合併資訊收集失敗" -#: merge-ort-wrappers.c:13 merge-recursive.c:3699 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -5027,103 +4776,103 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "已經是最新的。" -#: merge-recursive.c:356 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "（壞提交）\n" -#: merge-recursive.c:379 +#: merge-recursive.c:375 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。" -#: merge-recursive.c:388 +#: merge-recursive.c:384 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。" -#: merge-recursive.c:876 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "建立路徑 '%s'%s 失敗" -#: merge-recursive.c:887 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "刪除 %s 以便為子目錄留出空間\n" -#: merge-recursive.c:901 merge-recursive.c:920 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr "：可能是一個目錄/檔案衝突？" -#: merge-recursive.c:910 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" -#: merge-recursive.c:951 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "不能讀取物件 %s '%s'" -#: merge-recursive.c:956 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 應為資料物件" -#: merge-recursive.c:981 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "開啟 '%s' 失敗：%s" -#: merge-recursive.c:992 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "建立符號連結 '%s' 失敗：%s" -#: merge-recursive.c:997 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何處理 %06o %s '%s'" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模組 %s 快轉到如下提交：" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快轉子模組 %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）" -#: merge-recursive.c:1269 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "無法合併子模組 %s（非快轉）" -#: merge-recursive.c:1270 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模組的一個可能的合併方案：\n" -#: merge-recursive.c:1282 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "無法合併子模組 %s （發現多個合併）" -#: merge-recursive.c:1424 +#: merge-recursive.c:1420 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。" -#: merge-recursive.c:1496 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5132,7 +4881,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1501 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5141,7 +4890,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1508 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5150,7 +4899,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1513 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5159,41 +4908,41 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本保留在 %9$s 中。" -#: merge-recursive.c:1548 +#: merge-recursive.c:1544 msgid "rename" msgstr "重新命名" -#: merge-recursive.c:1548 +#: merge-recursive.c:1544 msgid "renamed" msgstr "重新命名" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒絕遺失髒檔案 '%s'" -#: merge-recursive.c:1609 +#: merge-recursive.c:1605 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。" -#: merge-recursive.c:1667 +#: merge-recursive.c:1663 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" -#: merge-recursive.c:1698 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" -#: merge-recursive.c:1703 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" -#: merge-recursive.c:1730 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5202,18 +4951,18 @@ msgstr "" "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1735 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " （留下未解決）" -#: merge-recursive.c:1827 +#: merge-recursive.c:1823 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 " "%4$s->%5$s" -#: merge-recursive.c:2090 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5223,7 +4972,7 @@ msgstr "" "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" "多個其它目錄，沒有目錄包含大部分檔案。" -#: merge-recursive.c:2224 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5232,77 +4981,77 @@ msgstr "" "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" "命名目錄 %4$s->%5$s" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modify" msgstr "修改" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modified" msgstr "修改" -#: merge-recursive.c:3108 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略過 %s（已經做過相同合併）" -#: merge-recursive.c:3161 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 為名新增" -#: merge-recursive.c:3368 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "刪除 %s" -#: merge-recursive.c:3391 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "檔案/目錄" -#: merge-recursive.c:3396 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "目錄/檔案" -#: merge-recursive.c:3403 +#: merge-recursive.c:3406 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s" -#: merge-recursive.c:3412 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "新增 %s" -#: merge-recursive.c:3421 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "衝突（add/add）：合併衝突於 %s" -#: merge-recursive.c:3474 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "無法合併樹 %s 和 %s" -#: merge-recursive.c:3568 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "合併：" -#: merge-recursive.c:3581 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "發現 %u 個共同祖先：" -#: merge-recursive.c:3631 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "合併未返回提交" -#: merge-recursive.c:3796 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析物件 '%s'" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "不能寫入索引。" @@ -5311,8 +5060,8 @@ msgstr "不能寫入索引。" msgid "failed to read the cache" msgstr "讀取快取失敗" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "無法寫新的索引檔案" @@ -5386,106 +5135,114 @@ msgstr "開啟包索引 '%s' 失敗" msgid "failed to locate object %d in packfile" msgstr "在 packfile 中定位物件 %d 失敗" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:880 builtin/index-pack.c:1533 msgid "cannot store reverse index file" msgstr "無法儲存倒排索引檔案" -#: midx.c:933 +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "忽略現有的多包索引：總和檢查碼不符" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "正在新增 packfile 至多包索引" -#: midx.c:979 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "沒有看到要捨棄的包檔案 %s" -#: midx.c:1024 +#: midx.c:1034 #, c-format msgid "unknown preferred pack: '%s'" msgstr "未知偏好包：「%s」" -#: midx.c:1029 +#: midx.c:1039 #, c-format msgid "preferred pack '%s' is expired" msgstr "偏好包「%s」已經過期" -#: midx.c:1045 +#: midx.c:1055 msgid "no pack files to index." msgstr "沒有要索引的 pack 檔案。" -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1135 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "刪除 %s 失敗" -#: midx.c:1156 +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位於 %s 的多包索引失敗" -#: midx.c:1214 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "有 multi-pack-index 檔案，但無法解析" -#: midx.c:1222 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "總和檢查碼不正確" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "正在尋找引用的 packfile" -#: midx.c:1237 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1242 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "midx 沒有 oid" -#: midx.c:1251 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "正在驗證多包索引中的物件 ID 順序" -#: midx.c:1260 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1280 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "透過 packfile 為物件排序" -#: midx.c:1287 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "正在驗證物件位移" -#: midx.c:1303 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "為 oid[%d] = %s 載入包條目失敗" -#: midx.c:1309 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "為 packfile %s 載入包索引失敗" -#: midx.c:1318 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" -#: midx.c:1343 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "正在計算引用物件" -#: midx.c:1353 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "正在尋找並刪除沒有參考的 packfile" -#: midx.c:1544 +#: midx.c:1558 msgid "could not start pack-objects" msgstr "不能開始 pack-objects" -#: midx.c:1564 +#: midx.c:1578 msgid "could not finish pack-objects" msgstr "不能結束 pack-objects" @@ -5548,265 +5305,266 @@ msgstr "壞的 %s 值：'%s'" msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" -#: object-file.c:577 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "無法規範化備用物件路徑：%s" -#: object-file.c:649 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略備用物件庫，嵌套太深" -#: object-file.c:656 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" msgstr "無法規範化物件目錄: %s" -#: object-file.c:699 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "無法 fdopen 取代鎖檔案" -#: object-file.c:717 +#: object-file.c:726 msgid "unable to read alternates file" msgstr "無法讀取替代檔案" -#: object-file.c:724 +#: object-file.c:733 msgid "unable to move new alternates file into place" msgstr "無法將新的替代檔案移動到位" -#: object-file.c:759 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "路徑 '%s' 不存在" -#: object-file.c:780 +#: object-file.c:789 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "尚不支援將參考版本庫 '%s' 作為一個連結檢出。" +msgstr "尚不支援將參考版本庫 '%s' 作為一個連結簽出。" -#: object-file.c:786 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "參考版本庫 '%s' 不是一個本機版本庫。" -#: object-file.c:792 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "參考版本庫 '%s' 是一個淺複製" -#: object-file.c:800 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "參考版本庫 '%s' 已被移植" -#: object-file.c:860 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析備用引用時無效的行：%s" -#: object-file.c:1010 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" -#: object-file.c:1031 -msgid "mmap failed" -msgstr "mmap 失敗" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" +msgstr "mmap 失敗%s" -#: object-file.c:1195 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "物件檔案 %s 為空" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" msgstr "損壞的鬆散物件 '%s'" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" msgstr "鬆散物件 '%s' 後面有垃圾資料" -#: object-file.c:1374 +#: object-file.c:1397 msgid "invalid object type" msgstr "無效的物件類型" -#: object-file.c:1458 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息" -#: object-file.c:1461 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "無法解開 %s 頭部" -#: object-file.c:1467 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息" -#: object-file.c:1470 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "無法解析 %s 頭部" -#: object-file.c:1697 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "讀取物件 %s 失敗" -#: object-file.c:1701 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: object-file.c:1705 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "鬆散物件 %s（儲存在 %s）已損壞" -#: object-file.c:1709 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包物件 %s（儲存在 %s）已損壞" -#: object-file.c:1814 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "無法寫檔案 %s" -#: object-file.c:1821 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "無法為 '%s' 設定權限" -#: object-file.c:1828 +#: object-file.c:1848 msgid "file write error" msgstr "檔案寫錯誤" -#: object-file.c:1848 +#: object-file.c:1868 msgid "error when closing loose object file" msgstr "關閉鬆散物件檔案時發生錯誤" -#: object-file.c:1913 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" -#: object-file.c:1915 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "無法建立暫存檔" -#: object-file.c:1939 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "不能寫鬆散物件檔案" -#: object-file.c:1945 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能壓縮新物件 %s（%d）" -#: object-file.c:1949 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" -#: object-file.c:1953 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不穩定物件源資料搞糊塗了" -#: object-file.c:1963 builtin/pack-objects.c:1097 +#: object-file.c:1983 builtin/pack-objects.c:1237 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上呼叫 utime() 失敗" -#: object-file.c:2040 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "不能讀取物件 %s" -#: object-file.c:2091 +#: object-file.c:2111 msgid "corrupt commit" msgstr "損壞的提交" -#: object-file.c:2099 +#: object-file.c:2119 msgid "corrupt tag" msgstr "損壞的標籤" -#: object-file.c:2199 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 時讀取錯誤" -#: object-file.c:2202 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 時讀入不完整" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入資料庫失敗" -#: object-file.c:2291 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支援的檔案類型" -#: object-file.c:2315 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一個有效的物件" -#: object-file.c:2317 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一個有效的 '%s' 物件" -#: object-file.c:2344 builtin/index-pack.c:192 +#: object-file.c:2364 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "不能開啟 %s" -#: object-file.c:2535 object-file.c:2588 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的雜湊值不符合（預期 %s）" -#: object-file.c:2559 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: object-file.c:2564 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "無法解壓縮 %s 的頭部" -#: object-file.c:2570 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "無法解析 %s 的頭部" -#: object-file.c:2581 +#: object-file.c:2605 #, c-format msgid "unable to unpack contents of %s" msgstr "無法解壓縮 %s 的內容" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "短物件 ID %s 存在歧義" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "候選者有：" -#: object-name.c:796 +#: object-name.c:790 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" @@ -5828,22 +5586,22 @@ msgstr "" "請檢查這些引用，並視需要刪除。執行\n" "「git config advice.objectNameWarning false」命令以關閉本訊息通知" -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "'%.*s' 的日誌只能回到 %s" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "'%.*s' 的日誌只有 %d 個項目" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5852,12 +5610,12 @@ msgstr "" "'%s' 路徑存在，但不是 '%s'\n" "提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "'%s' 路徑不存在於 '%.*s'" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -5866,7 +5624,7 @@ msgstr "" "'%s' 路徑在索引，但不在 %d 暫存區\n" "提示：你在說 ':%d:%s' 嗎？" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -5875,21 +5633,21 @@ msgstr "" "'%s' 路徑在索引，但不是 '%s'\n" "提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "磁碟上存在 '%s' 路徑，但不在索引中" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "相對路徑與法不能用在工作區外" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "'%.*s' 物件名稱無效。" @@ -5904,27 +5662,27 @@ msgstr "無效的物件類型 \"%s\"" msgid "object %s is a %s, not a %s" msgstr "物件 %s 是一個 %s，不是一個 %s" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "物件 %s 有未知的類型 id %d" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "不能解析物件：%s" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "雜湊值與 %s 不符合" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" -#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "無法取得 %s 的磁碟用量" @@ -5977,12 +5735,17 @@ msgstr "無法寫入「%s」promisor 檔案" msgid "offset before end of packfile (broken .idx?)" msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" -#: packfile.c:1937 +#: packfile.c:655 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "包檔案 %s 無法映射%s" + +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" -#: packfile.c:1941 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" @@ -6184,8 +5947,8 @@ msgid "unable to write delim packet" msgstr "無法寫 delim 包" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "無法寫入無狀態的分隔符號封包" +msgid "unable to write response end packet" +msgstr "無法寫入回應結尾封包" #: pkt-line.c:113 msgid "flush packet write failed" @@ -6244,19 +6007,19 @@ msgstr "無法建立執行緒 lstat：%s" msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: 無法 fork fetch 子處理程序" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "promisor-remote: 無法寫入 fetch 子處理程序" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 遠端名稱不能以 '/' 開始：%s" @@ -6277,7 +6040,7 @@ msgstr "不能啟動 `log`" msgid "could not read `log` output" msgstr "不能讀取 `log` 的輸出" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -6294,63 +6057,63 @@ msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s msgid "could not parse git header '%.*s'" msgstr "無法解析 git 頭 '%.*s'" -#: range-diff.c:306 +#: range-diff.c:307 msgid "failed to generate diff" msgstr "生成 diff 失敗" -#: range-diff.c:558 +#: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "--left-only 和 --right-only 互斥" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日誌" -#: read-cache.c:708 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）" -#: read-cache.c:724 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "不能在物件資料庫中建立空的資料物件" -#: read-cache.c:746 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能新增一般檔案、符號連結或 git 目錄" -#: read-cache.c:751 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" -msgstr "'%s' 沒有檢出一個提交" +msgstr "'%s' 沒有簽出一個提交" -#: read-cache.c:803 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "無法索引檔案 '%s'" -#: read-cache.c:822 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "無法在索引中新增 '%s'" -#: read-cache.c:833 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "無法對 %s 執行 stat" -#: read-cache.c:1356 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起來既是檔案又是目錄" -#: read-cache.c:1571 +#: read-cache.c:1573 msgid "Refresh index" msgstr "重新整理索引" -#: read-cache.c:1700 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6359,7 +6122,7 @@ msgstr "" "設定了 index.version，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1710 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6368,144 +6131,144 @@ msgstr "" "設定了 GIT_INDEX_VERSION，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1766 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "壞的簽名 0x%08x" -#: read-cache.c:1769 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" msgstr "壞的索引版本 %d" -#: read-cache.c:1778 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "壞的索引檔案 sha1 簽名" -#: read-cache.c:1812 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支援的 %.4s 擴展" # -#: read-cache.c:1814 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 擴展" -#: read-cache.c:1851 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引條目格式 0x%08x" -#: read-cache.c:1867 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" -#: read-cache.c:1924 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "索引中有未排序的暫存條目" -#: read-cache.c:1927 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合併檔案 '%s' 有多個暫存條目" -#: read-cache.c:1930 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暫存條目" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:332 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "索引檔案損壞" -#: read-cache.c:2180 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "無法建立 load_cache_entries 執行緒：%s" -#: read-cache.c:2193 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "無法加入 load_cache_entries 執行緒：%s" -#: read-cache.c:2226 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "%s：開啟索引檔案失敗" -#: read-cache.c:2230 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能對開啟的索引執行 stat 動作" -#: read-cache.c:2234 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引檔案比預期的小" -#: read-cache.c:2238 +#: read-cache.c:2243 #, c-format -msgid "%s: unable to map index file" -msgstr "%s：無法對索引檔案執行 map 動作" +msgid "%s: unable to map index file%s" +msgstr "%s：無法 map 索引檔案%s" -#: read-cache.c:2280 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "無法建立 load_index_extensions 執行緒：%s" -#: read-cache.c:2307 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "無法加入 load_index_extensions 執行緒：%s" -#: read-cache.c:2345 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" msgstr "無法重新整理共享索引 '%s'" -#: read-cache.c:2392 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "不能關閉 '%s'" -#: read-cache.c:3138 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "無法轉換成稀疏索引" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: read-cache.c:3222 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "不能開啟 git 目錄：%s" -#: read-cache.c:3234 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "無法刪除：%s" -#: read-cache.c:3263 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修復 '%s' 的權限位" -#: read-cache.c:3412 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暫存區 #0" @@ -6616,8 +6379,8 @@ msgstr "" "然而，如果您刪除全部內容，重定基底動作將會終止。\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "不能寫入 '%s'" @@ -6660,7 +6423,7 @@ msgstr "" msgid "could not read '%s'." msgstr "不能讀取 '%s'。" -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "遺失" @@ -6679,247 +6442,247 @@ msgstr "落後 %d" msgid "ahead %d, behind %d" msgstr "領先 %d，落後 %d" -#: ref-filter.c:175 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "期望的格式：%%(color:<顏色>)" -#: ref-filter.c:177 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "無法識別的顏色：%%(color:%s)" -#: ref-filter.c:199 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整數值 refname:lstrip=%s" -#: ref-filter.c:203 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整數值 refname:rstrip=%s" -#: ref-filter.c:205 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "無法識別的 %%(%s) 參數：%s" -#: ref-filter.c:260 +#: ref-filter.c:315 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不帶參數" -#: ref-filter.c:282 +#: ref-filter.c:339 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "無法識別的 %%(objectsize) 參數：%s" -#: ref-filter.c:290 +#: ref-filter.c:347 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) 不帶參數" -#: ref-filter.c:302 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不帶參數" -#: ref-filter.c:315 +#: ref-filter.c:372 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "無法識別的 %%(subject) 引數：%s" -#: ref-filter.c:334 +#: ref-filter.c:391 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "預期是 %%(trailers:key=<value>)" -#: ref-filter.c:336 +#: ref-filter.c:393 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) 參數：%s" -#: ref-filter.c:367 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一個正數 contents:lines=%s" -#: ref-filter.c:369 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "無法識別的 %%(contents) 參數：%s" -#: ref-filter.c:384 +#: ref-filter.c:441 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值" -#: ref-filter.c:388 +#: ref-filter.c:445 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數" -#: ref-filter.c:402 +#: ref-filter.c:459 #, c-format msgid "unrecognized email option: %s" msgstr "無法識別的 email 選項：%s" -#: ref-filter.c:432 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "期望的格式：%%(align:<寬度>,<位置>)" -#: ref-filter.c:444 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "無法識別的位置：%s" -#: ref-filter.c:451 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "無法識別的寬度：%s" -#: ref-filter.c:460 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "無法識別的 %%(align) 參數：%s" -#: ref-filter.c:468 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一個正數的寬度" -#: ref-filter.c:486 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "無法識別的 %%(if) 參數：%s" -#: ref-filter.c:588 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "格式錯誤的欄位名：%.*s" -#: ref-filter.c:615 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "未知的欄位名：%.*s" -#: ref-filter.c:619 +#: ref-filter.c:676 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料" -#: ref-filter.c:743 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素" -#: ref-filter.c:807 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素" -#: ref-filter.c:809 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" -#: ref-filter.c:811 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之後" -#: ref-filter.c:839 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素" -#: ref-filter.c:841 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素" -#: ref-filter.c:843 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" -#: ref-filter.c:858 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素" -#: ref-filter.c:915 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "錯誤的格式化字串 %s" -#: ref-filter.c:1556 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "（無分支，重定 %s 的基底）" -#: ref-filter.c:1559 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "（無分支，重定 %s 分離開頭指標的基底）" -#: ref-filter.c:1562 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（無分支，二分搜尋從 %s 開始）" -#: ref-filter.c:1566 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "（開頭指標分離於 %s）" -#: ref-filter.c:1569 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "（開頭指標分離自 %s）" -#: ref-filter.c:1572 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "（無分支）" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "缺少 %2$s 的物件 %1$s" -#: ref-filter.c:1614 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s" -#: ref-filter.c:1997 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "格式錯誤的物件 '%s'" -#: ref-filter.c:2086 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略帶有錯誤名稱 %s 的引用" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "忽略損壞的引用 %s" -#: ref-filter.c:2431 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2525 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "格式錯誤的物件名 %s" -#: ref-filter.c:2530 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "選項 `%s' 必須指向一個提交" @@ -6947,10 +6710,10 @@ msgstr "" "如果要設定所有新版本庫要使用的初始分支名稱，\n" "請呼叫（會隱藏這個警告）：\n" "\n" -"\tgit config —global init.defaultBranch <name>\n" +"\tgit config --global init.defaultBranch <name>\n" "\n" -"除了 ‘master’ 外，常用的分支名稱有 ‘main’, ‘trunk’ 以及\n" -"‘development’。剛建立的分支可以用這個命令重新命名：\n" +"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n" +"“development”。剛建立的分支可以用這個命令重新命名：\n" "\n" "\tgit branch -m <name>\n" @@ -7365,8 +7128,8 @@ msgstr "不能刪除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "為 '%s' 記錄 preimage" -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "不能建立目錄 '%s'" @@ -7404,38 +7167,38 @@ msgstr "不能開啟 rr-cache 目錄" msgid "could not determine HEAD revision" msgstr "不能確定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "無法找到 %s 指向的樹" -#: revision.c:2343 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> 已不受支援" -#: revision.c:2683 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "您的目前分支好像被損壞" -#: revision.c:2686 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的目前分支 '%s' 尚無任何提交" -#: revision.c:2892 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "不能開啟 /dev/null" -#: run-command.c:1275 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "不能建立 async 執行緒：%s" -#: run-command.c:1345 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7470,25 +7233,25 @@ msgstr "send-pack：無法 fork 一個 fetch 子處理程序" msgid "push negotiation failed; proceeding anyway with push" msgstr "push 協商失敗。繼續使用 push 處理" -#: send-pack.c:520 +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "接收端不支援此版本庫的雜湊算法" -#: send-pack.c:529 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" -msgstr "接收端不支援簽名推送" +msgstr "接收端不支援 --signed 推送" -#: send-pack.c:531 +#: send-pack.c:537 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" -msgstr "未傳送推送證書，因為接收端不支援簽名推送" +msgstr "未傳送推送證書，因為接收端不支援 --signed 推送" -#: send-pack.c:543 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" -msgstr "接收端不支援原子推送" +msgstr "接收端不支援 --atomic 推送" -#: send-pack.c:548 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "接收端不支援推送選項" @@ -7547,7 +7310,7 @@ msgid "could not lock '%s'" msgstr "不能鎖定 '%s'" #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "不能寫入 '%s'" @@ -7558,7 +7321,7 @@ msgid "could not write eol to '%s'" msgstr "不能將換行符號寫入 '%s'" #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3554 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "無法完成 '%s'" @@ -7608,8 +7371,8 @@ msgstr "在 '%.*s' 中沒有 key" msgid "unable to dequote value of '%s'" msgstr "無法為 '%s' 的值去引號" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "無法開啟 '%s' 進行讀取" @@ -7753,7 +7516,7 @@ msgstr "不能解析 HEAD" msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一個提交！" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" @@ -7761,7 +7524,7 @@ msgstr "不能解析 HEAD 提交" msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "git write-tree 無法寫入樹狀物件" @@ -7779,12 +7542,13 @@ msgstr "無效的作者身分 '%s'" msgid "corrupt author: missing date information" msgstr "作者資訊損壞：缺少日期資訊" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "寫提交物件失敗" -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "不能更新 %s" @@ -7836,7 +7600,7 @@ msgstr "不能寫 '%s'" msgid "need a HEAD to fixup" msgstr "需要一個 HEAD 來修復" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "不能讀取 HEAD" @@ -7977,7 +7741,7 @@ msgstr "不可用的 squash-onto" msgid "malformed options sheet: '%s'" msgstr "格式錯誤的選項清單：'%s'" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "提供了空的提交集" @@ -8008,7 +7772,7 @@ msgstr "不能建立序列目錄 '%s'" msgid "could not lock HEAD" msgstr "不能鎖定 HEAD" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "揀選或還原動作並未進行" @@ -8020,7 +7784,7 @@ msgstr "不能解析 HEAD" msgid "cannot abort from a branch yet to be born" msgstr "不能從尚未建立的分支終止" -#: sequencer.c:3159 builtin/grep.c:759 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" @@ -8068,7 +7832,7 @@ msgstr "" "您已經提交了嗎？\n" "試試 \"git %s --continue\"" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "不能讀取 HEAD" @@ -8153,90 +7917,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3571 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的標籤名稱：'%.*s'" -#: sequencer.c:3625 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "寫偽根提交" -#: sequencer.c:3630 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "寫入 squash-onto" -#: sequencer.c:3714 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:3747 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "沒有目前版本不能合併" -#: sequencer.c:3769 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "無法解析 '%.*s'" -#: sequencer.c:3778 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "無可用合併：'%.*s'" -#: sequencer.c:3790 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章魚合並不能在一個新的根提交上執行" -#: sequencer.c:3806 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "不能取得 '%s' 的提交說明" -#: sequencer.c:3989 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能嘗試合併 '%.*s'" -#: sequencer.c:4005 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "合併：無法寫入新索引檔案" -#: sequencer.c:4079 +#: sequencer.c:4099 msgid "Cannot autostash" msgstr "無法 autostash" -#: sequencer.c:4082 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 回應：'%s'" -#: sequencer.c:4088 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "不能為 '%s' 建立目錄" -#: sequencer.c:4091 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" msgstr "建立了 autostash：%s\n" -#: sequencer.c:4095 +#: sequencer.c:4115 msgid "could not reset --hard" msgstr "無法 reset --hard" -#: sequencer.c:4120 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" msgstr "已套用 autostash。\n" -#: sequencer.c:4132 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "不能儲存 %s" -#: sequencer.c:4135 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -8247,29 +8011,29 @@ msgstr "" "您的修改安全地儲存在儲藏區中。\n" "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:4140 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." msgstr "因套用自動儲藏而導致衝突。" -#: sequencer.c:4141 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "已有自動儲藏；建立新儲藏項目。" -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "不能分離開頭指標" -#: sequencer.c:4249 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:4251 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:4259 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -8289,58 +8053,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4305 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在重定基底 (%d/%d)%s" -#: sequencer.c:4351 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4422 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "未知指令 %d" -#: sequencer.c:4481 +#: sequencer.c:4480 msgid "could not read orig-head" msgstr "不能讀取 orig-head" -#: sequencer.c:4486 +#: sequencer.c:4485 msgid "could not read 'onto'" msgstr "不能讀取 'onto'" -#: sequencer.c:4500 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 為 %s" -#: sequencer.c:4560 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功重定基底並更新 %s。\n" -#: sequencer.c:4612 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "不能重定基底：您有未暫存的變更。" -#: sequencer.c:4621 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "不能修補不存在的提交" -#: sequencer.c:4623 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "無效檔案：'%s'" -#: sequencer.c:4625 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "無效內容：'%s'" -#: sequencer.c:4628 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8349,50 +8113,50 @@ msgstr "" "\n" "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "不能寫入檔案：'%s'" -#: sequencer.c:4719 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能刪除 CHERRY_PICK_HEAD" -#: sequencer.c:4726 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "不能提交暫存的修改。" -#: sequencer.c:4846 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能揀選一個%s" -#: sequencer.c:4850 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s：錯誤的版本" -#: sequencer.c:4885 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "不能作為初始提交還原提交" -#: sequencer.c:5362 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "make_script：有未能處理的選項" -#: sequencer.c:5365 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "make_script：準備版本時錯誤" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "無事可做" -#: sequencer.c:5651 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" msgstr "無法略過不必要的揀選" -#: sequencer.c:5751 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "腳本已經重新編排。" @@ -8441,92 +8205,94 @@ msgstr "" msgid "unable to set up work tree using invalid config" msgstr "無法使用無效設定來建立工作區" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "該動作必須在一個工作區中執行" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 版本庫版本 <= %d，卻得到 %d" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "發現未知的版本庫擴展：" +#: setup.c:666 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "找到未知的儲存庫擴充元件：" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "repo 的版本是 0，但找到只支援 v1 的擴充元件：" +#: setup.c:680 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "repo 版本是 0 (v0)，但找到只支援 v1 的擴充元件：" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "開啟 '%s' 發生錯誤" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "檔案太大，無法作為 .git 檔案：'%s'" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "讀取 %s 發生錯誤" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "無效的 gitfile 格式：%s" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中沒有路徑：%s" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "不是一個 git 版本庫：%s" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "不是一個 git 版本庫：'%s'" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切換目錄到 '%s'" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "取得 '%*s%s%s' 狀態（stat）失敗" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "不能讀取目前工作目錄" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "不能切換到 '%s'" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是一個 git 版本庫（或者任何父目錄）：%s" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8535,7 +8301,7 @@ msgstr "" "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1370 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8544,28 +8310,27 @@ msgstr "" "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n" "檔案所有者必須始終擁有讀寫權限。" -#: setup.c:1417 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "不能開啟或者複製 /dev/null" -#: setup.c:1432 +#: setup.c:1445 msgid "fork failed" msgstr "fork 失敗" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "setsid 失敗" -#: sparse-index.c:151 +#: sparse-index.c:162 msgid "attempting to use sparse-index without cone mode" msgstr "嘗試不在 cone 模式使用稀疏索引" -#: sparse-index.c:156 -#, fuzzy +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" -msgstr "無法更新快取樹：保持用完狀態" +msgstr "無法更新快取樹，保持完整" -#: sparse-index.c:239 +#: sparse-index.c:263 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）" @@ -8620,7 +8385,7 @@ msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u 位元組/秒" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" @@ -8676,7 +8441,7 @@ msgstr "將更新後 .gitmodules 新增暫存區失敗" #: submodule.c:328 #, c-format msgid "in unpopulated submodule '%s'" -msgstr "位於未檢出的子模組 '%s'" +msgstr "位於未簽出的子模組 '%s'" #: submodule.c:359 #, c-format @@ -8688,55 +8453,55 @@ msgstr "路徑規格 '%s' 在子模組 '%.*s' 中" msgid "bad --ignore-submodules argument: %s" msgstr "無效 --ignore-submodules 參數：%s" -#: submodule.c:818 +#: submodule.c:805 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。" -#: submodule.c:921 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交" -#: submodule.c:1006 +#: submodule.c:993 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令" -#: submodule.c:1129 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "處理 '%s' 子模組失敗" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "無法將 HEAD 解析為有效引用。" -#: submodule.c:1169 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "正在推送 '%s' 子模組\n" -#: submodule.c:1172 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "無法推送 '%s' 子模組\n" -#: submodule.c:1464 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "正在抓取 %s%s 子模組\n" -#: submodule.c:1498 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" msgstr "無法存取子模組 '%s'\n" -#: submodule.c:1653 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8745,77 +8510,77 @@ msgstr "" "抓取子模組時發生錯誤：\n" "%s" -#: submodule.c:1678 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "無法將 '%s' 識別為一個 git 版本庫" -#: submodule.c:1695 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "無法在 %s 子模組執行 'git status --porcelain=2'" -#: submodule.c:1736 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "%s 子模組執行 'git status --porcelain=2' 失敗" -#: submodule.c:1811 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中啟動 'git status'" -#: submodule.c:1824 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中執行 'git status'" -#: submodule.c:1839 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定" -#: submodule.c:1866 submodule.c:2176 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" msgstr "無法遞迴子模組路徑 '%s'" -#: submodule.c:1887 +#: submodule.c:1874 msgid "could not reset submodule index" msgstr "無法重設子模組的索引" -#: submodule.c:1929 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模組 '%s' 中有髒索引" -#: submodule.c:1981 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模組 '%s' 無法被更新。" -#: submodule.c:2049 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中" -#: submodule.c:2070 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查詢子模組 '%s' 的名稱" -#: submodule.c:2086 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "拒絕移動「%s」至現存 git 目錄" -#: submodule.c:2093 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8826,11 +8591,11 @@ msgstr "" "'%s' 遷移至\n" "'%s'\n" -#: submodule.c:2221 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "無法在 .. 中啟動 ls-files" -#: submodule.c:2261 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" @@ -8867,7 +8632,7 @@ msgstr "簽名 '%.*s' 的鍵為空" msgid "could not read input file '%s'" msgstr "不能讀取輸入檔案 '%s'" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "不能自標準輸入讀取" @@ -8955,7 +8720,7 @@ msgstr "協定不支援設定遠端服務路徑" msgid "invalid remote service path" msgstr "無效的遠端服務路徑" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "協定不支援該動作" @@ -8964,7 +8729,7 @@ msgstr "協定不支援該動作" msgid "can't connect to subservice %s" msgstr "不能連線到子服務 %s" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:400 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only 需要 v2 版協定" @@ -9097,53 +8862,53 @@ msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n" msgid "could not read bundle '%s'" msgstr "無法讀取 bundle '%s'" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" msgstr "傳輸：無效的深度選項 '%s'" -#: transport.c:272 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息" -#: transport.c:273 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "服務端選項需要版本 2 協定或更高" -#: transport.c:400 +#: transport.c:403 msgid "server does not support wait-for-done" msgstr "伺服器不支援「等待完成」(wait-for-done) 功能" -#: transport.c:751 +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 設定" -#: transport.c:826 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "協定 v2 的支援尚未實現" -#: transport.c:960 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "設定 '%s' 的取值未知：%s" -#: transport.c:1026 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "傳輸 '%s' 不允許" -#: transport.c:1079 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "不再支援 git-over-rsync" -#: transport.c:1181 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n" -#: transport.c:1185 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -9170,11 +8935,11 @@ msgstr "" "以推送至遠端。\n" "\n" -#: transport.c:1193 +#: transport.c:1199 msgid "Aborting." msgstr "正在終止。" -#: transport.c:1340 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模組" @@ -9200,7 +8965,7 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -"您對下列檔案的本機修改將被檢出動作覆蓋：\n" +"您對下列檔案的本機修改將被簽出動作覆蓋：\n" "%%s請在切換分支前提交或儲藏您的修改。" #: unpack-trees.c:117 @@ -9209,7 +8974,7 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -"您對下列檔案的本機修改將被檢出動作覆蓋：\n" +"您對下列檔案的本機修改將被簽出動作覆蓋：\n" "%%s" #: unpack-trees.c:120 @@ -9263,7 +9028,7 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" "%%s請在切換分支之前移動或刪除。" #: unpack-trees.c:138 @@ -9272,7 +9037,7 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" "%%s" #: unpack-trees.c:141 @@ -9318,7 +9083,7 @@ msgid "" "checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" "%%s請在切換分支前移動或刪除。" #: unpack-trees.c:156 @@ -9328,7 +9093,7 @@ msgid "" "checkout:\n" "%%s" msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" "%%s" #: unpack-trees.c:159 @@ -9388,7 +9153,7 @@ msgid "" "patterns:\n" "%s" msgstr "" -"即使有稀疏檢出樣板，以下路徑不是最新且保留下來：\n" +"即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n" "%s" #: unpack-trees.c:182 @@ -9397,7 +9162,7 @@ msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"即使有稀疏檢出樣板，以下路徑未合併且保留下來：\n" +"即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n" "%s" #: unpack-trees.c:184 @@ -9407,7 +9172,7 @@ msgid "" "patterns:\n" "%s" msgstr "" -"即使有稀疏檢出樣板，以下路徑已經存在而因此未更新：\n" +"即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n" "%s" #: unpack-trees.c:264 @@ -9435,11 +9200,11 @@ msgstr "" "以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n" "並且碰撞組中只有一個檔案存在工作區中：\n" -#: unpack-trees.c:1519 +#: unpack-trees.c:1618 msgid "Updating index flags" msgstr "正在更新索引旗標" -#: unpack-trees.c:2608 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "工作區和未追蹤提交有重複項目：%s" @@ -9481,99 +9246,99 @@ msgstr "無效的 '..' 路徑區塊" msgid "Fetching objects" msgstr "正在抓取物件" -#: worktree.c:238 builtin/am.c:2151 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "讀取 '%s' 失敗" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作區的 '%s' 不是版本庫目錄" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "檔案 '%s' 不包含工作區的絕對路徑" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 沒有指回到 '%s'" -#: worktree.c:608 +#: worktree.c:603 msgid "not a directory" msgstr "不是目錄" -#: worktree.c:617 +#: worktree.c:612 msgid ".git is not a file" msgstr ".git 不是檔案" -#: worktree.c:619 +#: worktree.c:614 msgid ".git file broken" msgstr ".git 檔案損毀" -#: worktree.c:621 +#: worktree.c:616 msgid ".git file incorrect" msgstr ".git 檔案不正確" -#: worktree.c:727 +#: worktree.c:722 msgid "not a valid path" msgstr "非有效路徑" -#: worktree.c:733 +#: worktree.c:728 msgid "unable to locate repository; .git is not a file" msgstr "無法定位版本庫；.git 不是檔案" -#: worktree.c:737 +#: worktree.c:732 msgid "unable to locate repository; .git file does not reference a repository" msgstr "無法定位版本庫；.git 檔案未參考版本庫" -#: worktree.c:741 +#: worktree.c:736 msgid "unable to locate repository; .git file broken" msgstr "無法定位版本庫；.git 檔案損壞" -#: worktree.c:747 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "無法讀取 gitdir" -#: worktree.c:751 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "不正確的 gitdir" -#: worktree.c:776 +#: worktree.c:771 msgid "not a valid directory" msgstr "非有效目錄" -#: worktree.c:782 +#: worktree.c:777 msgid "gitdir file does not exist" msgstr "找不到 gitdir 檔案" -#: worktree.c:787 worktree.c:796 +#: worktree.c:782 worktree.c:791 #, c-format msgid "unable to read gitdir file (%s)" msgstr "無法讀取 gitdir 檔案 (%s)" -#: worktree.c:806 +#: worktree.c:801 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）" -#: worktree.c:814 +#: worktree.c:809 msgid "invalid gitdir file" msgstr "gitdir 檔案無效" -#: worktree.c:822 +#: worktree.c:817 msgid "gitdir file points to non-existent location" msgstr "gitdir 檔案指向的位置不存在" @@ -9626,11 +9391,11 @@ msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）" -#: wt-status.c:211 wt-status.c:1075 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "要提交的變更：" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "尚未暫存以備提交的變更：" @@ -9736,21 +9501,21 @@ msgstr "修改的內容, " msgid "untracked content, " msgstr "未追蹤的內容, " -#: wt-status.c:908 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的儲藏區目前有 %d 條紀錄" -#: wt-status.c:939 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "子模組已修改但尚未更新：" -#: wt-status.c:941 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "要提交的子模組變更：" -#: wt-status.c:1023 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9758,7 +9523,7 @@ msgstr "" "不要改動或刪除上面的一行。\n" "其下所有內容都將被忽略。" -#: wt-status.c:1115 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9769,278 +9534,282 @@ msgstr "" "花了 %.2f 秒才計算出分支的領先/落後範圍。\n" "為避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1145 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "您有尚未合併的路徑。" # 譯者：請維持前導空格 -#: wt-status.c:1148 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " （解決衝突並執行 \"git commit\"）" # 譯者：請維持前導空格 -#: wt-status.c:1150 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 終止合併）" -#: wt-status.c:1154 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "所有衝突已解決但您仍處於合併中。" # 譯者：請維持前導空格 -#: wt-status.c:1157 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 結束合併）" -#: wt-status.c:1166 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "您正處於 am 動作過程中。" -#: wt-status.c:1169 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "目前的修補檔為空。" # 譯者：請維持前導空格 -#: wt-status.c:1173 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解決衝突，然後執行 \"git am --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1175 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1177 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 復原原有分支）" -#: wt-status.c:1310 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 遺失。" -#: wt-status.c:1312 +#: wt-status.c:1362 msgid "No commands done." msgstr "沒有指令被執行。" -#: wt-status.c:1315 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最後一條指令已完成（%d 條指令被執行）：" -#: wt-status.c:1326 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " （更多參見檔案 %s）" -#: wt-status.c:1331 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "未剩下任何指令。" -#: wt-status.c:1334 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "接下來要執行的指令（剩餘 %d 條指令）：" # 譯者：請維持前導空格 -#: wt-status.c:1342 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）" -#: wt-status.c:1354 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。" -#: wt-status.c:1359 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "您在執行重定基底動作。" # 譯者：請維持前導空格 -#: wt-status.c:1372 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解決衝突，然後執行 \"git rebase --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1374 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1376 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " （使用 \"git rebase --abort\" 以檢出原有分支）" +msgstr " （使用 \"git rebase --abort\" 以簽出原有分支）" # 譯者：請維持前導空格 -#: wt-status.c:1383 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有衝突已解決：執行 \"git rebase --continue\"）" -#: wt-status.c:1387 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。" -#: wt-status.c:1392 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "您在執行重定基底動作時分割提交。" # 譯者：請維持前導空格 -#: wt-status.c:1395 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）" -#: wt-status.c:1399 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。" -#: wt-status.c:1404 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "您在執行重定基底動作時編輯提交。" # 譯者：請維持前導空格 -#: wt-status.c:1407 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修補目前提交）" # 譯者：請維持前導空格 -#: wt-status.c:1409 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）" -#: wt-status.c:1420 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "揀選動作正在進行中。" -#: wt-status.c:1423 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在執行揀選提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1430 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1433 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （執行 \"git cherry-pick --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1436 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1438 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " （使用 \"git cherry-pick --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1440 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）" -#: wt-status.c:1450 +#: wt-status.c:1500 msgid "Revert currently in progress." -msgstr "還原動作正在行中。" +msgstr "還原動作正在進行中。" -#: wt-status.c:1453 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "您在執行反轉提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1459 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解決衝突並執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1462 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " （執行 \"git revert --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1465 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有衝突已解決：執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1467 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " （使用 \"git revert --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1469 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）" -#: wt-status.c:1479 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。" -#: wt-status.c:1483 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "您在執行二分搜尋動作。" # 譯者：請維持前導空格 -#: wt-status.c:1486 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" -msgstr " （使用 \"git bisect reset\" 檢出原有分支）" +msgstr " （使用 \"git bisect reset\" 簽出原有分支）" -#: wt-status.c:1497 +#: wt-status.c:1547 +msgid "You are in a sparse checkout." +msgstr "您正在稀疏簽出的工作區中。" + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。" -#: wt-status.c:1736 +#: wt-status.c:1794 msgid "On branch " msgstr "位於分支 " -#: wt-status.c:1743 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "互動式重定基底動作正在進行中；至 " -#: wt-status.c:1745 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "重定基底動作正在進行中；至 " -#: wt-status.c:1750 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "開頭指標分離於 " -#: wt-status.c:1752 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "開頭指標分離自 " -#: wt-status.c:1755 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "目前不在任何分支上。" -#: wt-status.c:1772 +#: wt-status.c:1830 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1773 +#: wt-status.c:1831 msgid "No commits yet" msgstr "尚無提交" -#: wt-status.c:1787 +#: wt-status.c:1845 msgid "Untracked files" msgstr "未追蹤的檔案" -#: wt-status.c:1789 +#: wt-status.c:1847 msgid "Ignored files" msgstr "忽略的檔案" -#: wt-status.c:1793 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -10050,115 +9819,115 @@ msgstr "" "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n" "但您需要小心不要忘了新增新檔案（參見 'git help status'）。" -#: wt-status.c:1799 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "未追蹤的檔案沒有列出%s" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1801 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr " （使用 -u 參數顯示未追蹤的檔案）" -#: wt-status.c:1807 +#: wt-status.c:1865 msgid "No changes" msgstr "沒有修改" -#: wt-status.c:1812 +#: wt-status.c:1870 #, 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:1816 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1820 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n" -#: wt-status.c:1824 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交為空，但是存在尚未追蹤的檔案\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1828 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n" -#: wt-status.c:1832 wt-status.c:1838 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "無檔案要提交\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1835 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1840 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "沒有要提交的檔案，工作區為乾淨狀態\n" -#: wt-status.c:1945 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "尚無提交在 " -#: wt-status.c:1949 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1980 +#: wt-status.c:2038 msgid "different" msgstr "不同" # 譯者：請維持句尾空格 -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "落後 " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "領先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暫存的變更。" -#: wt-status.c:2517 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的變更。" -#: wt-status.c:2519 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的變更。" -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:182 msgid "could not send IPC command" msgstr "無法傳送 IPC 命令" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:189 msgid "could not read IPC response" msgstr "無法讀取 IPC 回應" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: compat/simple-ipc/ipc-unix-socket.c:866 #, c-format msgid "could not start accept_thread '%s'" msgstr "無法啟動 accept_thread “%s”" -#: compat/simple-ipc/ipc-unix-socket.c:874 +#: compat/simple-ipc/ipc-unix-socket.c:878 #, c-format msgid "could not start worker[0] for '%s'" msgstr "無法啟動「%s」的 worker[0]" @@ -10195,7 +9964,7 @@ msgstr "刪除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "重新整理索引之後尚未被暫存的變更：" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "不能讀取索引" @@ -10230,8 +9999,8 @@ msgstr "不能套用 '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" -#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 #: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "測試執行" @@ -10240,7 +10009,7 @@ msgstr "測試執行" msgid "interactive picking" msgstr "互動式揀選" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "互動式挑選資料區塊" @@ -10369,13 +10138,13 @@ msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" msgid "--chmod param '%s' must be either -x or +x" msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul 需要 --pathspec-from-file" @@ -10394,105 +10163,105 @@ msgstr "" "如要關閉此訊息，請執行\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:364 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "不能解析作者腳本" -#: builtin/am.c:454 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 掛鉤刪除" -#: builtin/am.c:496 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的輸入行：'%s'。" -#: builtin/am.c:534 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "從 '%s' 複製註解到 '%s' 時失敗" -#: builtin/am.c:560 +#: builtin/am.c:561 msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c:748 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "無法解析修補檔 '%s'" -#: builtin/am.c:813 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一個 StGIT 修補檔佇列被套用" -#: builtin/am.c:861 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "無效的日期行" -#: builtin/am.c:873 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "無效的時區位移值" -#: builtin/am.c:966 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "修補檔格式偵測失敗。" -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "建立目錄 '%s' 失敗" -#: builtin/am.c:976 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "分割修補檔失敗。" -#: builtin/am.c:1125 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "當您解決這一問題，執行 \"%s --continue\"。" -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。" -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。" -#: builtin/am.c:1222 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。" -#: builtin/am.c:1250 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "修補檔為空。" -#: builtin/am.c:1315 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺少作者行" -#: builtin/am.c:1318 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" msgstr "無效的身份標記：%.*s" -#: builtin/am.c:1537 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本庫缺乏必要的資料物件以進行三方合併。" -#: builtin/am.c:1539 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..." -#: builtin/am.c:1558 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10500,24 +10269,24 @@ msgstr "" "您是否曾手動編輯過您的修補檔？\n" "無法套用修補檔到索引中的資料物件上。" -#: builtin/am.c:1564 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基礎版本上修補及進行三方合併..." -#: builtin/am.c:1590 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "無法合併變更。" -#: builtin/am.c:1622 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "正套用到一個空歷史上" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" -#: builtin/am.c:1696 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "提交內容為：" @@ -10526,39 +10295,39 @@ msgstr "提交內容為：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： " -#: builtin/am.c:1752 builtin/commit.c:408 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" msgstr "無法寫入索引檔案" -#: builtin/am.c:1756 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "髒索引：不能套用修補檔（髒檔案：%s）" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "套用：%.*s" -#: builtin/am.c:1813 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." msgstr "沒有變更——修補檔已經套用過。" -#: builtin/am.c:1819 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "打修補檔失敗於 %s %.*s" -#: builtin/am.c:1823 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔" -#: builtin/am.c:1867 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10568,7 +10337,7 @@ msgstr "" "如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" "您也許想要略過這個修補檔。" -#: builtin/am.c:1874 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10579,106 +10348,106 @@ msgstr "" "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析物件 '%s'。" -#: builtin/am.c:2033 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "清空索引失敗" -#: builtin/am.c:2077 +#: builtin/am.c:2078 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD" -#: builtin/am.c:2184 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "無效的 --patch-format 值：%s" -#: builtin/am.c:2226 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "無效的 --show-current-patch 值：%s" -#: builtin/am.c:2230 +#: builtin/am.c:2231 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容" -#: builtin/am.c:2261 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2262 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<選項>] (--continue | --skip | --abort)" -#: builtin/am.c:2268 +#: builtin/am.c:2269 msgid "run interactively" msgstr "以互動式方式執行" -#: builtin/am.c:2270 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "老的參數 —— 無作用" -#: builtin/am.c:2272 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允許使用三方合併" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:948 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "靜默模式" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交說明結尾加入 Signed-off-by" -#: builtin/am.c:2278 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "使用 utf8 字元集（預設）" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -k 參數" -#: builtin/am.c:2282 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -b 參數" -#: builtin/am.c:2284 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -m 參數" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" -#: builtin/am.c:2289 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "捨棄裁切線前的所有內容" -#: builtin/am.c:2294 +#: builtin/am.c:2295 msgid "pass it through git-mailinfo" msgstr "透過 git-mailinfo 傳遞" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 -#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 msgid "pass it through git-apply" msgstr "傳遞給 git-apply" -#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 #: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 #: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 @@ -10687,67 +10456,67 @@ msgstr "傳遞給 git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 #: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2321 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "修補檔的格式" -#: builtin/am.c:2327 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "打修補檔失敗時顯示的錯誤訊息" -#: builtin/am.c:2329 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "衝突解決後繼續套用修補檔" -#: builtin/am.c:2332 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "和 --continue 同義" -#: builtin/am.c:2335 +#: builtin/am.c:2336 msgid "skip the current patch" msgstr "略過目前修補檔" -#: builtin/am.c:2338 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "還原原始分支並中止修補動作" -#: builtin/am.c:2341 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" -msgstr "終止修補動作但保持 HEAD 不變。" +msgstr "終止修補動作但保持 HEAD 不變" -#: builtin/am.c:2345 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "顯示正在套用的修補檔" -#: builtin/am.c:2350 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "將作者日期作為提交日期" -#: builtin/am.c:2352 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "用目前時間作為作者日期" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 #: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 #: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "使用 GPG 簽名提交" -#: builtin/am.c:2358 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "（內部使用，用於 git-rebase）" -#: builtin/am.c:2376 +#: builtin/am.c:2377 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." @@ -10755,16 +10524,16 @@ msgstr "" "參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" "請不要再使用它了。" -#: builtin/am.c:2383 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "讀取索引失敗" -#: builtin/am.c:2398 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" -#: builtin/am.c:2422 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10773,11 +10542,11 @@ msgstr "" "發現了錯誤的 %s 目錄。\n" "使用 \"git am --abort\" 刪除它。" -#: builtin/am.c:2428 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." msgstr "解決動作未進行，我們不會繼續。" -#: builtin/am.c:2438 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "互動式模式需要指令列上提供修補檔" @@ -10870,62 +10639,62 @@ msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案" msgid "could not write to file '%s'" msgstr "無法寫入 '%s' 檔案" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:155 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一個有效的術語" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:159 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用內建指令 '%s' 作為術語" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:169 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改術語 '%s' 的含義" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" msgstr "請使用兩個不同的術語" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:195 #, c-format msgid "We are not bisecting.\n" msgstr "我們沒有在二分搜尋。\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:203 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一個有效的提交" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:212 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." -msgstr "不能檢出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。" +msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。" -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:256 #, c-format msgid "Bad bisect_write argument: %s" msgstr "壞的 bisect_write 參數：%s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:261 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "無法取得版本 '%s' 的物件 ID" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't open the file '%s'" msgstr "無法開啟檔案 '%s'" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:299 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:326 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10934,7 +10703,7 @@ msgstr "" "您需要給我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:330 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10945,7 +10714,7 @@ msgstr "" "然後需要提供我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。" -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:350 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一個 %s 提交的情況下二分搜尋" @@ -10955,22 +10724,22 @@ msgstr "在只有一個 %s 提交的情況下二分搜尋" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " msgstr "您確認嗎[Y/n]？ " -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:419 msgid "no terms defined" msgstr "未定義術語" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:432 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10979,52 +10748,52 @@ msgstr "" "指令 'git bisect terms' 的參數 %s 無效。\n" "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 msgid "revision walk setup failed\n" msgstr "版本遍歷設定失敗\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:521 #, c-format msgid "could not open '%s' for appending" msgstr "無法開啟 '%s' 進行附加" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 msgid "'' is not a valid term" msgstr "'' 不是一個有效的術語" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:663 #, c-format msgid "unrecognized option: '%s'" msgstr "未識別的選項：'%s'" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:667 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起來不是一個有效的版本" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:698 msgid "bad HEAD - I need a HEAD" msgstr "壞的 HEAD - 我需要一個 HEAD" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:713 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "檢出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" +msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" msgstr "不會在做了 cg-seek 的樹上做二分搜尋" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:737 msgid "bad HEAD - strange symbolic ref" msgstr "壞的 HEAD - 奇怪的符號引用" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:757 #, c-format msgid "invalid ref: '%s'" msgstr "無效的引用：'%s'" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:815 msgid "You need to start by \"git bisect start\"\n" msgstr "您需要執行 \"git bisect start\" 來開始\n" @@ -11033,104 +10802,104 @@ msgstr "您需要執行 \"git bisect start\" 來開始\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " msgstr "您想讓我為您這樣做嗎[Y/n]？ " -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" -msgstr "要呼叫 `—bisect-state`，請傳入一個以上的引數" +msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數" -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:857 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' 只能有一個參數。" -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" msgstr "<修訂版> 輸入格式錯誤：%s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:889 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "修訂版輸入有誤（不是提交）：%s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." msgstr "我們沒有在二分搜尋。" -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" msgstr "「%s」？？您在說什麼？" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" msgstr "無法讀取「%s」檔案來重放" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" msgstr "清除二分搜尋狀態" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "檢查壞的或好的術語是否存在" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" msgstr "列印二分搜尋術語" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "啟動二分搜尋過程" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" msgstr "尋找下一個二分搜尋提交" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "標記 ref (或 refs) 的狀態" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" msgstr "列出迄今的二分搜尋步驟" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" msgstr "從指定檔案重放二分搜尋過程" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" -msgstr "略過要檢出的部分提交" +msgstr "略過要簽出的部分提交" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 無日誌" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 無需參數或者需要一個提交" -#: builtin/bisect--helper.c:1092 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 個參數" -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 個參數" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next 需要 0 個引數" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log 需要 0 個引數" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" msgstr "未提供日誌檔案" @@ -11181,10 +10950,10 @@ msgstr "不將根提交看作邊界（預設值：off）" msgid "show work cost statistics" msgstr "顯示工作量統計" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "強制顯示進度報告" @@ -11232,7 +11001,7 @@ msgstr "顯示作者信箱而非名稱（預設值：off）" msgid "ignore whitespace differences" msgstr "忽略空白差異" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" msgstr "版本" @@ -11286,7 +11055,7 @@ msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函 #: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "--progress 不能和 --incremental 或 --porcelain 同時使用" +msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -11387,7 +11156,7 @@ msgstr "無法查詢 HEAD 指向的提交物件" #: builtin/branch.c:244 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "無法刪除在「%2$s」檢出的「%1$s」分支" +msgstr "無法刪除在「%2$s」簽出的「%1$s」分支" #: builtin/branch.c:259 #, c-format @@ -11815,19 +11584,19 @@ msgstr "git bundle list-heads <檔案> [<參考名稱>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <檔案> [<參考名稱>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3747 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "不顯示進度表" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "顯示進度表" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "在物件寫入階段顯示進度表" -#: builtin/bundle.c:74 builtin/pack-objects.c:3754 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "當進度表顯示時類似於 --all-progress" @@ -11839,29 +11608,29 @@ msgstr "指定包格式版本" msgid "Need a repository to create a bundle." msgstr "需要一個版本庫來建立包。" -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 msgid "do not show bundle details" msgstr "不顯示包 (bundle) 詳細資訊" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "需要一個版本庫來解包。" -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "詳細輸出；必須置於子指令之前" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子指令：%s" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:596 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11869,7 +11638,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:597 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11877,71 +11646,71 @@ msgstr "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 msgid "only one batch option may be specified" msgstr "只能指定一個批次處理選項" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<類型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "顯示物件類型" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "顯示物件大小" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" msgstr "當沒有錯誤時離開並返回零" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "美觀地列印物件的內容" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "對於資料物件，對其內容做文字轉換" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "對於資料物件，對其內容做過濾" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "對於 --textconv/--filters 使用一個特定的路徑" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允許 -s 和 -t 對損壞的物件生效" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "緩衝 --batch 的輸出" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" msgstr "顯示從標準輸入提供的物件的訊息和內容" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "顯示從標準輸入提供的物件的訊息" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟隨樹內符號連結（和 --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 參數顯示所有物件" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" msgstr "不要對 --batch-all-objects 的輸出排序" @@ -11969,8 +11738,8 @@ msgstr "從標準輸入讀出檔案名" msgid "terminate input and output records by a NUL character" msgstr "輸入和輸出的紀錄使用 NUL 字元終結" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 -#: builtin/worktree.c:491 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -12024,14 +11793,15 @@ msgid "no contacts specified" msgstr "未指定聯繫位址" #: builtin/checkout--worker.c:110 -#| msgid "git checkout [<options>] <branch>" msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<選項>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1825 -#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 -#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 +#: builtin/worktree.c:728 msgid "string" msgstr "字串" @@ -12049,7 +11819,7 @@ msgstr "索引值應該取值 1 到 3 或者 all" #: builtin/checkout-index.c:187 msgid "check out all files in the index" -msgstr "檢出索引區的所有檔案" +msgstr "簽出索引區的所有檔案" #: builtin/checkout-index.c:188 msgid "force overwrite of existing files" @@ -12061,7 +11831,7 @@ msgstr "存在或不在索引中的檔案都沒有警告" #: builtin/checkout-index.c:192 msgid "don't checkout new files" -msgstr "不檢出新檔案" +msgstr "不簽出新檔案" #: builtin/checkout-index.c:194 msgid "update stat information in the index file" @@ -12125,65 +11895,65 @@ msgstr "path '%s'：無法合併" msgid "Unable to add merge result for '%s'" msgstr "無法為 '%s' 新增合併結果" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新建立了 %d 個合併衝突" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "從 %2$s 更新了 %1$d 個路徑" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "從索引區更新了 %d 個路徑" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路徑時使用" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同時使用" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同時更新路徑並切換到分支'%s'。" -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都沒有指定" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 時，必須使用 '%1$s'" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "路徑 '%s' 未合併" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12192,51 +11962,51 @@ msgstr "" "不能繼續，下列檔案有暫存的修改：\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能對 '%s' 執行 reflog 動作：%s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "重設分支 '%s'\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "已經位於 '%s'\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切換並重設分支 '%s'\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切換到一個新分支 '%s'\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "切換到分支 '%s'\n" # 譯者：請維持前導空格 -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 個。\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12253,7 +12023,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12274,19 +12044,19 @@ msgstr[0] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "在版本遍歷時遇到內部錯誤" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "您位於一個尚未初始化的分支" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12295,7 +12065,7 @@ msgstr "" "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" "請使用 --（和可選的 --no-guess）來消除歧義" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12306,7 +12076,7 @@ msgid "" "one remote, e.g. the 'origin' remote, consider setting\n" "checkout.defaultRemote=origin in your config." msgstr "" -"如果您想要檢出一個遠端追蹤分支，例如 'origin'，您可以\n" +"如果您想要簽出一個遠端追蹤分支，例如 'origin'，您可以\n" "使用 --track 選項寫出全名：\n" "\n" " git checkout --track origin/<name>\n" @@ -12314,51 +12084,51 @@ msgstr "" "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 符合多個 (%d) 遠端追蹤分支" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "預期只有一個引用" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "應只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一個樹：%s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一個分支，得到標籤 '%s'" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一個分支，得到遠端分支 '%s'" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一個分支，得到 '%s'" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一個分支，得到提交 '%s'" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12366,7 +12136,7 @@ msgstr "" "不能在合併時切換分支\n" "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12374,7 +12144,7 @@ msgstr "" "不能在 am 工作階段期間切換分支\n" "考慮使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12382,7 +12152,7 @@ msgstr "" "不能在重定基底時切換分支\n" "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12390,7 +12160,7 @@ msgstr "" "不能在揀選時切換分支\n" "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12398,207 +12168,208 @@ msgstr "" "不能在還原時切換分支\n" "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "您在執行二分搜尋時切換分支" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "路徑不能和切換分支同時使用" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切換分支同時使用" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同時使用" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不帶 <起始點>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切換分支到一個非提交 '%s'" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "缺少分支或提交參數" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支執行三方合併" -#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "風格" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "衝突輸出風格（merge 或 diff3）" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "HEAD 從指定的提交分離" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "為新的分支設定上游訊息" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" -msgstr "強制檢出（捨棄本機修改）" +msgstr "強制簽出（捨棄本機修改）" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "新的沒有父提交的分支" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "更新忽略的檔案（預設）" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "不檢查指定的引用是否被其他工作區所占用" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" -msgstr "對尚未合併的檔案檢出我們的版本" +msgstr "對尚未合併的檔案簽出我們的版本" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" -msgstr "對尚未合併的檔案檢出他們的版本" +msgstr "對尚未合併的檔案簽出他們的版本" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" -msgstr "對路徑不做稀疏檢出的限制" +msgstr "對路徑不做稀疏簽出的限制" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c、-%c 和 --orphan 是互斥的" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track 需要一個分支名" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名稱，請嘗試 -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "無法解析 %s" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "無效的路徑規格" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路徑參數 '%s'" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file 與 --detach 不相容" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file 與 --patch 不相容" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -"git checkout：在從索引檢出時，--ours/--theirs、--force 和 --merge 不相容。" +"git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。" -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "您必須指定一個要復原的路徑" -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" -msgstr "建立並檢出一個新的分支" +msgstr "建立並簽出一個新的分支" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" -msgstr "建立/重設並檢出一個分支" +msgstr "建立/重設並簽出一個分支" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "為新的分支建立引用日誌" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜測 'git checkout <無此分支>'（預設）" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "使用疊加模式（預設）" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "建立並切換一個新分支" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "建立/重設並切換一個分支" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜測 'git switch <無此分支>'" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "捨棄本機修改" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" -msgstr "要檢出哪一個樹" +msgstr "要簽出哪一個樹" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "復原索引" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "復原工作區（預設）" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "忽略未合併條目" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "使用疊加模式" @@ -12633,7 +12404,7 @@ msgstr "將忽略版本庫 %s\n" msgid "could not lstat %s\n" msgstr "不能對 %s 呼叫 lstat\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12646,7 +12417,7 @@ msgstr "" "foo - 透過唯一前綴選擇一個選項\n" " - （空）什麼也不選擇\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12667,33 +12438,33 @@ msgstr "" "* - 選擇所有選項\n" " - （空）結束選擇\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "輸入範本以排除條目>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：無法找到和 %s 符合的條目" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "選擇要刪除的條目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "移除 %s [y/N]？ " -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12711,65 +12482,65 @@ msgstr "" "help - 顯示本協助\n" "? - 顯示如何在提示符下選擇的協助" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "將刪除如下條目：" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "沒有要清理的檔案，離開。" -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "不列印刪除檔案的名稱" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "強制" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "互動式清除" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "刪除整個目錄" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 #: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" msgstr "新增 <模式> 到忽略規則" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "也刪除忽略的檔案" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "只刪除忽略的檔案" -#: builtin/clean.c:929 +#: builtin/clean.c:925 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:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同時使用" @@ -12783,9 +12554,9 @@ msgstr "不要複製淺版本庫" #: builtin/clone.c:98 msgid "don't create a checkout" -msgstr "不建立一個檢出" +msgstr "不建立一個簽出" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "建立一個純版本庫" @@ -12815,28 +12586,28 @@ msgstr "在複製時初始化子模組" #: builtin/clone.c:115 msgid "number of submodules cloned in parallel" -msgstr "並發複製的子模組的數量" +msgstr "並行複製的子模組數" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "範本目錄" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "範本目錄將被使用" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 -#: builtin/submodule--helper.c:2337 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "參考版本庫" -#: builtin/clone.c:123 builtin/submodule--helper.c:1834 -#: builtin/submodule--helper.c:2339 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "僅在複製時參考 --reference 指向的本機版本庫" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 #: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "名稱" @@ -12847,13 +12618,13 @@ msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游" #: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "檢出 <分支> 而不是遠端 HEAD" +msgstr "簽出 <分支> 而不是遠端 HEAD" #: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "深度" @@ -12862,14 +12633,14 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "建立一個指定深度的淺複製" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "時間" #: builtin/clone.c:133 msgid "create a shallow clone since a specific time" -msgstr "從一個特定時間建立一個淺複製" +msgstr "建立從指定時間到現在的淺複製" #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 #: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 @@ -12878,26 +12649,26 @@ msgstr "修訂版" #: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" -msgstr "深化淺複製的歷史，除了特定版本" +msgstr "取得更多淺複製的過去歷史記錄，除了特定版本" -#: builtin/clone.c:137 builtin/submodule--helper.c:1844 -#: builtin/submodule--helper.c:2353 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "只複製一個分支、HEAD 或 --branch" #: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "不要複製任何標籤，並且後續取得動作也不下載它們" +msgstr "不要複製任何標籤，之後取得也不要追蹤這些標籤" #: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "子模組將以淺下載模式複製" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "git目錄" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "git目錄和工作區分離" @@ -12910,32 +12681,32 @@ msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "server-specific" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "傳輸選項" #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 位址" #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 位址" #: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" -msgstr "任何複製的子模組將使用它們的遠端追蹤分支" +msgstr "任何複製的子模組都將使用它們的遠端追蹤分支" #: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" -msgstr "初始化稀疏檢出檔案，只包含根目錄中的檔案" +msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案" #: builtin/clone.c:292 msgid "" @@ -12986,14 +12757,14 @@ msgid "" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -"複製成功，但是檢出失敗。\n" -"您可以透過 'git status' 檢查哪些已被檢出，然後使用指令\n" +"複製成功，但是簽出失敗。\n" +"您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n" "'git restore --source=HEAD :/' 重試\n" #: builtin/clone.c:594 #, c-format msgid "Could not find remote branch %s to clone." -msgstr "不能發現要複製的遠端分支 %s。" +msgstr "找不到要複製的遠端分支 %s。" #: builtin/clone.c:713 #, c-format @@ -13002,15 +12773,15 @@ msgstr "不能更新 %s" #: builtin/clone.c:761 msgid "failed to initialize sparse-checkout" -msgstr "無法初始化稀疏檢出" +msgstr "無法初始化稀疏簽出" #: builtin/clone.c:784 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "遠端 HEAD 指向一個不存在的引用，無法檢出。\n" +msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n" #: builtin/clone.c:816 msgid "unable to checkout working tree" -msgstr "不能檢出工作區" +msgstr "不能簽出工作區" #: builtin/clone.c:894 msgid "unable to write parameters to config file" @@ -13024,13 +12795,13 @@ msgstr "無法執行 repack 來清理" msgid "cannot unlink temporary alternates file" msgstr "無法刪除暫時的 alternates 檔案" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." msgstr "太多參數。" #: builtin/clone.c:1005 msgid "You must specify a repository to clone." -msgstr "您必須指定一個版本庫來複製。" +msgstr "您必須指定要複製的版本庫。" #: builtin/clone.c:1018 #, c-format @@ -13046,7 +12817,7 @@ msgstr "--bare 和 --separate-git-dir 選項不相容。" msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一個正數" @@ -13067,7 +12838,7 @@ msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" #: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能為 '%s' 建立先導目錄" @@ -13091,7 +12862,7 @@ msgstr "正複製到 '%s'...\n" msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" -msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容" +msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容" #: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format @@ -13100,19 +12871,19 @@ msgstr "'%s' 不是一個有效的遠端名稱" #: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。" #: builtin/clone.c:1231 msgid "--shallow-since is ignored in local clones; use file:// instead." -msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。" #: builtin/clone.c:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。" #: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." -msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --filter。請改用 file:// 協定。" #: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" @@ -13122,14 +12893,18 @@ msgstr "源版本庫是淺複製，忽略 --local" msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "遠端傳輸回報錯誤" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "遠端分支 %s 在上游 %s 未發現" -#: builtin/clone.c:1348 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." -msgstr "您似乎複製了一個空版本庫。" +msgstr "您複製的版本庫似乎是空的。" #: builtin/column.c:10 msgid "git column [<options>]" @@ -13186,7 +12961,7 @@ msgid "could not find object directory matching %s" msgstr "找不到符合 %s 的物件目錄" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "目錄" @@ -13280,7 +13055,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重複的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" @@ -13308,13 +13083,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交物件 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 #: builtin/tag.c:456 msgid "message" msgstr "訊息" -#: builtin/commit-tree.c:115 builtin/commit.c:1614 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "提交說明" @@ -13322,7 +13097,7 @@ msgstr "提交說明" msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -13467,7 +13242,7 @@ msgid "" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "不能查詢提交 %s" @@ -13503,7 +13278,45 @@ msgstr "不能讀取 MERGE_MSG" msgid "could not write commit template" msgstr "不能寫提交範本" -#: builtin/commit.c:900 +#: builtin/commit.c:893 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"請輸入描述您變更的提交訊息。\n" +"開頭是「%c」的行皆會忽略。\n" + +#: builtin/commit.c:895 +#, 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 "" +"請輸入描述您變更的提交訊息。開頭是「%c」\n" +"的行皆會忽略。提交訊息空白則取消本次提交作業。\n" + +#: builtin/commit.c:899 +#, 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" +msgstr "" +"請輸入描述您變更的提交訊息。會保留開頭是「%c」\n" +"的行，但也可以自己移除掉這些行。\n" + +#: builtin/commit.c:903 +#, 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:915 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13517,7 +13330,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "後重試。\n" -#: builtin/commit.c:905 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13531,193 +13344,174 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "後重試。\n" -#: builtin/commit.c:915 -#, 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 "" -"請為您的變更輸入提交說明。以 '%c' 開始的行將被忽略，而一個空的提交\n" -"說明將會終止提交。\n" - -#: builtin/commit.c:923 -#, 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 "" -"請為您的變更輸入提交說明。以 '%c' 開始的行將被保留，如果您原意\n" -"也可以刪除它們。一個空的提交說明將會終止提交。\n" - # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:940 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:948 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:955 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "無法讀取索引" -#: builtin/commit.c:1018 +#: builtin/commit.c:1025 msgid "unable to pass trailers to --trailers" msgstr "無法將尾部署名傳遞至 --trailers" -#: builtin/commit.c:1058 +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "無法建立樹狀物件" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "請使用 -m 或 -F 選項提供提交說明。\n" -#: builtin/commit.c:1116 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" -#: builtin/commit.c:1130 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long 和 -z 選項不相容" -#: builtin/commit.c:1219 +#: builtin/commit.c:1226 msgid "You are in the middle of a merge -- cannot reword." msgstr "正在合併中——不能重新輸入。" -#: builtin/commit.c:1221 +#: builtin/commit.c:1228 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "正在揀選中——不能重新輸入。" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合" -#: builtin/commit.c:1226 +#: builtin/commit.c:1233 msgid "" "reword option of --fixup is mutually exclusive with --patch/--interactive/--" "all/--include/--only" msgstr "" "--fixup 的 reword 選項與 --patch/--interactive/--all/--include/--only 互斥" -#: builtin/commit.c:1245 +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "同時使用 --reset-author 和 --author 沒有意義" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "您沒有可修補的提交。" -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: builtin/commit.c:1259 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: builtin/commit.c:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正處於重定基底的過程中 -- 無法修訂。" -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "選項 --squash 和 --fixup 不能同時使用" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一個 -c/-C/-F/--fixup 選項。" -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "選項 -m 不能和 -c/-C/-F 同時使用。" -#: builtin/commit.c:1285 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" -#: builtin/commit.c:1303 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。" -#: builtin/commit.c:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知選項：--fixup=%s:%s" -#: builtin/commit.c:1345 +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "顯示分支訊息" -#: builtin/commit.c:1480 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "顯示儲藏區訊息" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" -#: builtin/commit.c:1484 +#: builtin/commit.c:1491 msgid "version" msgstr "版本" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 -#: builtin/worktree.c:681 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設）" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 #: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "模式" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" -#: builtin/commit.c:1497 +#: builtin/commit.c:1504 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13725,202 +13519,201 @@ msgstr "" "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值：" "traditional）" -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "何時" -#: builtin/commit.c:1500 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）" -#: builtin/commit.c:1502 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "以列的方式顯示未追蹤的檔案" -#: builtin/commit.c:1503 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "不檢測重新命名" -#: builtin/commit.c:1505 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" msgstr "檢測重新命名，可以設定索引相似度" -#: builtin/commit.c:1525 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: builtin/commit.c:1607 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "提交成功後不顯示概述訊息" -#: builtin/commit.c:1608 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "在提交說明範本裡顯示差異" -#: builtin/commit.c:1610 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "提交說明選項" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "author" msgstr "作者" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "提交時覆蓋作者" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "日期" -#: builtin/commit.c:1613 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 #: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "提交" -#: builtin/commit.c:1615 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "重用並編輯指定提交的提交說明" -#: builtin/commit.c:1616 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "重用指定提交的提交說明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 -#| msgid "amend previous commit" +#: builtin/commit.c:1631 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交" -#: builtin/commit.c:1622 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: builtin/commit.c:1623 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "尾部署名" -#: builtin/commit.c:1624 +#: builtin/commit.c:1634 msgid "add custom trailer(s)" msgstr "加入自訂尾部署名" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "在結尾加入 Signed-off-by" -#: builtin/commit.c:1626 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "使用指定的範本檔案" -#: builtin/commit.c:1627 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "強制編輯提交" -#: builtin/commit.c:1629 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "在提交說明範本裡包含狀態訊息" -#: builtin/commit.c:1634 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "提交內容選項" -#: builtin/commit.c:1635 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "提交所有改動的檔案" -#: builtin/commit.c:1636 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "新增指定的檔案到索引區等待提交" -#: builtin/commit.c:1637 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "互動式新增檔案" -#: builtin/commit.c:1638 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "互動式新增變更" -#: builtin/commit.c:1639 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "只提交指定的檔案" -#: builtin/commit.c:1640 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: builtin/commit.c:1641 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "顯示將要提交的內容" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1655 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "繞過 post-rewrite 掛鉤" -#: builtin/commit.c:1662 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "允許一個空提交" -#: builtin/commit.c:1664 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c:1737 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: builtin/commit.c:1744 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "不能讀取 MERGE_MODE" -#: builtin/commit.c:1765 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "不能讀取提交說明：%s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1790 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1801 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "提交說明內文空白，中止提交作業。\n" -#: builtin/commit.c:1824 +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14550,65 +14343,65 @@ msgstr "暫存檔存在於 '%s'。" msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者復原它們。" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:702 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "執行一個全目錄差異比較" -#: builtin/difftool.c:704 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "啟動差異比較工具之前不提示" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符號連結" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "tool" msgstr "工具" -#: builtin/difftool.c:711 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "使用指定的差異比較工具" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "顯示可以用在 `--tool` 參數後的差異工具列表" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開" -#: builtin/difftool.c:719 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "指定一個用於檢視差異的自訂指令" -#: builtin/difftool.c:720 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "傳遞給 `diff`" -#: builtin/difftool.c:735 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作區或者 --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff 和 --no-index 不相容" -#: builtin/difftool.c:745 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui、--tool 和 --extcmd 互斥" -#: builtin/difftool.c:753 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "沒有為 --tool=<工具> 參數提供 <工具>" -#: builtin/difftool.c:760 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>" @@ -14631,14 +14424,14 @@ msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼" #: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "選項 `--default' 和 `type=bool` 期望一個布林值，不是 `%s`" +msgstr "選項「--default」預期收到「--type=bool」的布林值，而非「%s」" #: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" "%s`" -msgstr "選項 `--default' 和 `type=ulong` 期望一個無符號長整型，不是 `%s`" +msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」" #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" @@ -14696,7 +14489,7 @@ msgstr "使用 done 功能終止串流" msgid "skip output of blob data" msgstr "略過資料物件資料的輸出" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "參照規格" @@ -14828,7 +14621,7 @@ msgstr "不抓取任何標籤(--no-tags)" #: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" -msgstr "子模組取得的並發數" +msgstr "並行取得的子模組數量" #: builtin/fetch.c:164 msgid "modify the refspec to place all refs within refs/prefetch/" @@ -14866,7 +14659,7 @@ msgstr "允許更新 HEAD 引用" #: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" -msgstr "深化淺複製的歷史" +msgstr "取得淺複製的更多過去歷史記錄" #: builtin/fetch.c:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" @@ -14903,9 +14696,8 @@ msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" #: builtin/fetch.c:210 -#, fuzzy msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "不取得包檔案。反之，輸出 negotiation tips 的祖先" +msgstr "不取得包檔案，而是輸出交涉的祖先提交" #: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" @@ -15010,8 +14802,8 @@ msgstr "%s 未傳送所有必需的物件\n" #: builtin/fetch.c:1129 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "拒絕 %s 因為淺複製不允許被更新" +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "已拒絕 %s，不允許更新淺複製" #: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format @@ -15111,58 +14903,62 @@ msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指 msgid "You need to specify a tag name." msgstr "您需要指定一個標籤名稱。" -#: builtin/fetch.c:1995 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only 需要一或多個 --negotiate-tip=*" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:2002 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同時使用" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能帶一個版本庫參數" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "沒有這樣的遠端或遠端組：%s" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "取得組並指定引用規格沒有意義" -#: builtin/fetch.c:2055 +#: builtin/fetch.c:2058 msgid "must supply remote when using --negotiate-only" msgstr "使用 --negotiate-only 時必須提供遠端" -#: builtin/fetch.c:2060 +#: builtin/fetch.c:2063 msgid "Protocol does not support --negotiate-only, exiting." msgstr "協定不支援 --negotiate-only，結束。" -#: builtin/fetch.c:2079 +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫" -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" -msgstr "--stdin 只能在擷取 (fetch) 一個遠端時使用" +msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 只能在取得一個遠端時使用" @@ -15255,19 +15051,19 @@ msgstr "只列印不包含該提交的引用" msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<設定> <命令引數>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "config" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "儲存版本庫路徑清單的設定鍵" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "缺少 --config=<設定>" -#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "未知" @@ -15283,16 +15079,16 @@ msgstr "%s %s 錯誤：%s" msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "來自 %7s %s 的損壞的連結" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "連結中錯誤的物件類型" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -15301,211 +15097,211 @@ msgstr "" "損壞的連結來自於 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "缺少 %s %s" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "無法取得 %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "懸空 %s %s" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "不能建立 lost-found" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "正在檢查 %s" -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在檢查連通性（%d 個物件）" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "正在檢查 %s %s" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "損壞的連結" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "已標記 %s %s (%s) 於 %s" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：物件損壞或遺失" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：無效的引用日誌條目 %s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "正在檢查引用日誌 %s->%s" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：無效的 sha1 指標 %s" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "%s：不是一個提交" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "注意：無預設引用" -#: builtin/fsck.c:605 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：物件損壞或遺失：%s" -#: builtin/fsck.c:618 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析物件：%s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "壞的 sha1 檔案：%s" -#: builtin/fsck.c:653 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:656 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "正在檢查 %s 連結" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "無效的 %s" -#: builtin/fsck.c:683 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的東西（%s）" -#: builtin/fsck.c:689 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分離開頭指標的指向不存在" -#: builtin/fsck.c:693 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一個尚未誕生的分支（%s）" -#: builtin/fsck.c:705 +#: builtin/fsck.c:706 msgid "Checking cache tree" msgstr "正在檢查快取樹" -#: builtin/fsck.c:710 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中無效的 sha1 指標" -#: builtin/fsck.c:719 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "cache-tree 中非樹狀物件" -#: builtin/fsck.c:750 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<選項>] [<物件>...]" -#: builtin/fsck.c:756 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "顯示無法取得的物件" -#: builtin/fsck.c:757 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "顯示懸空的物件" -#: builtin/fsck.c:758 +#: builtin/fsck.c:759 msgid "report tags" msgstr "報告標籤" -#: builtin/fsck.c:759 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "報告根節點" -#: builtin/fsck.c:760 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "將索引亦作為檢查的頭節點" -#: builtin/fsck.c:761 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "將引用日誌作為檢查的頭節點（預設）" -#: builtin/fsck.c:762 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "也考慮包和備用物件" -#: builtin/fsck.c:763 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "僅檢查連通性" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "啟用更嚴格的檢查" -#: builtin/fsck.c:766 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "將懸空物件寫入 .git/lost-found 中" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "顯示進度" -#: builtin/fsck.c:768 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "顯示可以取得物件的詳細名稱" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "正在檢查物件" -#: builtin/fsck.c:855 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "%s：物件缺少" -#: builtin/fsck.c:866 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "無效的參數：期望 sha1，得到 '%s'" @@ -15782,8 +15578,8 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 -#: builtin/pack-objects.c:2969 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "沒有執行緒支援，忽略 %s" @@ -15798,243 +15594,243 @@ msgstr "無法讀取樹（%s）" msgid "unable to grep from object of type %s" msgstr "無法抓取來自於 %s 類型的物件" -#: builtin/grep.c:739 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" msgstr "開關 `%c' 期望一個數字值" -#: builtin/grep.c:838 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "在索引區搜尋而不是在工作區" -#: builtin/grep.c:840 +#: builtin/grep.c:839 msgid "find in contents not managed by git" msgstr "在未被 git 管理的內容中尋找" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/grep.c:842 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" msgstr "在追蹤和未追蹤的檔案中搜尋" -#: builtin/grep.c:844 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的檔案" -#: builtin/grep.c:846 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "在每一個子模組中遞迴搜尋" -#: builtin/grep.c:849 +#: builtin/grep.c:848 msgid "show non-matching lines" msgstr "顯示未符合的行" -#: builtin/grep.c:851 +#: builtin/grep.c:850 msgid "case insensitive matching" msgstr "不區分大小寫符合" -#: builtin/grep.c:853 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "只在單詞邊界符合模式" -#: builtin/grep.c:855 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "把二進位檔案當做文字處理" -#: builtin/grep.c:857 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "不在二進位檔案中符合模式" -#: builtin/grep.c:860 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "用 textconv 過濾器處理二進位檔案" -#: builtin/grep.c:862 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" msgstr "在子目錄中尋找（預設）" -#: builtin/grep.c:864 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下尋找" -#: builtin/grep.c:868 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "使用擴展的 POSIX 正規表示式" -#: builtin/grep.c:871 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正規表示式（預設）" -#: builtin/grep.c:874 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" msgstr "把模式解析為固定的字串" -#: builtin/grep.c:877 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 相容的正規表示式" -#: builtin/grep.c:880 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "顯示行號" -#: builtin/grep.c:881 +#: builtin/grep.c:880 msgid "show column number of first match" msgstr "顯示第一個符合的列號" -#: builtin/grep.c:882 +#: builtin/grep.c:881 msgid "don't show filenames" msgstr "不顯示檔案名" -#: builtin/grep.c:883 +#: builtin/grep.c:882 msgid "show filenames" msgstr "顯示檔案名" -#: builtin/grep.c:885 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/grep.c:887 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "只顯示檔案名而不顯示符合的行" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同義" -#: builtin/grep.c:892 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "只顯示未符合的檔案名" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "在檔案名後輸出 NUL 字元" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "show only matching parts of a line" msgstr "只顯示行中的符合的部分" -#: builtin/grep.c:899 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "顯示總符合行數，而不顯示符合的行" -#: builtin/grep.c:900 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "高亮顯示符合項" -#: builtin/grep.c:902 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" msgstr "在不同檔案的符合項之間列印空行" -#: builtin/grep.c:904 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" msgstr "只在同一檔案的符合項的上面顯示一次檔案名" -#: builtin/grep.c:907 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "顯示符合項前後的 <n> 行上下文" -#: builtin/grep.c:910 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "顯示符合項前 <n> 行上下文" -#: builtin/grep.c:912 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "顯示符合項後 <n> 行上下文" -#: builtin/grep.c:914 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "使用 <n> 個工作執行緒" -#: builtin/grep.c:915 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "快捷鍵 -C 數字" -#: builtin/grep.c:918 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" msgstr "在符合的前面顯示一行函數名" -#: builtin/grep.c:920 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "顯示所在函數的前後內容" -#: builtin/grep.c:923 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "從檔案讀取模式" -#: builtin/grep.c:925 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "符合 <模式>" -#: builtin/grep.c:927 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "組合用 -e 參數設定的模式" -#: builtin/grep.c:939 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" msgstr "不輸出，而用離開碼標記命中狀態" -#: builtin/grep.c:941 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" msgstr "只顯示符合所有模式的檔案中的符合" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" msgstr "分頁" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "分頁顯示符合的檔案" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允許呼叫 grep(1)（本次組建忽略）" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 msgid "no pattern given" msgstr "未提供符合模式" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同時使用" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支援與 --recurse-submodules 一起使用" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "無效的選項組合，忽略 --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" msgstr "沒有執行緒支援，忽略 --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的執行緒數無效（%d）" -#: builtin/grep.c:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 僅用於工作區" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能與 --no-index 同時使用" -#: builtin/grep.c:1161 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" msgstr "--untracked 不能與 --cached 一起使用" -#: builtin/grep.c:1167 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用於已追蹤內容" -#: builtin/grep.c:1175 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" msgstr "同時給出了 --cached 和樹狀物件" @@ -16157,30 +15953,30 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 檢視器。" -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" msgstr "沒有 man 檢視器處理此請求" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" msgstr "沒有 info 檢視器處理此請求" -#: builtin/help.c:520 builtin/help.c:531 git.c:348 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的別名" -#: builtin/help.c:534 git.c:380 +#: builtin/help.c:531 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "壞的 alias.%s 字串：%s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "'git help config' 取得更多訊息" @@ -16217,7 +16013,7 @@ msgstr "輸入上的讀錯誤" msgid "used more bytes than were available" msgstr "用掉了超過可用的位元組" -#: builtin/index-pack.c:325 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "包太大超過了目前 off_t 的定義" @@ -16244,233 +16040,233 @@ msgstr "包簽名不符合" msgid "pack version %<PRIu32> unsupported" msgstr "不支援包版本 %<PRIu32>" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "解壓縮返回 %d" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "位移值覆蓋了 delta 基準物件" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "delta 基準位移越界" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "未知物件類型 %d" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" msgstr "無法讀取包檔案" -#: builtin/index-pack.c:587 +#: builtin/index-pack.c:585 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組" -#: builtin/index-pack.c:613 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 -#: builtin/index-pack.c:827 builtin/index-pack.c:836 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" -#: builtin/index-pack.c:761 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "不能讀 %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "不能讀取現存物件訊息 %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "不能讀取現存物件 %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "套用 delta 失敗" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "接收物件中" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "索引物件中" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包衝突（SHA1 不符合）" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "不能對 packfile 呼叫 fstat" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "包的結尾有垃圾資料" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的問題" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "處理 delta 中" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1289 +#: builtin/index-pack.c:1287 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 個本機物件" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1303 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 個未解決的 delta" -#: builtin/index-pack.c:1329 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能壓縮附加物件（%d）" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "本機物件 %s 已損壞" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "packfile 名稱「%s」的結尾不是「.%s」" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" msgstr "無法寫入 %s 檔案 '%s'" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" msgstr "無法關閉已寫入的 %s 檔案 '%s'" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" msgstr "關閉包檔案時發生錯誤" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "無法儲存包檔案" -#: builtin/index-pack.c:1526 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "無法儲存索引檔案" -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "壞的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "無法開啟現存包檔案 '%s'" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "無法為 %s 開啟包索引檔案" -#: builtin/index-pack.c:1701 +#: builtin/index-pack.c:1699 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 個物件" -#: builtin/index-pack.c:1708 +#: builtin/index-pack.c:1706 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "鏈長 = %d: %lu 物件" -#: builtin/index-pack.c:1750 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 -#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" msgstr "錯誤選項 %s" -#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的「%s」雜湊算法" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同時使用" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin 需要一個 git 版本庫" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format 不能和 --stdin 同時使用" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify 沒有提供 packfile 名稱參數" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "在打包物件中 fsck 檢查發生錯誤" @@ -16514,56 +16310,56 @@ msgstr "沒有在 %s 中找到範本" msgid "not copying templates from '%s': %s" msgstr "沒有從 '%s' 複製範本：%s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "無效的初始分支名稱：'%s'" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "不能處理 %d 類型的檔案" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "不能移動 %s 至 %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "嘗試以不同的雜湊值重新初始化版本庫" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s 已經存在" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: 忽略 --initial-branch=%s" -#: builtin/init-db.c:462 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:463 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:467 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:517 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16571,53 +16367,53 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] " "[<目錄>]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "權限" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本庫是多個使用者之間共享的" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "覆蓋初始分支的名稱" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "雜湊" -#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "指定要使用的雜湊算法" -#: builtin/init-db.c:559 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir 和 --bare 互斥" -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "不能建立目錄 %s" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "不能切換目錄到 %s" -#: builtin/init-db.c:626 +#: builtin/init-db.c:627 #, 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:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能存取工作區 '%s'" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir 與純版本庫不相容" @@ -16724,85 +16520,85 @@ msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "最終輸出：%d %s\n" -#: builtin/log.c:568 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "不能讀取物件 %s" -#: builtin/log.c:698 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "未知類型：%d" -#: builtin/log.c:843 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：從描述產生附函的模式無效" -#: builtin/log.c:850 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers 沒有值" -#: builtin/log.c:979 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "無法開啟修補檔案 %s" -#: builtin/log.c:996 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "只需要一個範圍" -#: builtin/log.c:1006 +#: builtin/log.c:1009 msgid "not a range" msgstr "不是一個範圍" -#: builtin/log.c:1170 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "附函需要信件位址格式" -#: builtin/log.c:1176 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "無法建立附函檔案" -#: builtin/log.c:1263 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1290 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" -#: builtin/log.c:1348 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "無法將 '%s' 解析為一個有效引用" -#: builtin/log.c:1519 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "不能找到準確的合併基礎" -#: builtin/log.c:1529 +#: builtin/log.c:1532 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16812,288 +16608,288 @@ msgstr "" "git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n" "參數 --base=<基礎提交> 手動指定一個基礎提交" -#: builtin/log.c:1552 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "無法找到準確的合併基礎" -#: builtin/log.c:1569 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "基礎提交應該是版本列表的祖先" -#: builtin/log.c:1579 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "基礎提交不應該出現在版本列表中" -#: builtin/log.c:1637 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "無法得到修補檔 id" -#: builtin/log.c:1700 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" msgstr "無法推斷目前系列的 range-diff 起點" -#: builtin/log.c:1702 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "將 '%s' 當作目前系列的 range-diff 起點" -#: builtin/log.c:1746 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一個修補檔" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多個修補檔" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "列印修補檔到標準輸出" -#: builtin/log.c:1755 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1757 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "使用簡單的數字序列作為輸出檔案名" -#: builtin/log.c:1758 +#: builtin/log.c:1761 msgid "sfx" msgstr "後綴" -#: builtin/log.c:1759 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "使用 <後綴> 代替 '.patch'" -#: builtin/log.c:1761 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "修補檔以 <n> 開始編號，而不是1" -#: builtin/log.c:1762 +#: builtin/log.c:1765 msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c:1763 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "標記修補檔系列是第幾次重製" -#: builtin/log.c:1765 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "輸出檔名的最大長度" -#: builtin/log.c:1767 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "從描述產生附函的模式" -#: builtin/log.c:1771 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "基於分支描述產生部分附函" -#: builtin/log.c:1773 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前綴>] 代替 [PATCH]" -#: builtin/log.c:1776 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "把結果檔案儲存在 <目錄>" -#: builtin/log.c:1779 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "不刪除/新增 [PATCH]" -#: builtin/log.c:1782 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "不輸出二進位差異" -#: builtin/log.c:1784 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "在 From 標頭訊息中輸出全為零的雜湊值" -#: builtin/log.c:1786 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的修補檔" -#: builtin/log.c:1788 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）" -#: builtin/log.c:1790 +#: builtin/log.c:1793 msgid "Messaging" msgstr "信件傳送" -#: builtin/log.c:1791 +#: builtin/log.c:1794 msgid "header" msgstr "header" -#: builtin/log.c:1792 +#: builtin/log.c:1795 msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "信件位址" -#: builtin/log.c:1793 +#: builtin/log.c:1796 msgid "add To: header" msgstr "新增收件人" -#: builtin/log.c:1794 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "新增抄送" -#: builtin/log.c:1795 +#: builtin/log.c:1798 msgid "ident" msgstr "標記" -#: builtin/log.c:1796 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）" -#: builtin/log.c:1798 +#: builtin/log.c:1801 msgid "message-id" msgstr "信件標記" -#: builtin/log.c:1799 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "邊界" -#: builtin/log.c:1801 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "附件方式新增修補檔" -#: builtin/log.c:1804 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "內聯顯示修補檔" -#: builtin/log.c:1808 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "啟用信件線索，風格：淺，深" -#: builtin/log.c:1810 +#: builtin/log.c:1813 msgid "signature" msgstr "簽名" -#: builtin/log.c:1811 +#: builtin/log.c:1814 msgid "add a signature" msgstr "新增一個簽名" -#: builtin/log.c:1812 +#: builtin/log.c:1815 msgid "base-commit" msgstr "基礎提交" -#: builtin/log.c:1813 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "為修補檔列表新增前置樹訊息" -#: builtin/log.c:1816 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "從檔案新增一個簽名" -#: builtin/log.c:1817 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "不要列印修補檔檔案名" -#: builtin/log.c:1819 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "在生成修補檔時顯示進度" -#: builtin/log.c:1821 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <rev> 的差異" -#: builtin/log.c:1824 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "建立權重的百分比" -#: builtin/log.c:1913 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "包含無效的身份標記：%s" -#: builtin/log.c:1928 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1930 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1938 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only 無意義" -#: builtin/log.c:1940 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status 無意義" -#: builtin/log.c:1942 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check 無意義" -#: builtin/log.c:1964 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout、--output 和 --output-directory 互斥" -#: builtin/log.c:2087 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2091 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "版本間差異：" -#: builtin/log.c:2092 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "對 v%d 的版本差異：" -#: builtin/log.c:2098 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:2102 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2110 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "範圍差異：" -#: builtin/log.c:2111 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "對 v%d 的範圍差異：" -#: builtin/log.c:2122 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "無法讀取簽名檔案 '%s'" -#: builtin/log.c:2158 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "生成修補檔" -#: builtin/log.c:2202 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "無法建立輸出檔案" -#: builtin/log.c:2261 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17291,7 +17087,6 @@ msgstr "列出整個樹；不僅僅目前目錄（隱含 --full-name）" #. TRANSLATORS: keep <> in "<" mail ">" info. #: builtin/mailinfo.c:14 -#| msgid "git diff --no-index [<options>] <path> <path>" msgid "git mailinfo [<options>] <msg> <patch> < mail >info" msgstr "git mailinfo [<選項>] <訊息> <修補檔> < mail >info" @@ -17324,9 +17119,8 @@ msgid "re-code metadata to this encoding" msgstr "重新將中繼資料編碼為這個編碼方式" #: builtin/mailinfo.c:72 -#, fuzzy msgid "use scissors" -msgstr "使用 scissors" +msgstr "使用剪刀標記" #: builtin/mailinfo.c:73 msgid "<action>" @@ -17337,9 +17131,8 @@ msgid "action when quoted CR is found" msgstr "當找到可列印 CR 字元時所要採取的行為" #: builtin/mailinfo.c:77 -#, fuzzy msgid "use headers in message's body" -msgstr "在訊息本文部分使用標頭" +msgstr "在訊息內文中使用標頭" #: builtin/mailsplit.c:241 #, c-format @@ -17460,14 +17253,6 @@ msgstr "合併 %s 和 %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<選項>] [<提交>...]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - #: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "開關 `m' 需要一個值" @@ -17611,36 +17396,36 @@ msgstr "無合併訊息 -- 未更新 HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' 沒有指向一個提交" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知選項：-X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "不能寫 %s" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "不能從 '%s' 讀取" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合並，使用 'git commit' 完成此次合併。\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 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" @@ -17650,83 +17435,83 @@ msgstr "" "合併到主題分支。\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "空的提交說明會終止提交。\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "空提交說明。" -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "沒有目前分支。" -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "目前分支沒有對應的遠端版本庫。" -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "目前分支沒有定義預設的上游分支。" -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合併：%s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "不能合併" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort 不帶參數" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit 不帶參數" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue 不帶參數" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17734,7 +17519,7 @@ msgstr "" "您尚未結束您的合併（存在 MERGE_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17742,88 +17527,88 @@ msgstr "" "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "您不能將 --squash 和 --no-ff 組合使用。" -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "您不能將 --squash 和 --commit 組合使用。" -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交並且 merge.defaultToUpstream 未設定。" -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "尚不支援到空分支的壓縮提交" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快轉式提交沒有意義" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合併" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "只能將一個提交合並到空分支上" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "拒絕合併無關的歷史" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "嘗試非常小的索引內合併...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "無法快轉，終止。" -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "嘗試合併策略 %s...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "沒有合併策略處理此合併。\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合併失敗。\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "使用 %s 以準備手動解決。\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "使用 %s 策略，準備自行解決。\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自動合併進展順利，按要求在提交前停止\n" @@ -17886,26 +17671,18 @@ msgid "allow creation of more than one tree" msgstr "允許建立一個以上的樹" #: builtin/multi-pack-index.c:10 -#| msgid "" -#| "git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -#| "size=<size>)" msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" msgstr "git multi-pack-index [<選項>] write [--preferred-pack=<包>]" #: builtin/multi-pack-index.c:13 -#| msgid "git upload-pack [<options>] <dir>" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<選項>] verify" #: builtin/multi-pack-index.c:16 -#| msgid "git upload-pack [<options>] <dir>" msgid "git multi-pack-index [<options>] expire" msgstr "git multi-pack-index [<選項>] expire" #: builtin/multi-pack-index.c:19 -#| msgid "" -#| "git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -#| "size=<size>)" msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "git multi-pack-index [<選項>] repack [--batch-size=<大小>]" @@ -17927,7 +17704,7 @@ msgid "" "larger than this size" msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中" -#: builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "未識別的子指令：%s" @@ -18456,7 +18233,7 @@ msgstr "嘗試刪除不存在的註解不是一個錯誤" msgid "read object names from the standard input" msgstr "從標準輸入讀取物件名稱" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "不刪除，只顯示" @@ -18472,22 +18249,22 @@ msgstr "註解引用" msgid "use notes from <notes-ref>" msgstr "從 <註解引用> 使用註解" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "未知子指令：%s" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<選項>...] [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18495,106 +18272,106 @@ msgid "" msgstr "" "write_reuse_object：無法定位 %1$s，預期在 %3$s 包中的 %2$<PRIuMAX> 偏移量" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 錯的包物件 CRC" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "%s 損壞的包物件" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "發現物件 %s 遞迴 delta" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 個物件，預期 %<PRIu32> 個" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "預期 %2$s 包中的偏移 %1$<PRIuMAX> 有物件" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1168 msgid "Writing objects" msgstr "寫入物件中" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "對 %s 呼叫 stat 失敗" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個" -#: builtin/pack-objects.c:1383 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "停用 bitmap 寫入，因為一些物件將不會被打包" -#: builtin/pack-objects.c:1831 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 壓縮中 delta 基準位移越界" -#: builtin/pack-objects.c:1840 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基準位移越界" -#: builtin/pack-objects.c:2121 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "物件計數中" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 -#: builtin/pack-objects.c:2362 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, c-format msgid "object %s cannot be read" msgstr "物件 %s 無法讀取" -#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2376 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "次優（suboptimal）打包 - 記憶體不足" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 個執行緒進行壓縮" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "無法為標籤 %s 壓縮物件" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "壓縮物件中" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "不一致的差異計數" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18603,23 +18380,23 @@ msgstr "" "uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> " "<uri>' (收到 '%s')" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3164 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3199 #, c-format msgid "could not get type of object %s in pack %s" msgstr "無法取得 %2$s 包中 %1$s 物件的類型" -#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 #, c-format msgid "could not find pack '%s'" msgstr "找不到「%s」包" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18628,7 +18405,7 @@ msgstr "" "預期邊界物件（edge object）ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18637,246 +18414,246 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "選項 --missing 的值無效" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "無法開啟包檔案索引" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "無法檢查 %s 處的鬆散物件" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" msgstr "無法強制鬆散物件" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "不是一個版本 '%s'" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "壞的版本 '%s'" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "無法新增最近的物件" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "不支援的索引版本 %s" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "壞的索引版本 '%s'" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "<版本>[,<位移>]" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本來寫包索引檔案" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "每個輸出包的最大尺寸" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "忽略從備用物件儲存裡借用物件" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" msgstr "忽略包物件" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "限制打包視窗的物件數" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "除物件數量限制外設定打包視窗的記憶體限制" -#: builtin/pack-objects.c:3769 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允許的 delta 鏈的最大長度" -#: builtin/pack-objects.c:3771 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "重用已存在的物件" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 物件" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "使用執行緒查詢最佳 delta 符合" -#: builtin/pack-objects.c:3779 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "不建立空的包輸出" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "從標準輸入讀取版本號參數" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的物件" -#: builtin/pack-objects.c:3786 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "包括可以從任何引用存取到的物件" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "包括被引用日誌引用到的物件" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "包括被索引引用到的物件" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3955 msgid "read packs from stdin" msgstr "從標準輸入中讀取包" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "輸出包到標準輸出" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包物件的標籤物件" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "維持無法取得的物件" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "打包鬆散的無法取得物件" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "將比提供 <時間> 新的無法存取的物件解包" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可以取得性演算法" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "建立精簡包" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "建立適合淺複製版本庫取得的包" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 檔案的包" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "忽略該 pack" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "打包壓縮級別" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "顯示被移植隱藏的提交" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同時建立 bitmap 索引" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "如果可能，寫 bitmap 索引" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "處理遺失的物件" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor packfile 中的物件" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "在增量壓縮時參考資料島" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "通訊協定" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量鏈深度 %d 太深了，強制為 %d" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案" -#: builtin/pack-objects.c:3936 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包檔案大小是 1 MiB" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用於建立一個可索引包" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不相容" -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" msgstr "不能在沒有 --stdout 的情況下使用 --filter" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4112 msgid "cannot use --filter with --stdin-packs" msgstr "無法將 --filter 及 --stdin-packs 結合使用" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4116 msgid "cannot use internal rev list with --stdin-packs" msgstr "無法將內部版本清單與 --stdin-packs 結合使用" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "枚舉物件" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18974,7 +18751,7 @@ msgstr "強制覆蓋本機分支" #: builtin/pull.c:201 msgid "number of submodules pulled in parallel" -msgstr "並發拉取的子模組的數量" +msgstr "並行拉取的子模組數量" #: builtin/pull.c:317 #, c-format @@ -19089,19 +18866,19 @@ msgstr "" "pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n" "設定的預設值。\n" -#: builtin/pull.c:991 +#: builtin/pull.c:990 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未誕生的分支，變更新增至索引。" -#: builtin/pull.c:995 +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "重定基底式拉取" -#: builtin/pull.c:996 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "請提交或儲藏它們。" -#: builtin/pull.c:1021 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19111,7 +18888,7 @@ msgstr "" "fetch 更新了目前的分支。快轉您的工作區\n" "至提交 %s。" -#: builtin/pull.c:1027 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19128,15 +18905,15 @@ msgstr "" "$ git reset --hard\n" "復原之前的狀態。" -#: builtin/pull.c:1042 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "無法將多個分支合併到空分支。" -#: builtin/pull.c:1046 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "無法重定基底到多個分支。" -#: builtin/pull.c:1067 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本機子模組中有修改，無法重定基底" @@ -19198,7 +18975,7 @@ msgstr "" "\n" " git push %s HEAD:<遠端分支名字>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -19211,12 +18988,17 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "目前分支 %s 有多個上游分支，拒絕推送。" -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "您沒有為推送指定任何引用規格，並且 push.default 為 \"nothing\"。" + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -19226,12 +19008,7 @@ msgstr "" "您正推送至遠端 '%s'（其並非目前分支 '%s' 的上游），\n" "而沒有告訴我要推送什麼、更新哪個遠端分支。" -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "您沒有為推送指定任何引用規格，並且 push.default 為 \"nothing\"。" - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -19242,7 +19019,7 @@ msgstr "" "再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:273 +#: builtin/push.c:264 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" @@ -19250,10 +19027,10 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒絕，因為推送的一個分支的最新提交落後於其對應的遠端分支。\n" -"檢出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n" +"簽出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:279 +#: builtin/push.c:270 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" @@ -19266,11 +19043,11 @@ msgstr "" "（如 'git pull ...'）。\n" "詳見 'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒絕，因為該標籤在遠端已經存在。" -#: builtin/push.c:289 +#: builtin/push.c:280 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" @@ -19279,7 +19056,7 @@ msgstr "" "如果不使用 '--force' 參數，您不能更新一個指向非提交物件的遠端引用，\n" "也不能更新遠端引用讓其指向一個非提交物件。\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -19290,103 +19067,103 @@ msgstr "" "您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n" "最後才強制更新。\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失敗" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "版本庫" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "鏡像所有引用" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "刪除引用" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送標籤（不能使用 --all or --mirror）" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "強制更新" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "要求引用舊的取值為設定值" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "需要將遠端更新整合進本地" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "控制子模組的遞迴推送" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "使用精簡打包" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 #: builtin/send-pack.c:187 msgid "receive pack program" msgstr "接收包程式" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "設定 git pull/status 的上游" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "清除本機刪除的引用" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "繞過 pre-push 掛鉤" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "推送缺少但有關的標籤" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "用 GPG 為推送簽名" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "需要遠端支援原子事務" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 與 --all、--mirror 及 --tags 不相容" -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用沒有意義" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "壞的版本庫 '%s'" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19407,27 +19184,27 @@ msgstr "" "\n" " git push <名稱>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不相容" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用規格同時使用" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不相容" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用規格同時使用" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不相容" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "推送選項不能有換行符號" @@ -19544,7 +19321,7 @@ msgstr "不更新索引區和工作區" #: builtin/read-tree.c:151 msgid "skip applying sparse checkout filter" -msgstr "略過套用稀疏檢出過濾器" +msgstr "略過套用稀疏簽出過濾器" #: builtin/read-tree.c:153 msgid "debug unpack-trees" @@ -19716,7 +19493,7 @@ msgstr "切換到" #: builtin/rebase.c:545 msgid "the branch or commit to checkout" -msgstr "要檢出的分支或提交" +msgstr "要簽出的分支或提交" #: builtin/rebase.c:546 msgid "onto-name" @@ -19897,7 +19674,7 @@ msgstr "略過目前修補檔並繼續" # 譯者：請維持前導空格 #: builtin/rebase.c:1359 msgid "abort and check out the original branch" -msgstr "終止並檢出原有分支" +msgstr "終止並簽出原有分支" #: builtin/rebase.c:1362 msgid "abort but keep HEAD where it is" @@ -19973,7 +19750,7 @@ msgstr "即使已提供上游，仍套用所有變更" #: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "看起來 'git-am' 正在執行中。無法重定基底。" +msgstr "看起來 'git am' 正在執行中。無法重定基底。" #: builtin/rebase.c:1483 msgid "" @@ -20000,7 +19777,7 @@ msgstr "沒有正在進行的重定基底？" msgid "The --edit-todo action can only be used during interactive rebase." msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "不能讀取 HEAD" @@ -20105,8 +19882,8 @@ msgstr "沒有指向一個有效的提交 '%s'" msgid "fatal: no such branch/commit '%s'" msgstr "致命錯誤：無此分支/提交 '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "沒有這樣的引用：%s" @@ -20174,7 +19951,7 @@ msgstr "快轉 %s 到 %s。\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <版本庫目錄>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20200,7 +19977,7 @@ msgstr "" "若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n" "設定變數為 'refuse'。" -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20211,7 +19988,7 @@ msgid "" "\n" "To squelch this message, you can set it to 'refuse'." msgstr "" -"預設禁止刪除目前分支，因為下一次 'git clone' 將不會檢出任何檔案，\n" +"預設禁止刪除目前分支，因為下一次 'git clone' 將不會簽出任何檔案，\n" "導致困惑。\n" "\n" "您可以在遠端版本庫中設定 'receive.denyDeleteCurrent' 設定變數為\n" @@ -20219,11 +19996,11 @@ msgstr "" "\n" "若要封鎖此訊息，您可以設定它為 'refuse'。" -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "靜默模式" -#: builtin/receive-pack.c:2493 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "您必須指定一個目錄。" @@ -20922,7 +20699,6 @@ msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不相容" #: builtin/repack.c:527 -#| msgid "--long is incompatible with --abbrev=0" msgid "--geometric is incompatible with -A, -a" msgstr "--geometric 與 -A, -a 不相容" @@ -21190,15 +20966,15 @@ msgstr "只能為 -l 提供一個模式" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <路徑>... | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "在索引中註冊乾淨的解決方案" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "沒有路徑的 'git rerere forget' 已經過時" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "無法為 '%s' 生成差異" @@ -21350,19 +21126,19 @@ msgstr "不能重設索引檔案至版本 '%s'。" msgid "Could not write new index file." msgstr "不能寫入新的索引檔案。" -#: builtin/rev-list.c:538 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項" -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "物件過濾需要 --objects" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list 不支援顯示註解" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "--objects 不相容標記計數 (marked counting)" @@ -21382,6 +21158,18 @@ msgstr "遇到第一個非選項參數後停止解析" msgid "output in stuck long form" msgstr "以固定長格式輸出" +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "輸入過早到達結尾" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "「--」分隔符號前未提供用法字串" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "需要一個修訂版本" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -21396,6 +21184,50 @@ msgstr "" "\n" "初次使用時執行 \"git rev-parse --parseopt -h\" 來獲得更多訊息。" +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir 需要 1 個引數" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "'%s' 不是 git 目錄" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "--git-path 需要 1 個引數" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "-n 需要 1 個引數" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "--path-format 需要 1 個引數" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "傳入 --path-format 的引數未知：%s" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "--default 需要 1 個引數" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "--prefix 需要 1 個引數" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "--abbrev-ref 的模式未知：%s" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "--show-object-format 的模式未知：%s" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<選項>] <提交號>..." @@ -21506,7 +21338,7 @@ msgstr "" #: builtin/rm.c:217 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" -msgstr[0] "下列檔案索引中有變更" +msgstr[0] "下列檔案有暫存在索引的變更：" #: builtin/rm.c:221 builtin/rm.c:230 msgid "" @@ -21840,7 +21672,7 @@ msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）" #: builtin/sparse-checkout.c:227 msgid "failed to create directory for sparse-checkout file" -msgstr "無法建立稀疏檢出檔案的目錄" +msgstr "無法建立稀疏簽出檔案的目錄" #: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" @@ -21851,13 +21683,12 @@ msgid "failed to set extensions.worktreeConfig setting" msgstr "無法設定 extensions.worktreeConfig 設定" #: builtin/sparse-checkout.c:290 -#| msgid "git sparse-checkout init [--cone]" msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" #: builtin/sparse-checkout.c:310 msgid "initialize the sparse-checkout in cone mode" -msgstr "以 cone 模式初始化稀疏檢出" +msgstr "以 cone 模式初始化稀疏簽出" #: builtin/sparse-checkout.c:312 msgid "toggle the use of a sparse index" @@ -21872,37 +21703,37 @@ msgstr "無法修改稀疏索引設定" msgid "failed to open '%s'" msgstr "無法開啟「%s」" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "無法標準化路徑 %s" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "無法去掉 '%s' C 樣式字串的引號" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" -msgstr "無法載入現存的稀疏檢出樣式" +msgstr "無法載入現存的稀疏簽出樣式" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "重新整理工作目錄時發生錯誤" @@ -21926,10 +21757,6 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" - #: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" @@ -22079,93 +21906,93 @@ msgstr "在儲藏區包含未追蹤檔案" msgid "only show untracked files in the stash" msgstr "只在儲藏區顯示未追蹤檔案" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "儲藏說明" -#: builtin/stash.c:960 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一個 <提交> 參數" -#: builtin/stash.c:1175 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "沒有選擇變更" -#: builtin/stash.c:1275 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1302 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "無法儲存目前索引狀態" -#: builtin/stash.c:1311 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "無法儲存目前工作區狀態" -#: builtin/stash.c:1359 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "不能記錄工作區狀態" -#: builtin/stash.c:1408 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1426 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "您是否忘了執行 'git add'？" -#: builtin/stash.c:1441 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "沒有要儲存的本機修改" -#: builtin/stash.c:1448 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "無法初始化儲藏" -#: builtin/stash.c:1463 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "無法儲存目前狀態" -#: builtin/stash.c:1468 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" msgstr "儲存工作目錄和索引狀態 %s" -#: builtin/stash.c:1558 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "以修補檔模式儲藏" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "靜默模式" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "儲藏中包含未追蹤檔案" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "包含忽略的檔案" -#: builtin/stash.c:1704 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22189,40 +22016,41 @@ msgstr "略過和移除所有的備註行" msgid "prepend comment character and space to each line" msgstr "為每一行的行首新增備註符和空格" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一個完整的引用名稱，卻得到 %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote 不帶參數" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "無法從 url '%s' 剝離一個元件" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "相對路徑的替代錨記（anchor）" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "進入 '%s'\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22231,7 +22059,7 @@ msgstr "" "對 %s 執行 run_command 返回非零值。\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22241,169 +22069,169 @@ msgstr "" "在遞迴 %s 的子模組執行 run_command 時返回非零值。\n" "." -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "隱藏每個子模組進入命令的輸出" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 -#: builtin/submodule--helper.c:1488 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" -#: builtin/submodule--helper.c:573 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" -#: builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。" -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊 url" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模組 '%s'（%s）已對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建議子模組 '%s' 使用指令更新模式\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊更新模式" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "隱藏初始化子模組的輸出" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<選項>] [<路徑>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "無法解析子模組 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "遞迴子模組 '%s' 失敗" -#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "隱藏子模組的狀態輸出" -#: builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交" -#: builtin/submodule--helper.c:894 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路徑>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "無法雜湊來自 '%s' 的物件" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "非預期的模式 %o\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "使用儲存在索引中的提交而非子模組 HEAD" -#: builtin/submodule--helper.c:1303 -msgid "to compare the commit in the index with that in the submodule HEAD" -msgstr "比較索引中的，和子模組 HEAD 中的提交" +#: builtin/submodule--helper.c:1304 +msgid "compare the commit in the index with that in the submodule HEAD" +msgstr "比較索引中提交與子模組 HEAD 提交的差異" -#: builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "'ignore_config' 值設為 'all' 時略過子模組" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "限制摘要大小" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "無法取得 HEAD 的版本" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached 和 --files 互斥" -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "為 '%s' 同步子模組 url\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "無法為子模組路徑 '%s' 註冊 url" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "無法得到子模組 '%s' 的預設遠端關聯" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "無法為子模組 '%s' 更新遠端關聯" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "隱藏子模組 URL 同步的輸出" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22412,52 +22240,52 @@ msgstr "" "子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm " "-rf' 指令）" -#: builtin/submodule--helper.c:1559 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目錄 '%s'\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "無法移除子模組工作區 '%s'\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能建立空的子模組目錄 %s" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1597 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "即使有本機變更仍移除子模組的工作區" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "取消註冊所有子模組" -#: builtin/submodule--helper.c:1631 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]" -#: builtin/submodule--helper.c:1645 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'" -#: builtin/submodule--helper.c:1714 +#: builtin/submodule--helper.c:1690 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22469,46 +22297,67 @@ msgstr "" "以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n" "而非 '--reference' 複製。" -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" -#: builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能識別 submodule.alternateLocation 的取值 '%s'" -#: builtin/submodule--helper.c:1823 +#: builtin/submodule--helper.c:1800 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" + +#: builtin/submodule--helper.c:1841 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "無法複製 '%s' 到子模組路徑 '%s'" + +#: builtin/submodule--helper.c:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "目錄不是空的：「%s」" + +#: builtin/submodule--helper.c:1858 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "無法得到 '%s' 的子模組目錄" + +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "新的子模組將要複製的路徑" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "新子模組的名稱" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "複製子模組的 url 位址" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "淺複製的深度" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "強制顯示複製進度" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "不允許複製至非空白目錄" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22518,186 +22367,223 @@ msgstr "" ">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路" "徑>" -#: builtin/submodule--helper.c:1874 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" - -#: builtin/submodule--helper.c:1885 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "無法複製 '%s' 到子模組路徑 '%s'" - -#: builtin/submodule--helper.c:1889 -#, c-format -msgid "directory not empty: '%s'" -msgstr "目錄不是空的：「%s」" - -#: builtin/submodule--helper.c:1901 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "無法得到 '%s' 的子模組目錄" - -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1953 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1941 +#: builtin/submodule--helper.c:1957 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:2042 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模組 '%s' 尚未初始化" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "也許您想要執行 'update --init'？" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略過未合併的子模組 %s" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "略過子模組 '%s'" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" -msgstr "複製 '%s' 失敗。按計劃重試" +msgstr "複製 '%s' 失敗。已排程重試作業" -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" -msgstr "第二次嘗試複製 '%s' 失敗，離開" +msgstr "第二次嘗試複製 '%s' 失敗，中止作業" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "到工作區的路徑" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作區中的路徑，遞迴嵌套子模組" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "建立一個縮減至指定版本數的淺複製" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" -msgstr "並發任務" +msgstr "並行任務" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" -msgstr "初始複製是否應該遵守推薦的淺複製選項" +msgstr "初始複製是否應該遵循建議的淺複製選項" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "不要輸出複製進度" -#: builtin/submodule--helper.c:2358 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "update 參數取值錯誤" -#: builtin/submodule--helper.c:2419 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上" -#: builtin/submodule--helper.c:2542 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法獲得子模組 '%s' 的版本庫句柄" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "在子模組中遞迴" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]" -#: builtin/submodule--helper.c:2637 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" msgstr "檢查寫入 .gitmodules 檔案是否安全" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 檔案中的設定" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名稱> [<值>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名稱>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "請確認 .gitmodules 檔案在工作區裡" -#: builtin/submodule--helper.c:2682 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "隱藏子模組設定 URL 的輸出" -#: builtin/submodule--helper.c:2686 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>" -#: builtin/submodule--helper.c:2719 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "將預設的追蹤分支設為 master" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "設定預設追蹤分支" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2741 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -#: builtin/submodule--helper.c:2726 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -#: builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch 與 --default 互斥" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "正在將位於 '%s' 的現有版本庫加入至索引\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "「%s」已存在，且不是有效的 git 版本庫" + +#: builtin/submodule--helper.c:2828 +#, fuzzy, c-format +#| msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "在本機找到「%s」Git 目錄，與其對應的遠端版本庫：" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"如果您想要直接使用這個本機 git 目錄，而非重新複製自\n" +" %s\n" +"請使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" +"或者說您不確定，請使用 '--name' 選項輸入其他名稱。\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "無法簽出「%s」子模組" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "複製時要簽出的版本庫分支" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "允許加入忽略的子模組路徑" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "" +"git submodule--helper add-clone [<選項>...] --url <URL> --path <路徑> --name " +"<名稱>" + +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支援 --super-prefix" -#: builtin/submodule--helper.c:2799 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一個有效的 submodule--helper 子指令" @@ -23310,7 +23196,7 @@ msgstr "git worktree remove [<選項>] <工作區>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路徑>" -#: builtin/worktree.c:61 builtin/worktree.c:935 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" @@ -23320,25 +23206,25 @@ msgstr "刪除 '%s' 失敗" msgid "Removing %s/%s: %s" msgstr "移除 %s/%s: %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "報告清除的工作區" -#: builtin/worktree.c:151 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "將早於 <時間> 的工作區過期" -#: builtin/worktree.c:221 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "'%s' 已經存在" -#: builtin/worktree.c:230 +#: builtin/worktree.c:228 #, c-format msgid "unusable worktree destination '%s'" msgstr "無法使用的工作目錄目的地「%s」" -#: builtin/worktree.c:235 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23347,7 +23233,7 @@ msgstr "" "'%s' 是個遺失但被鎖定的工作區；\n" "使用 '%s -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除" -#: builtin/worktree.c:237 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23356,34 +23242,38 @@ msgstr "" "'%s' 是個遺失但已註冊的工作區；\n" "使用 '%s -f' 覆蓋，或 'prune' 或 'remove' 清除" -#: builtin/worktree.c:288 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" msgstr "不能建立目錄 '%s'" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "正在初始化" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "準備工作區（新分支 '%s'）" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "準備工作區（重設分支 '%s'，之前為 %s）" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" -msgstr "準備工作區（檢出 '%s'）" +msgstr "準備工作區（簽出 '%s'）" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "準備工作區（分離開頭指標 %s）" #: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" -msgstr "檢出 <分支>，即使已經被檢出到其它工作區" +msgstr "簽出 <分支>，即使已經被簽出到其它工作區" #: builtin/worktree.c:485 msgid "create a new branch" @@ -23401,82 +23291,90 @@ msgstr "生成新的工作區" msgid "keep the new working tree locked" msgstr "鎖定新工作區" -#: builtin/worktree.c:493 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "鎖定原因" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "設定追蹤模式（參見 git-branch(1)）" -#: builtin/worktree.c:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "嘗試為新分支名符合一個遠端追蹤分支" -#: builtin/worktree.c:504 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:565 +#: builtin/worktree.c:508 +msgid "--reason requires --lock" +msgstr "--reason 需要 --lock" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "已使用 --lock 加入" + +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在建立新分支時使用 --[no-]track 選項" -#: builtin/worktree.c:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "如果有則顯示延伸的註釋和原因" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示" -#: builtin/worktree.c:693 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose 和 --porcelain 互斥" -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "鎖定原因" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 -#: builtin/worktree.c:963 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一個工作區" -#: builtin/worktree.c:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作區無法被加鎖或解鎖" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被鎖定，原因：%s" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被鎖定" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被鎖定" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移動或刪除包含子模組的工作區" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "強制移動，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一個主工作區" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "無法從 '%s' 算出目標名稱" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23485,7 +23383,7 @@ msgstr "" "無法移動一個鎖定的工作區，鎖定原因：%s\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23493,36 +23391,36 @@ msgstr "" "無法移動一個鎖定的工作區，\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "驗證失敗，無法移動工作區：%s" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移動 '%s' 到 '%s' 失敗" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中執行 'git status' 失敗" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "強制刪除，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23531,7 +23429,7 @@ msgstr "" "無法刪除一個鎖定的工作區，鎖定原因：%s\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23539,17 +23437,17 @@ msgstr "" "無法刪除一個鎖定的工作區，\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "驗證失敗，無法刪除工作區：%s" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "修復：%s：%s" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "錯誤：%s：%s" @@ -23762,7 +23660,6 @@ msgid "could not spawn daemon in the background" msgstr "無法在背景啟動 (spawn) 守護程式" #: t/helper/test-simple-ipc.c:356 -#| msgid "setsid failed" msgid "waitpid failed" msgstr "waitpid 失敗" @@ -23776,7 +23673,7 @@ msgstr "無法啟動守護程式" #: t/helper/test-simple-ipc.c:410 msgid "waitpid is confused" -msgstr "" +msgstr "waitpid 被混淆" #: t/helper/test-simple-ipc.c:541 msgid "daemon has not shutdown yet" @@ -23883,14 +23780,14 @@ msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端：" #: http.c:1139 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" -msgstr "無法設定 SSL 後端為 '%s'：cURL: cURL 沒有使用 SSL 後端組建" +msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端" #: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "無法將 SSL 後端設定為 '%s'：已經設定" -#: http.c:2035 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23940,95 +23837,95 @@ msgstr "無法存取 '%s'：%s" msgid "redirecting to %s" msgstr "重定向到 %s" -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "遠端伺服器傳送了無狀態的分隔符號" +#: remote-curl.c:656 +msgid "remote server sent unexpected response end packet" +msgstr "遠端伺服器傳送了非預期的回應結束封包" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: 錯誤的行長度字串：%.4s" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: 非預期的回應結束封包" -#: remote-curl.c:832 +#: remote-curl.c:834 #, c-format msgid "RPC failed; %s" msgstr "RPC 失敗。%s" -#: remote-curl.c:872 +#: remote-curl.c:874 msgid "cannot handle pushes this big" msgstr "不能處理這麼大的推送" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "不能壓縮請求，zlib 壓縮錯誤 %d" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "不能壓縮請求，zlib 結束錯誤 %d" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "收到了 %d 位元組長度的標頭" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "預期仍要有 %d 位元組的本文 (body)" -#: remote-curl.c:1132 +#: remote-curl.c:1134 msgid "dumb http transport does not support shallow capabilities" msgstr "啞 http 傳輸不支援 shallow 能力" -#: remote-curl.c:1147 +#: remote-curl.c:1149 msgid "fetch failed." msgstr "取得失敗。" -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "無法透過智慧 HTTP 取得 sha1" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, c-format msgid "http transport does not support %s" msgstr "http 傳輸協定不支援 %s" -#: remote-curl.c:1291 +#: remote-curl.c:1293 msgid "git-http-push failed" msgstr "git-http-push 失敗" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl：錯誤讀取來自 git 的指令流" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl：嘗試沒有本機版本庫下取得" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的來自 git 的指令 '%s'" @@ -24184,7 +24081,7 @@ msgstr "從工作區中刪除未追蹤檔案" #: command-list.h:72 msgid "Clone a repository into a new directory" -msgstr "複製版本庫到一個新目錄" +msgstr "複製版本庫至新目錄" #: command-list.h:73 msgid "Display data in columns" @@ -24224,7 +24121,7 @@ msgstr "在磁碟儲存密碼的協助工具" #: command-list.h:82 msgid "Export a single commit to a CVS checkout" -msgstr "將一個提交匯出到 CVS 檢出中" +msgstr "將一個提交匯出到 CVS 簽出中" #: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" @@ -24589,7 +24486,7 @@ msgstr "常用的 Git shell 腳本設定程式碼" #: command-list.h:173 msgid "Initialize and modify the sparse-checkout" -msgstr "初始化並修改稀疏檢出" +msgstr "初始化並修改稀疏簽出" #: command-list.h:174 msgid "Stash the changes in a dirty working directory away" @@ -24866,83 +24763,43 @@ msgstr "'$sm_path' 已經存在於索引中且不是一個子模組" #: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" -msgstr "'$sm_path' 沒有檢出的提交" - -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "新增位於 '$sm_path' 的現存版本庫到索引" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' 已存在且不是一個有效的 git 版本庫" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "本機發現 '$sm_name' 的一個 git 目錄，與其對應的遠端版本庫：" +msgstr "'$sm_path' 沒有簽出的提交" -#: git-submodule.sh:261 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"如果您想要重用這個本機 git 目錄而非重新複製自\n" -" $realrepo\n" -"使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" -"或者您不確定這裡的含義，使用 '--name' 選項選擇另外的名稱。" - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "啟動本機 git 目錄到子模組 '$sm_name'。" - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "不能檢出子模組 '$sm_path'" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "無法新增子模組 '$sm_path'" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "無法註冊子模組 '$sm_path'" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "無法在子模組路徑 '$sm_path' 中取得" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}" -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "無法在子模組路徑 '$displaypath' 中取得，嘗試直接取得 $sha1：" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -24950,47 +24807,47 @@ msgid "" msgstr "" "取得了子模組路徑 '$displaypath'，但是它沒有包含 $sha1。直接取得該提交失敗。" -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "無法在子模組路徑 '$displaypath' 中檢出 '$sha1'" +msgstr "無法在子模組路徑 '$displaypath' 中簽出 '$sha1'" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "子模組路徑 '$displaypath'：檢出 '$sha1'" +msgstr "子模組路徑 '$displaypath'：簽出 '$sha1'" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模組路徑 '$displaypath'：重定基底至 '$sha1'" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模組路徑 '$displaypath'：已合併入 '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模組 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "無法遞迴進子模組路徑 '$displaypath'" @@ -25283,7 +25140,7 @@ msgstr "無法執行編輯器" #: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" -msgstr "不能檢出 $switch_to" +msgstr "不能簽出 $switch_to" #: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" @@ -25685,39 +25542,39 @@ msgstr "未知的 --patch 模式：%s" msgid "invalid argument %s, expecting --" msgstr "無效的參數 %s，期望是 --" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本機時間和 GMT 有不到一分鐘間隔\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "本機時間位移量大於等於 24 小時\n" -#: git-send-email.perl:222 +#: git-send-email.perl:214 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "致命錯誤：命令「%s」中止，結束碼：%d" -#: git-send-email.perl:235 +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "編輯器非正常離開，終止所有動作" -#: git-send-email.perl:321 +#: git-send-email.perl:316 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在編寫的一個中間版本的信件。\n" -#: git-send-email.perl:326 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含編輯的信件。\n" -#: git-send-email.perl:419 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它選項不相容\n" -#: git-send-email.perl:493 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25727,47 +25584,47 @@ msgstr "" "git-send-email 已經以 sendemail.* 選項設定 - 注意裡面的 'e'。\n" "請將 sendemail.forbidSendmailVariables 設為 false 停用此檢查。\n" -#: git-send-email.perl:498 git-send-email.perl:700 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在版本庫之外執行 git format-patch\n" -#: git-send-email.perl:501 +#: git-send-email.perl:533 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "`batch-size` 和 `relogin` 必須同時定義（透過指令列或者設定選項）\n" -#: git-send-email.perl:514 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 欄位：'%s'\n" -#: git-send-email.perl:545 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 設定：'%s'\n" -#: git-send-email.perl:573 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支援帶引號的 sendmail 別名：%s\n" -#: git-send-email.perl:575 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支援 `:include:`：%s\n" -#: git-send-email.perl:577 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支援 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:582 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能識別的 sendmail 行：%s\n" -#: git-send-email.perl:666 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25782,12 +25639,12 @@ msgstr "" " * 如果含義為一個檔案，使用 \"./%s\"，或者\n" " * 如果含義為一個範圍，使用 --format-patch 選項。\n" -#: git-send-email.perl:687 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "無法開啟目錄 %s: %s" -#: git-send-email.perl:720 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -25797,17 +25654,17 @@ msgstr "" "未指定修補檔案！\n" "\n" -#: git-send-email.perl:733 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中沒有標題行？" -#: git-send-email.perl:743 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "為寫入開啟 %s 失敗: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25820,37 +25677,37 @@ msgstr "" "\n" "如果您不想傳送摘要，清除內容。\n" -#: git-send-email.perl:778 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "無法開啟 %s: %s" -#: git-send-email.perl:795 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "無法開啟 %s.final: %s" -#: git-send-email.perl:838 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "摘要信件為空，略過\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您是否要使用 <%s> [y/N]？ " -#: git-send-email.perl:928 +#: git-send-email.perl:990 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "如下檔案含 8bit 內容，但沒有聲明一個 Content-Transfer-Encoding。\n" -#: git-send-email.perl:933 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要宣告 8bit 為什麼樣的編碼格式 [UTF-8]？ " -#: git-send-email.perl:941 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25862,20 +25719,20 @@ msgstr "" "\t%s\n" "包含範本標題 '*** SUBJECT HERE ***'。如果確定想要傳送，使用參數 --force。\n" -#: git-send-email.perl:960 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "信件將要傳送給誰？" -#: git-send-email.perl:978 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命錯誤：別名 '%s' 擴展為它自己\n" -#: git-send-email.perl:990 +#: git-send-email.perl:1052 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "（如果有）Message-ID 是否要被用作第一封信件的 In-Reply-To ？ " -#: git-send-email.perl:1048 git-send-email.perl:1056 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" @@ -25883,16 +25740,16 @@ msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1060 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)：" -#: git-send-email.perl:1377 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路徑 \"%s\" 不存在" -#: git-send-email.perl:1460 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25917,112 +25774,112 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1475 +#: git-send-email.perl:1544 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "傳送這封信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -#: git-send-email.perl:1478 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "傳送要求的信件回復" -#: git-send-email.perl:1506 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 伺服器未被正確定義。" -#: git-send-email.perl:1553 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "伺服器不支援 STARTTLS！%s" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失敗！%s" -#: git-send-email.perl:1571 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "無法正確地初始化 SMTP。檢查設定並使用 --smtp-debug。" -#: git-send-email.perl:1589 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "無法傳送 %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "測試執行傳送 %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "正傳送 %s\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "測試執行成功。日誌說：\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "OK。日誌說：\n" -#: git-send-email.perl:1606 +#: git-send-email.perl:1688 msgid "Result: " msgstr "結果：" -#: git-send-email.perl:1609 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "結果：OK\n" -#: git-send-email.perl:1627 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "無法開啟檔案 %s" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1680 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 新增 to：%s 自行 '%s'\n" -#: git-send-email.perl:1737 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1772 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 新增 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1883 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能執行 '%s'" -#: git-send-email.perl:1890 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 新增 %s: %s 自：'%s'\n" -#: git-send-email.perl:1894 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 無法關閉管道至 '%s'" -#: git-send-email.perl:1924 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式傳送訊息" -#: git-send-email.perl:1932 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "無效的傳送編碼" -#: git-send-email.perl:1966 +#: git-send-email.perl:2051 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -26033,12 +25890,12 @@ msgstr "" "%s\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能開啟 %s：%s\n" -#: git-send-email.perl:1979 +#: git-send-email.perl:2064 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26047,17 +25904,32 @@ msgstr "" "致命錯誤：%s:%d 的字元數超過 998\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl:1997 +#: git-send-email.perl:2082 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略過 %s 含備份後綴 '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2001 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要傳送 %s？[y|N]：" +#~ msgid "unable to write stateless separator packet" +#~ msgstr "無法寫入無狀態的分隔符號封包" + +#~ msgid "git merge --abort" +#~ msgstr "git merge --abort" + +#~ msgid "git merge --continue" +#~ msgstr "git merge --continue" + +#~ msgid "git stash clear" +#~ msgstr "git stash clear" + +#~ msgid "remote server sent stateless separator" +#~ msgstr "遠端伺服器傳送了無狀態的分隔符號" + #~ msgid "--cached and --3way cannot be used together." #~ msgstr "--cached 和 --3way 不能同時使用。" @@ -26067,7 +25939,6 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ msgid "one" #~ msgstr "一方" -#, c-format #~ msgid "Already up to date!" #~ msgstr "已經是最新的！" @@ -26087,7 +25958,6 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ "對 rebase.useBuiltin 的支援已被刪除！\n" #~ "詳見 'git help config' 中的條目。" -#, perl-format #~ msgid "%s: patch contains a line longer than 998 characters" #~ msgstr "%s：修補檔包含一個超過 998 字元的行" @@ -26100,11 +25970,9 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ msgid "repository is shallow; skipping commit-graph" #~ msgstr "版本庫是淺複製；忽略提交圖形" -#, c-format #~ msgid "commit-graph improper chunk offset %08x%08x" #~ msgstr "提交圖形不正確的區塊位移 %08x%08x" -#, c-format #~ msgid "commit-graph chunk id %08x appears multiple times" #~ msgstr "提交圖形區塊 id %08x 出現了多次" @@ -26155,11 +26023,9 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ msgid "Force progress reporting" #~ msgstr "強制進度顯示" -#, c-format #~ msgid "Error deleting remote-tracking branch '%s'" #~ msgstr "無法刪除遠端追蹤分支 '%s'" -#, c-format #~ msgid "Error deleting branch '%s'" #~ msgstr "無法刪除分支 '%s'" @@ -26178,6 +26044,5 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ msgid "too many params" #~ msgstr "太多參數" -#, sh-format #~ msgid "Bad rev input: $arg" #~ msgstr "壞的輸入版本：$arg" |